byacc: really import 20240109

64 files changed, 2096 insertions, 1825 deletions

diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES
index 49c3d84a8821..eb96d72f0b26 100644
--- a/contrib/byacc/CHANGES
+++ b/contrib/byacc/CHANGES
@@ -1,3 +1,153 @@
+2024-01-09  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* yacc.1: minor cleanup
+
+	* package/debian/copyright: bump
+
+	* configure: regen
+
+	* VERSION, package/byacc.spec, package/debian/changelog,
+	  package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+2023-12-01  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* aclocal.m4:
+	resync with my-autoconf: CF_CONST_X_STRING CF_MKSTEMP CF_WITH_MAN2HTML CF_XOPEN_SOURCE
+
+2023-09-15  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* config.sub: 2023-09-15
+
+2023-08-22  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* config.guess: 2023-08-22
+
+2023-05-21  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog,
+	  package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+	* configure: regen
+
+	* aclocal.m4:
+	updates for CF_INSTALL_MAN from reflex, which needs the symbolic link feature
+
+	* aclocal.m4:
+	improve install-man by adding sed commands for --program-transform-name
+
+2023-05-19  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* makefile.in: use CF_INSTALL_MAN
+
+	* aclocal.m4:
+	add CF_INSTALL_MAN, to begin refactoring install rule for manpage
+
+	* configure: regen
+
+	* configure.in: use CF_INSTALL_MAN
+
+2023-05-18  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* error.c, defs.h, reader.c:
+	allow @1 or $@ with a warning if no %locations was given
+
+2023-05-17  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* reader.c: clear pointer in end_ainfo() after freeing it.
+
+2023-05-16  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* reader.c: report errors in %define as "unexpected value"
+
+	* reader.c:
+	add/use macros begin_ainfo() and end_ainfo() to reduce clutter
+
+	* defs.h, error.c: add function unexpected_value()
+
+	* reader.c:
+	recognize bison's "%define api.pure" as an alternative to "%pure-parser"
+
+	* reader.c:
+	add %nterm as an alias for %type, since bison made that confusion.
+
+	* reader.c:
+	ensure that filler_buf and prefix_buf are initialized for the special case
+	where they are empty (report by Martin Jansa, cf: 20230219)
+
+	* output.c:
+	make test-differences smaller when compiling with YY_NO_LEAKS by replacing
+	a blank line with the generated #define rather than adding 3 lines.
+
+	* reader.c: gcc-warnings
+
+2023-05-15  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog,
+	  package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+	* reader.c:
+	when copying parameters, check for a case where the last token is not a
+	name, e.g., "foo [1]" would have "[1]".  In this case, scan back to find
+	the actual parameter name.
+
+	* reader.c:
+	correct a use-after-free in more_curly, which could occur if a %lex-param
+	or %parse-param was multi-line (Redhat #2183006).
+
+2023-05-11  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* main.c: rename no_space() to on_error()
+
+	* error.c: rename no_space() to no_error(), handling any errno
+
+	* defs.h: rename no_space() to on_error()
+
+2023-04-03  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* aclocal.m4: resync with my-autoconf: CF_GCC_VERSION CF_XOPEN_SOURCE
+
+2023-02-26  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* mstring.c, reader.c: yak-indent
+
+2023-02-26  mingodad
+
+	* reader.c:
+	patch for byacc #6: Segmentation fault when trying to parse bison-3.8.2 grammar
+
+2023-02-26  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog,
+	  package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+2023-02-20  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* configure: regen
+
+	* aclocal.m4: resync with my-autoconf
+
+2023-02-19  Thomas E. Dickey  <dickey@invisible-island.net>
+
+	* test/yacc/ok_syntax1.tab.h, test/yacc/ok_syntax1.tab.c,
+	  test/btyacc/ok_syntax1.tab.h, test/btyacc/ok_syntax1.tab.c:
+	regen
+
+	* test/ok_syntax1.y:
+	modify test for %union to add tag for testing reader.c
+
+	* reader.c:
+	provide for a named union, e.g., "%union foo" by detecting the name and
+	deferring the typedef in that case until the end of copying the union
+	definition (report by Dag-Erling Smørgrav).
+
+	* VERSION, package/byacc.spec, package/debian/changelog,
+	  package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
 2023-02-01  Thomas E. Dickey  <dickey@invisible-island.net>
 
 	* configure: regen
diff --git a/contrib/byacc/LICENSE b/contrib/byacc/LICENSE
new file mode 100644
index 000000000000..c21f9f78a6db
--- /dev/null
+++ b/contrib/byacc/LICENSE
@@ -0,0 +1,10 @@
+     Berkeley Yacc is distributed with no warranty whatever.  The author
+and any other contributors take no responsibility for the consequences of
+its use.
+
+    Berkeley Yacc is in the public domain.  The data structures and algorithms
+used in Berkeley Yacc are all either taken from documents available to the
+general public or are inventions of the author.  Anyone may freely distribute
+source or binary forms of Berkeley Yacc whether unchanged or modified.
+Distributers may charge whatever fees they can obtain for Berkeley Yacc.
+Programs generated by Berkeley Yacc may be distributed freely.
diff --git a/contrib/byacc/MANIFEST b/contrib/byacc/MANIFEST
index 88bc14260a57..a5c792d6de5a 100644
--- a/contrib/byacc/MANIFEST
+++ b/contrib/byacc/MANIFEST
@@ -1,8 +1,9 @@
-MANIFEST for byacc, version t20230201
+MANIFEST for byacc, version t20240109
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 ACKNOWLEDGEMENTS                original version of byacc - 1993
 AUTHORS                         nicknames for some contributors (see CHANGES for details)
+CHANGES                         generated changelog
 LICENSE                         summary of byacc's license
 Makefile.old                    renamed from Makefile
 NEW_FEATURES                    original version of byacc - 1993
@@ -63,7 +64,7 @@ package/pkgsrc/Makefile         scripts from NetBSD pkgsrc, for test-builds
 package/pkgsrc/PLIST            scripts from NetBSD pkgsrc, for test-builds
 package/pkgsrc/distinfo         scripts from NetBSD pkgsrc, for test-builds
 test                            subdirectory
-test/README                     describe contents of "test" subdirectory
+test/README                     summary of "test" directory
 test/btyacc                     subdirectory
 test/btyacc/big_b.error         exercise -L/-B options
 test/btyacc/big_b.output        exercise -L/-B options
diff --git a/contrib/byacc/VERSION b/contrib/byacc/VERSION
index f295cfe77a76..e55f042e203f 100644
--- a/contrib/byacc/VERSION
+++ b/contrib/byacc/VERSION
@@ -1 +1 @@
-20230201
+20240109
diff --git a/contrib/byacc/aclocal.m4 b/contrib/byacc/aclocal.m4
index 832d0c89b2eb..7ae519084e7b 100644
--- a/contrib/byacc/aclocal.m4
+++ b/contrib/byacc/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.59 2023/01/05 22:53:11 tom Exp $
+dnl $Id: aclocal.m4,v 1.65 2023/12/01 22:22:50 tom Exp $
 dnl Macros for byacc configure script (Thomas E. Dickey)
 dnl ---------------------------------------------------------------------------
 dnl Copyright 2004-2022,2023 Thomas E. Dickey
@@ -207,7 +207,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_C11_NORETURN version: 3 updated: 2021/03/28 11:36:23
+dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25
 dnl ---------------
 AC_DEFUN([CF_C11_NORETURN],
 [
@@ -221,8 +221,7 @@ AC_MSG_RESULT($enable_stdnoreturn)
 if test $enable_stdnoreturn = yes; then
 AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn,
 	[AC_TRY_COMPILE([
-#include <stdio.h>
-#include <stdlib.h>
+$ac_includes_default
 #include <stdnoreturn.h>
 static _Noreturn void giveup(void) { exit(0); }
 	],
@@ -246,7 +245,7 @@ AC_SUBST(HAVE_STDNORETURN_H)
 AC_SUBST(STDC_NORETURN)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20
+dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler
@@ -287,7 +286,7 @@ case "$CC" in
 	AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
-	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
+	cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"`
 	CC="$cf_prog"
 	for cf_arg in $cf_flags
 	do
@@ -345,7 +344,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04
+dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
@@ -367,7 +366,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 	AC_TRY_COMPILE([],[
 #ifdef __clang__
 #else
-make an error
+#error __clang__ is not defined
 #endif
 ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
 ],[])
@@ -413,7 +412,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -448,6 +447,7 @@ AC_TRY_COMPILE(
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
 		[
+#undef  _CONST_X_STRING
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
 #undef  XTSTRINGDEFINES	/* X11R5 and later */
 #include <stdlib.h>
@@ -718,7 +718,7 @@ rm -rf ./conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36
+dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13
 dnl --------------
 dnl Find version of gcc, and (because icc/clang pretend to be gcc without being
 dnl compatible), attempt to determine if icc/clang is actually used.
@@ -727,7 +727,7 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
@@ -986,7 +986,152 @@ if test x$cf_cv_gnu_library = xyes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59
+dnl CF_INSTALL_MAN version: 5 updated: 2023/05/21 15:53:07
+dnl --------------
+dnl Call this to generate a script "install-man" which uses the detected
+dnl manpage-format to compress the resulting manpage.  Providing this as a
+dnl macro simplifies including the script in different programs.
+dnl
+dnl The generated script assumes that the program can be renamed, using two
+dnl symbols in the manpage, e.g.,
+dnl		.ds N Yacc
+dnl     .ds n yacc
+dnl which are later used as \*N and \*n, as well as a special case in the
+dnl synopsis to work around limitations of makewhatis.
+dnl
+dnl Script parameters:
+dnl	$1 = input file
+dnl	$2 = output filename
+dnl
+dnl or (uninstall):
+dnl	$1 = output filename
+AC_DEFUN([CF_INSTALL_MAN],
+[
+AC_REQUIRE([AC_ARG_PROGRAM])
+AC_REQUIRE([AC_PROG_INSTALL])
+AC_REQUIRE([AC_LN_S])
+AC_REQUIRE([CF_MANPAGE_FORMAT])
+cf_install_man=install-man
+ac_config_files="$ac_config_files $cf_install_man"
+cf_install_man=$cf_install_man.in
+echo [$]as_me: creating $cf_install_man
+cat >[$]cf_install_man <<"CF_EOF"
+#!/bin/sh
+# generated by CF_INSTALL_MAN
+
+LANG=C;     export LANG
+LC_ALL=C;   export LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+LANGUAGE=C; export LANGUAGE
+
+INSTALL="@INSTALL@"
+INSTALL_DATA="@INSTALL_DATA@"
+
+usage() {
+	cat <<EOF
+Usage: install-man [[-l]] [[source]] target
+EOF
+	exit 1
+}
+
+failed() {
+	echo "?? [$]*" >&2
+	exit 1
+}
+
+test [$]# != 0 || usage
+OPTS=
+case "x[$]1" in
+(x-l)
+	OPTS="link"
+	shift
+	;;
+(x-*)
+	usage
+	;;
+esac
+
+source=
+if test [$]# = 2 ; then
+	source=[$]1; shift
+	target=[$]1
+elif test [$]# = 1 ; then
+	test -n "$OPTS" && usage
+	target=[$]1
+else
+	usage
+fi
+
+origin_name=`echo "$source" |sed -e 's%^.*/%%' -e 's%\..*%%'`
+actual_name=`echo "$origin_name" |sed '@program_transform_name@'`
+leading_cap=`echo "$actual_name" | sed -e 's%^\(.\).*$%\1%' | tr a-z A-Z``echo "$actual_name" | sed -e 's%^.%%'`
+capitalized=`echo "$actual_name" | tr a-z A-Z`
+
+cf_tmpdir=`mktemp -d`
+trap 'rm -rf "$cf_tmpdir"; exit 1' 1 2 3 15
+trap 'rm -rf "$cf_tmpdir"; exit 0' 0
+
+if test -n "$source" ; then
+	suffix=
+	test -n "@cf_manpage_so_strip" && suffix=".@cf_manpage_so_strip@"
+	if test "x$OPTS" = xlink ; then
+		source_dir=`echo "$source" | sed -e "s%/[[^/]]*$%%"`
+		target_dir=`echo "$target" | sed -e "s%/[[^/]]*$%%"`
+		sourcelink="${source}${suffix}" 
+		targetfile="${target}${suffix}" 
+		targetlink="${target_dir}/${sourcelink}"
+		if test ! -d "$target_dir" ; then
+			failed "target directory does not exist: $target_dir"
+		elif test ! -f "$targetfile" ; then
+			failed "target file does not exist: $targetfile"
+		elif test "$source" != "$source_dir" ; then
+			failed "unexpected directory for source-link: $source_dir"
+		fi
+		test -f "$targetlink" && failed "already exists $targetlink"
+		( cd "$target_dir" && @LN_S@ "`echo "$targetfile" | sed -e 's%^.*/%%'`" "$sourcelink" )
+		test -f "$targetlink" || failed "cannot create $targetlink"
+		target="$targetlink"
+	else
+		echo "** installing $source to $target"
+		interim="$cf_tmpdir"/"`basename $source`"
+		if test "x$origin_name" != "x$actual_name" ; then
+			sed \
+				-e "/^.ds N/s%N.*%N $leading_cap%" \
+				-e "/^.ds n/s%n.*%n $actual_name%" \
+				-e "/^\.TH/s%[[ ]][[ ]]*[[^ ]][[^ ]]*% $capitalized%" \
+				-e "/^\.SH[[ ]][[ ]]*NAME/,/[[ ]]\\\\-[[ ]]/s%^\\\\\\*[[Nn]]%$actual_name%" \
+				"$source" >"$interim" || exit 1
+			diff -c "$source" "$interim"
+		else
+			cp "$source" "$interim" || exit 1
+		fi
+		if test -n "@cf_manpage_compress@" ; then
+			@cf_manpage_compress@ "$interim"
+			source="${interim}${suffix}"
+		fi
+		if test -d "$target" ; then
+			target="$target"/"$source"
+		else
+			test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@"
+		fi
+		$INSTALL_DATA "$source" "$target" || exit 1
+	fi
+	echo "...installed $target"
+else
+	echo "** removing $target"
+	test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@"
+	if test -f "$target" ; then
+		rm -f "$target"
+		echo "...removed $target"
+	else
+		echo "...not found"
+	fi
+fi
+exit 0
+CF_EOF
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -1012,7 +1157,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 		AC_TRY_COMPILE([],[
 #ifdef __INTEL_COMPILER
 #else
-make an error
+#error __INTEL_COMPILER is not defined
 #endif
 ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1126,6 +1271,162 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02
+dnl -----------------
+dnl Option to allow user to override automatic configuration of manpage format.
+dnl There are several special cases:
+dnl
+dnl	compress - man checks for, can display compressed files
+dnl	bzip2 - man checks for, can display bzip2'd files
+dnl	gzip - man checks for, can display gzip'd files
+dnl	xz - man checks for, can display xz'd files
+dnl
+dnl	BSDI - files in the cat-directories are suffixed ".0"
+dnl	formatted - installer should format (put files in cat-directory)
+dnl	catonly - installer should only format, e.g., for a turnkey system.
+dnl
+dnl There are other configurations which this macro does not test, e.g., HPUX's
+dnl compressed manpages (but uncompressed manpages are fine, and HPUX's naming
+dnl convention would not match our use).
+AC_DEFUN([CF_MANPAGE_FORMAT],
+[
+AC_REQUIRE([CF_PATHSEP])
+AC_MSG_CHECKING(format of man-pages)
+
+AC_ARG_WITH(manpage-format,
+	[  --with-manpage-format   specify manpage-format: gzip/compress/bzip2/xz,
+                          BSDI/normal and optionally formatted/catonly,
+                          e.g., gzip,formatted],
+	[MANPAGE_FORMAT=$withval],
+	[MANPAGE_FORMAT=unknown])
+
+test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown
+MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'`
+
+cf_unknown=
+
+case "$MANPAGE_FORMAT" in
+(unknown)
+	if test -z "$MANPATH" ; then
+		MANPATH="/usr/man:/usr/share/man"
+	fi
+
+	# look for the 'date' man-page (it is most likely to be installed!)
+	MANPAGE_FORMAT=
+	cf_preform="no"
+	cf_catonly="yes"
+	cf_example="date"
+
+	IFS="${IFS:- 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+	for cf_dir in $MANPATH; do
+		test -z "$cf_dir" && cf_dir=/usr/man
+		for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
+		do
+			cf_test=`echo "$cf_name" | sed -e 's/*//'`
+			if test "x$cf_test" = "x$cf_name" ; then
+
+				case "$cf_name" in
+				(*.bz2) MANPAGE_FORMAT="$MANPAGE_FORMAT bzip2";;
+				(*.xz)  MANPAGE_FORMAT="$MANPAGE_FORMAT xz";;
+				(*.gz)  MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";;
+				(*.Z)   MANPAGE_FORMAT="$MANPAGE_FORMAT compress";;
+				(*.0)   MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";;
+				(*)     MANPAGE_FORMAT="$MANPAGE_FORMAT normal";;
+				esac
+
+				case "$cf_name" in
+				($cf_dir/man*)
+					cf_catonly=no
+					;;
+				($cf_dir/cat*)
+					cf_preform=yes
+					;;
+				esac
+				break
+			fi
+
+			# if we found a match in either man* or cat*, stop looking
+			if test -n "$MANPAGE_FORMAT" ; then
+				cf_found=no
+				test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted"
+				test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly"
+				case "$cf_name" in
+				($cf_dir/cat*)
+					cf_found=yes
+					;;
+				esac
+				test "$cf_found" = yes && break
+			fi
+		done
+		# only check the first directory in $MANPATH where we find manpages
+		if test -n "$MANPAGE_FORMAT" ; then
+			break
+		fi
+	done
+	# if we did not find the example, just assume it is normal
+	test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal
+	IFS="$ac_save_ifs"
+	;;
+(*)
+	for cf_option in $MANPAGE_FORMAT; do
+	case "$cf_option" in
+	(xz|bzip2|gzip|compress|BSDI|normal|formatted|catonly)
+		;;
+	(*)
+		cf_unknown="$cf_unknown $cf_option"
+		;;
+	esac
+	done
+	;;
+esac
+
+AC_MSG_RESULT($MANPAGE_FORMAT)
+if test -n "$cf_unknown" ; then
+	AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
+fi
+
+cf_manpage_format=no
+cf_manpage_inboth=no
+cf_manpage_so_strip=
+cf_manpage_compress=
+
+for cf_item in $MANPAGE_FORMAT
+do
+case "$cf_item" in
+(catonly)
+	cf_manpage_format=yes
+	cf_manpage_inboth=no
+	;;
+(formatted)
+	cf_manpage_format=yes
+	cf_manpage_inboth=yes
+	;;
+(compress)
+	cf_manpage_so_strip="Z"
+	cf_manpage_compress=compress
+	;;
+(gzip)
+	cf_manpage_so_strip="gz"
+	cf_manpage_compress=gzip
+	;;
+(bzip2)
+	cf_manpage_so_strip="bz2"
+	cf_manpage_compress=bzip2
+	;;
+(xz)
+	cf_manpage_so_strip="xz"
+	cf_manpage_compress=xz
+	;;
+esac
+done
+
+AC_SUBST(cf_manpage_format)
+AC_SUBST(cf_manpage_inboth)
+AC_SUBST(cf_manpage_so_strip)
+AC_SUBST(cf_manpage_compress)
+
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
@@ -1156,7 +1457,7 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 12 updated: 2023/01/05 17:53:11
+dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
@@ -1171,7 +1472,7 @@ $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -1255,6 +1556,22 @@ case ".$with_cflags" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PATHSEP version: 8 updated: 2021/01/01 13:31:04
+dnl ----------
+dnl Provide a value for the $PATH and similar separator (or amend the value
+dnl as provided in autoconf 2.5x).
+AC_DEFUN([CF_PATHSEP],
+[
+	AC_MSG_CHECKING(for PATH separator)
+	case "$cf_cv_system_name" in
+	(os2*)	PATH_SEPARATOR=';'  ;;
+	(*)	${PATH_SEPARATOR:=':'}  ;;
+	esac
+ifelse([$1],,,[$1=$PATH_SEPARATOR])
+	AC_SUBST(PATH_SEPARATOR)
+	AC_MSG_RESULT($PATH_SEPARATOR)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
@@ -1292,7 +1609,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17
+dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
@@ -1323,7 +1640,7 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
 	CF_MSG_LOG(if the symbol is already defined go no further)
 	AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif],
 	[cf_cv_posix_c_source=no],
 	[cf_want_posix_source=no
@@ -1342,7 +1659,7 @@ make an error
 	 if test "$cf_want_posix_source" = yes ; then
 		AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifdef _POSIX_SOURCE
-make an error
+#error _POSIX_SOURCE is defined
 #endif],[],
 		cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
 	 fi
@@ -1353,7 +1670,7 @@ make an error
 	 CF_MSG_LOG(if the second compile does not leave our definition intact error)
 	 AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif],,
 	 [cf_cv_posix_c_source=no])
 	 CFLAGS="$cf_save_CFLAGS"
@@ -1578,7 +1895,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_MAN2HTML version: 12 updated: 2021/01/03 18:30:50
+dnl CF_WITH_MAN2HTML version: 13 updated: 2023/11/23 06:40:35
 dnl ----------------
 dnl Check for man2html and groff.  Prefer man2html over groff, but use groff
 dnl as a fallback.  See
@@ -1620,7 +1937,7 @@ esac
 
 AC_MSG_CHECKING(for program to convert manpage to html)
 AC_ARG_WITH(man2html,
-	[  --with-man2html=XXX     use XXX rather than groff],
+	[[  --with-man2html[=XXX]   use XXX rather than groff]],
 	[cf_man2html=$withval],
 	[cf_man2html=$cf_man2html])
 
@@ -1761,7 +2078,7 @@ CF_NO_LEAKS_OPTION(valgrind,
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 63 updated: 2022/12/29 10:10:26
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1770,6 +2087,18 @@ dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
+dnl
+dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the
+dnl implementation predefines it, because X/Open and most implementations agree
+dnl that the latter is a legacy or "aligned" value.
+dnl
+dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns
+dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly.
+dnl
+dnl References:
+dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html
+dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
+dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
 AC_DEFUN([CF_XOPEN_SOURCE],[
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([CF_POSIX_VISIBLE])
@@ -1784,9 +2113,6 @@ case "$host_os" in
 (aix[[4-7]]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(msys)
-	cf_XOPEN_SOURCE=600
-	;;
 (darwin[[0-8]].*)
 	cf_xopen_source="-D_APPLE_C_SOURCE"
 	;;
@@ -1812,7 +2138,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -1864,8 +2190,8 @@ case "$host_os" in
 	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	if test "$cf_cv_xopen_source" = no ; then
+		CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE)
 		AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
 			AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
 			CPPFLAGS="$cf_save_xopen_cppflags"])
@@ -1884,7 +2210,7 @@ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 	AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
 	AC_TRY_COMPILE([#include <stdlib.h>],[
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif],
 	[cf_XOPEN_SOURCE_set=yes],
 	[cf_XOPEN_SOURCE_set=no])
@@ -1893,7 +2219,7 @@ make an error
 	then
 		AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-make an error
+#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
 #endif],
 		[cf_XOPEN_SOURCE_set_ok=yes],
 		[cf_XOPEN_SOURCE_set_ok=no])
@@ -1908,22 +2234,20 @@ fi
 fi # cf_cv_posix_visible
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF__XOPEN_SOURCE_BODY version: 1 updated: 2022/09/10 15:17:35
+dnl CF__XOPEN_SOURCE_BODY version: 2 updated: 2023/02/18 17:41:25
 dnl ---------------------
 dnl body of test when test-compiling for _XOPEN_SOURCE check
 define([CF__XOPEN_SOURCE_BODY],
 [
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF__XOPEN_SOURCE_HEAD version: 1 updated: 2022/09/10 15:17:03
+dnl CF__XOPEN_SOURCE_HEAD version: 2 updated: 2023/02/18 17:41:25
 dnl ---------------------
 dnl headers to include when test-compiling for _XOPEN_SOURCE check
 define([CF__XOPEN_SOURCE_HEAD],
 [
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 ])
diff --git a/contrib/byacc/config.guess b/contrib/byacc/config.guess
index a419d8643b62..cdfc4392047c 100755
--- a/contrib/byacc/config.guess
+++ b/contrib/byacc/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2023-08-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -60,13 +60,13 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -155,6 +155,9 @@ Linux|GNU|GNU/*)
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
+	#if defined(__ANDROID__)
+	LIBC=android
+	#else
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -169,6 +172,7 @@ Linux|GNU|GNU/*)
 	LIBC=musl
 	#endif
 	#endif
+	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -459,7 +463,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -904,7 +908,7 @@ EOF
 	fi
 	;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
@@ -966,11 +970,37 @@ EOF
 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
 	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
 	;;
+    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+	;;
+    *:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	;;
     *:Minix:*:*)
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
     aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	set_cc_for_build
+	CPU=$UNAME_MACHINE
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __ARM_EABI__
+	    #ifdef __ARM_PCS_VFP
+	    ABI=eabihf
+	    #else
+	    ABI=eabi
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
+	    esac
+	fi
+	GUESS=$CPU-unknown-linux-$LIBCABI
 	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -1036,6 +1066,15 @@ EOF
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
+    kvx:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    kvx:cos:*:*)
+	GUESS=$UNAME_MACHINE-unknown-cos
+	;;
+    kvx:mbr:*:*)
+	GUESS=$UNAME_MACHINE-unknown-mbr
+	;;
     loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
@@ -1191,7 +1230,7 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1332,7 +1371,7 @@ EOF
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;
diff --git a/contrib/byacc/config.sub b/contrib/byacc/config.sub
index fbaa37f2352d..51394d32014e 100755
--- a/contrib/byacc/config.sub
+++ b/contrib/byacc/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2023-09-15'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -130,7 +130,7 @@ IFS=$saved_IFS
 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
+		echo "Invalid configuration '$1': more than four components" >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -145,7 +145,8 @@ case $1 in
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova*)
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -943,7 +944,7 @@ $basic_machine
 EOF
 		IFS=$saved_IFS
 		;;
-	# We use `pc' rather than `unknown'
+	# We use 'pc' rather than 'unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1075,7 +1076,7 @@ case $cpu-$vendor in
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
 		cpu=i686
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1180,7 +1181,7 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be \
+			| aarch64 | aarch64_be | aarch64c | arm64ec \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1199,12 +1200,14 @@ case $cpu-$vendor in
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 			| hexagon \
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
+			| kvx \
 			| le32 | le64 \
 			| lm32 \
 			| loongarch32 | loongarch64 \
@@ -1213,31 +1216,7 @@ case $cpu-$vendor in
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64eb | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
+			| mips* \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
@@ -1285,7 +1264,7 @@ case $cpu-$vendor in
 				;;
 
 			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
 				exit 1
 				;;
 		esac
@@ -1306,11 +1285,12 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if test x"$basic_os" != x
 then
 
 # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
+obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
@@ -1341,6 +1321,10 @@ EOF
 		kernel=linux
 		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
 		;;
+	managarm*)
+		kernel=managarm
+		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+		;;
 	*)
 		kernel=
 		os=$basic_os
@@ -1506,10 +1490,16 @@ case $os in
 			os=eabi
 			;;
 		    *)
-			os=elf
+			os=
+			obj=elf
 			;;
 		esac
 		;;
+	aout* | coff* | elf* | pe*)
+		# These are machine code file formats, not OSes
+		obj=$os
+		os=
+		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1528,12 +1518,15 @@ else
 # system, and we'll never get to this point.
 
 kernel=
+obj=
 case $cpu-$vendor in
 	score-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	spu-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1543,28 +1536,35 @@ case $cpu-$vendor in
 		os=gnu
 		;;
 	arm*-semi)
-		os=aout
+		os=
+		obj=aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	c8051-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	tic54x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic55x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic6x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1586,19 +1586,24 @@ case $cpu-$vendor in
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=
+		obj=aout
 		;;
 	mep-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	or32-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1607,7 +1612,8 @@ case $cpu-$vendor in
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-be)
 		os=beos
@@ -1688,10 +1694,12 @@ case $cpu-$vendor in
 		os=uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-*bug)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-apple)
 		os=macos
@@ -1709,7 +1717,8 @@ esac
 
 fi
 
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
+
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
 	musl* | newlib* | relibc* | uclibc*)
@@ -1720,6 +1729,9 @@ case $os in
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;
+	# See `case $cpu-$os` validation below
+	ghcjs)
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1728,7 +1740,7 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
+	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1737,11 +1749,11 @@ case $os in
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
 	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | bosx* | nextstep* | cxux* | oabi* \
+	     | ptx* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
 	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | cygwin* | msys* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1754,7 +1766,7 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* )
+	     | fiwix* | mlibc* | cos* | mbr* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1762,41 +1774,99 @@ case $os in
 		;;
 	none)
 		;;
+	kernel* | msvc* )
+		# Restricted further below
+		;;
+	'')
+		if test x"$obj" = x
+		then
+			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
+		fi
+		;;
+	*)
+		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+case $obj in
+	aout* | coff* | elf* | pe*)
+		;;
+	'')
+		# empty is fine
+		;;
 	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+# Here we handle the constraint that a (synthetic) cpu and os are
+# valid only in combination with each other and nowhere else.
+case $cpu-$os in
+	# The "javascript-unknown-ghcjs" triple is used by GHC; we
+	# accept it here in order to tolerate that, but reject any
+	# variations.
+	javascript-ghcjs)
+		;;
+	javascript-* | *-ghcjs)
+		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
 		exit 1
 		;;
 esac
 
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		   | linux-musl* | linux-relibc* | linux-uclibc* )
+case $kernel-$os-$obj in
+	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
+		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
+		;;
+	uclinux-uclibc*- )
 		;;
-	uclinux-uclibc* )
+	managarm-mlibc*- | managarm-kernel*- )
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+	windows*-gnu*- | windows*-msvc*-)
+		;;
+	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
+	-kernel*- )
+		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
+		exit 1
 		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+	*-kernel*- )
+		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
+		exit 1
 		;;
-	nto-qnx*)
+	*-msvc*- )
+		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
+		exit 1
 		;;
-	os2-emx)
+	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
-	*-eabi* | *-gnueabi*)
+	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
-	-*)
+	nto-qnx*-)
+		;;
+	os2-emx-)
+		;;
+	*-eabi*- | *-gnueabi*-)
+		;;
+	none--*)
+		# None (no kernel, i.e. freestanding / bare metal),
+		# can be paired with an machine code file format
+		;;
+	-*-)
 		# Blank kernel with real OS is always fine.
 		;;
-	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+	--*)
+		# Blank kernel and OS with real machine code file format is always fine.
+		;;
+	*-*-*)
+		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
 esac
@@ -1879,7 +1949,7 @@ case $vendor in
 		;;
 esac
 
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit
 
 # Local variables:
diff --git a/contrib/byacc/configure b/contrib/byacc/configure
index cb47b4c5492f..16a9036fd0de 100755
--- a/contrib/byacc/configure
+++ b/contrib/byacc/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.28 .
+# From configure.in Revision: 1.29 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230114.
+# Generated by Autoconf 2.52.20231210.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -711,7 +711,10 @@ Optional Features:
   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
   --with-valgrind         test: use valgrind
   --disable-leaks         test: free permanent memory, analyze leaks
-  --with-man2html=XXX     use XXX rather than groff
+  --with-manpage-format   specify manpage-format: gzip/compress/bzip2/xz,
+                          BSDI/normal and optionally formatted/catonly,
+                          e.g., gzip,formatted
+  --with-man2html[=XXX]   use XXX rather than groff
 
 Some influential environment variables:
   CC          C compiler command
@@ -782,7 +785,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230114.  Invocation command line was
+generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
 
@@ -906,7 +909,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:909: loading site script $ac_site_file" >&5
+    { echo "$as_me:912: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -917,7 +920,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:920: loading cache $cache_file" >&5
+    { echo "$as_me:923: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -925,7 +928,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:928: creating cache $cache_file" >&5
+  { echo "$as_me:931: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -941,21 +944,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:944: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:947: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:948: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:951: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:954: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:957: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:956:   former value:  $ac_old_val" >&5
+        { echo "$as_me:959:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:958:   current value: $ac_new_val" >&5
+        { echo "$as_me:961:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -974,9 +977,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:977: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:980: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:979: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:982: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1005,10 +1008,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1008: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1011: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1011: \$? = $ac_status" >&5
+  echo "$as_me:1014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1036,7 +1039,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1039: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1042: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1046,11 +1049,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1049: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1052: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1053: checking build system type" >&5
+echo "$as_me:1056: 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
@@ -1059,23 +1062,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1062: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1065: 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:1066: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1069: 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:1071: result: $ac_cv_build" >&5
+echo "$as_me:1074: 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:1078: checking host system type" >&5
+echo "$as_me:1081: 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
@@ -1084,12 +1087,12 @@ else
 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:1087: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1090: 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:1092: result: $ac_cv_host" >&5
+echo "$as_me:1095: 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/'`
@@ -1097,7 +1100,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1100: checking target system type" >&5
+	echo "$as_me:1103: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1106,12 +1109,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
-  { { echo "$as_me:1109: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1112: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1114: result: $ac_cv_target" >&5
+echo "$as_me:1117: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1143,13 +1146,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1146: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1149: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1150: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1153: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1152: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1155: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1176,7 +1179,7 @@ ac_main_return="return"
 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:1179: checking for $ac_word" >&5
+echo "$as_me:1182: 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
@@ -1191,7 +1194,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1194: found $ac_dir/$ac_word" >&5
+echo "$as_me:1197: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1199,10 +1202,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1202: result: $CC" >&5
+  echo "$as_me:1205: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1205: result: no" >&5
+  echo "$as_me:1208: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1211,7 +1214,7 @@ 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:1214: checking for $ac_word" >&5
+echo "$as_me:1217: 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
@@ -1226,7 +1229,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1229: found $ac_dir/$ac_word" >&5
+echo "$as_me:1232: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1234,10 +1237,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1237: result: $ac_ct_CC" >&5
+  echo "$as_me:1240: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1240: result: no" >&5
+  echo "$as_me:1243: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1250,7 +1253,7 @@ 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:1253: checking for $ac_word" >&5
+echo "$as_me:1256: 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
@@ -1265,7 +1268,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1268: found $ac_dir/$ac_word" >&5
+echo "$as_me:1271: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1273,10 +1276,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1276: result: $CC" >&5
+  echo "$as_me:1279: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1279: result: no" >&5
+  echo "$as_me:1282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1285,7 +1288,7 @@ 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:1288: checking for $ac_word" >&5
+echo "$as_me:1291: 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
@@ -1300,7 +1303,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1303: found $ac_dir/$ac_word" >&5
+echo "$as_me:1306: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1308,10 +1311,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1311: result: $ac_ct_CC" >&5
+  echo "$as_me:1314: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1314: result: no" >&5
+  echo "$as_me:1317: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1324,7 +1327,7 @@ 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:1327: checking for $ac_word" >&5
+echo "$as_me:1330: 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
@@ -1344,7 +1347,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1347: found $ac_dir/$ac_word" >&5
+echo "$as_me:1350: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1366,10 +1369,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1369: result: $CC" >&5
+  echo "$as_me:1372: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1372: result: no" >&5
+  echo "$as_me:1375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1380,7 +1383,7 @@ if test -z "$CC"; then
   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:1383: checking for $ac_word" >&5
+echo "$as_me:1386: 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
@@ -1395,7 +1398,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1398: found $ac_dir/$ac_word" >&5
+echo "$as_me:1401: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1403,10 +1406,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1406: result: $CC" >&5
+  echo "$as_me:1409: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1409: result: no" >&5
+  echo "$as_me:1412: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1419,7 +1422,7 @@ if test -z "$CC"; then
 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:1422: checking for $ac_word" >&5
+echo "$as_me:1425: 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
@@ -1434,7 +1437,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1437: found $ac_dir/$ac_word" >&5
+echo "$as_me:1440: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1442,10 +1445,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1445: result: $ac_ct_CC" >&5
+  echo "$as_me:1448: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1448: result: no" >&5
+  echo "$as_me:1451: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1457,32 +1460,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1460: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1463: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1465:" \
+echo "$as_me:1468:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1468: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1471: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1471: \$? = $ac_status" >&5
+  echo "$as_me:1474: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1473: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1476: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1476: \$? = $ac_status" >&5
+  echo "$as_me:1479: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1478: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1481: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1481: \$? = $ac_status" >&5
+  echo "$as_me:1484: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1485 "configure"
+#line 1488 "configure"
 #include "confdefs.h"
 
 int
@@ -1498,13 +1501,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1501: checking for C compiler default output" >&5
+echo "$as_me:1504: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
-if { (eval echo "$as_me:1504: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1507: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1507: \$? = $ac_status" >&5
+  echo "$as_me:1510: \$? = $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
@@ -1527,34 +1530,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1530: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1533: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1536: result: $ac_file" >&5
+echo "$as_me:1539: 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:1541: checking whether the C compiler works" >&5
+echo "$as_me:1544: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1550: \$? = $ac_status" >&5
+  echo "$as_me:1553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1557: error: cannot run C compiled programs.
+	{ { echo "$as_me:1560: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1562,24 +1565,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1565: result: yes" >&5
+echo "$as_me:1568: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe "conftest$ac_cv_exeext"
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1572: checking whether we are cross compiling" >&5
+echo "$as_me:1575: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1574: result: $cross_compiling" >&5
+echo "$as_me:1577: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1577: checking for executable suffix" >&5
+echo "$as_me:1580: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1582: \$? = $ac_status" >&5
+  echo "$as_me:1585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1595,25 +1598,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1598: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1601: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest$ac_cv_exeext"
-echo "$as_me:1604: result: $ac_cv_exeext" >&5
+echo "$as_me:1607: 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:1610: checking for object suffix" >&5
+echo "$as_me:1613: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1616 "configure"
+#line 1619 "configure"
 #include "confdefs.h"
 
 int
@@ -1625,10 +1628,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1631: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1631: \$? = $ac_status" >&5
+  echo "$as_me:1634: \$? = $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
@@ -1640,24 +1643,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1643: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1646: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1650: result: $ac_cv_objext" >&5
+echo "$as_me:1653: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1654: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1657: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1660 "configure"
+#line 1663 "configure"
 #include "confdefs.h"
 
 int
@@ -1672,16 +1675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1678: \$? = $ac_status" >&5
+  echo "$as_me:1681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1684: \$? = $ac_status" >&5
+  echo "$as_me:1687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1693,19 +1696,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1696: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1699: 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:1702: checking whether $CC accepts -g" >&5
+echo "$as_me:1705: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1708 "configure"
+#line 1711 "configure"
 #include "confdefs.h"
 
 int
@@ -1717,16 +1720,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1723: \$? = $ac_status" >&5
+  echo "$as_me:1726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1729: \$? = $ac_status" >&5
+  echo "$as_me:1732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1736,7 +1739,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1739: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1742: 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
@@ -1763,16 +1766,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1769: \$? = $ac_status" >&5
+  echo "$as_me:1772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1775: \$? = $ac_status" >&5
+  echo "$as_me:1778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1784,7 +1787,7 @@ if { (eval echo "$as_me:1766: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1787 "configure"
+#line 1790 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1797,16 +1800,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1803: \$? = $ac_status" >&5
+  echo "$as_me:1806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1809: \$? = $ac_status" >&5
+  echo "$as_me:1812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1816,7 +1819,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1819 "configure"
+#line 1822 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1828,16 +1831,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1834: \$? = $ac_status" >&5
+  echo "$as_me:1837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1840: \$? = $ac_status" >&5
+  echo "$as_me:1843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1867,11 +1870,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1870: checking version of $CC" >&5
+	echo "$as_me:1873: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1874: result: $GCC_VERSION" >&5
+	echo "$as_me:1877: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1880,12 +1883,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1883: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1886: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 1888 "configure"
+#line 1891 "configure"
 #include "confdefs.h"
 
 int
@@ -1894,7 +1897,7 @@ main (void)
 
 #ifdef __INTEL_COMPILER
 #else
-make an error
+#error __INTEL_COMPILER is not defined
 #endif
 
   ;
@@ -1902,16 +1905,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1908: \$? = $ac_status" >&5
+  echo "$as_me:1911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1914: \$? = $ac_status" >&5
+  echo "$as_me:1917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1922,7 +1925,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1925: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1928: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1931,11 +1934,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1934: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1937: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 1938 "configure"
+#line 1941 "configure"
 #include "confdefs.h"
 
 int
@@ -1944,7 +1947,7 @@ main (void)
 
 #ifdef __clang__
 #else
-make an error
+#error __clang__ is not defined
 #endif
 
   ;
@@ -1952,16 +1955,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1958: \$? = $ac_status" >&5
+  echo "$as_me:1961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1964: \$? = $ac_status" >&5
+  echo "$as_me:1967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -1971,7 +1974,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:1974: result: $CLANG_COMPILER" >&5
+	echo "$as_me:1977: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -1980,30 +1983,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:1983: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:1986: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:1990: checking version of $CC" >&5
+	echo "$as_me:1993: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:1994: result: $CLANG_VERSION" >&5
+	echo "$as_me:1997: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2001: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2004: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2006 "configure"
+#line 2009 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2017,16 +2020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2023: \$? = $ac_status" >&5
+  echo "$as_me:2026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2029: \$? = $ac_status" >&5
+  echo "$as_me:2032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2037,13 +2040,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2040: result: $cf_clang_optok" >&5
+		echo "$as_me:2043: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2046: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2049: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2052,7 +2055,7 @@ echo "${as_me:-configure}:2046: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2055: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2058: 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
@@ -2060,7 +2063,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2063 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2107,16 +2110,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2113: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2113: \$? = $ac_status" >&5
+  echo "$as_me:2116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2119: \$? = $ac_status" >&5
+  echo "$as_me:2122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2133,10 +2136,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2136: result: none needed" >&5
+    echo "$as_me:2139: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2139: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2142: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2144,13 +2147,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2147: checking \$CFLAGS variable" >&5
+echo "$as_me:2150: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2151: result: broken" >&5
+	echo "$as_me:2154: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2156: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 	cf_flags="$CFLAGS"
 	CFLAGS=
@@ -2258,22 +2261,22 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2261: result: ok" >&5
+	echo "$as_me:2264: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2266: checking \$CC variable" >&5
+echo "$as_me:2269: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2270: result: broken" >&5
+	echo "$as_me:2273: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2275: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
-	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+	cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"`
 	CC="$cf_prog"
 	for cf_arg in $cf_flags
 	do
@@ -2386,24 +2389,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2392: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2396: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2400: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2401: result: ok" >&5
+	echo "$as_me:2404: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2409: 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
@@ -2423,11 +2426,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2426: result: yes" >&5
+  echo "$as_me:2429: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2430: result: no" >&5
+  echo "$as_me:2433: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2444,7 +2447,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2447: checking for a BSD compatible install" >&5
+echo "$as_me:2450: 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
@@ -2493,7 +2496,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2496: result: $INSTALL" >&5
+echo "$as_me:2499: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2504,7 +2507,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2507: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2510: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2531,7 +2534,7 @@ else
 fi
 
 fi
-echo "$as_me:2534: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2537: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2542,7 +2545,7 @@ for ac_prog in exctags ctags
 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:2545: checking for $ac_word" >&5
+echo "$as_me:2548: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2557,7 +2560,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2560: found $ac_dir/$ac_word" >&5
+echo "$as_me:2563: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2565,10 +2568,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2568: result: $CTAGS" >&5
+  echo "$as_me:2571: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2571: result: no" >&5
+  echo "$as_me:2574: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2579,7 +2582,7 @@ for ac_prog in exetags etags
 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:2582: checking for $ac_word" >&5
+echo "$as_me:2585: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2594,7 +2597,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2597: found $ac_dir/$ac_word" >&5
+echo "$as_me:2600: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2602,10 +2605,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2605: result: $ETAGS" >&5
+  echo "$as_me:2608: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2608: result: no" >&5
+  echo "$as_me:2611: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2614,7 +2617,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2617: checking for $ac_word" >&5
+echo "$as_me:2620: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2629,7 +2632,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2632: found $ac_dir/$ac_word" >&5
+echo "$as_me:2635: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2638,17 +2641,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2641: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2644: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2644: result: no" >&5
+  echo "$as_me:2647: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2651: checking for $ac_word" >&5
+echo "$as_me:2654: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2663,7 +2666,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2666: found $ac_dir/$ac_word" >&5
+echo "$as_me:2669: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2672,10 +2675,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2675: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2678: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2678: result: no" >&5
+  echo "$as_me:2681: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2699,7 +2702,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2702: checking for $ac_word" >&5
+echo "$as_me:2705: 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
@@ -2714,7 +2717,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2717: found $ac_dir/$ac_word" >&5
+echo "$as_me:2720: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2722,17 +2725,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2725: result: $AWK" >&5
+  echo "$as_me:2728: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2728: result: no" >&5
+  echo "$as_me:2731: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-test -z "$AWK" && { { echo "$as_me:2735: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:2738: error: No awk program found" >&5
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -2740,7 +2743,7 @@ for ac_prog in lint cppcheck splint
 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:2743: checking for $ac_word" >&5
+echo "$as_me:2746: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2755,7 +2758,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2758: found $ac_dir/$ac_word" >&5
+echo "$as_me:2761: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2763,10 +2766,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2766: result: $LINT" >&5
+  echo "$as_me:2769: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2769: result: no" >&5
+  echo "$as_me:2772: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2779,14 +2782,14 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:2782: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:2785: checking if the POSIX test-macros are already defined" >&5
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2789 "configure"
+#line 2792 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -2805,16 +2808,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2811: \$? = $ac_status" >&5
+  echo "$as_me:2814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2817: \$? = $ac_status" >&5
+  echo "$as_me:2820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -2825,7 +2828,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:2828: result: $cf_cv_posix_visible" >&5
+echo "$as_me:2831: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -2838,9 +2841,6 @@ case "$host_os" in
 (aix[4-7]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(msys)
-	cf_XOPEN_SOURCE=600
-	;;
 (darwin[0-8].*)
 	cf_xopen_source="-D_APPLE_C_SOURCE"
 	;;
@@ -2866,7 +2866,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
@@ -3416,7 +3416,7 @@ main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif
   ;
   return 0;
@@ -3461,7 +3461,7 @@ main (void)
 {
 
 #ifdef _POSIX_SOURCE
-make an error
+#error _POSIX_SOURCE is defined
 #endif
   ;
   return 0;
@@ -3507,7 +3507,7 @@ main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif
   ;
   return 0;
@@ -3698,16 +3698,14 @@ else
 #line 3698 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 
   ;
@@ -3715,16 +3713,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3721: \$? = $ac_status" >&5
+  echo "$as_me:3719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3727: \$? = $ac_status" >&5
+  echo "$as_me:3725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3736,19 +3734,17 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3739 "configure"
+#line 3737 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 
   ;
@@ -3756,16 +3752,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3762: \$? = $ac_status" >&5
+  echo "$as_me:3758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3768: \$? = $ac_status" >&5
+  echo "$as_me:3764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3780,7 +3776,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3783: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3779: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -3940,16 +3936,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3943: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3939: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:3949: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3945: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3952 "configure"
+#line 3948 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3957,23 +3953,23 @@ main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3970: \$? = $ac_status" >&5
+  echo "$as_me:3966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3976: \$? = $ac_status" >&5
+  echo "$as_me:3972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3994,7 +3990,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3997 "configure"
+#line 3993 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4002,23 +3998,23 @@ main (void)
 {
 
 #ifdef _POSIX_SOURCE
-make an error
+#error _POSIX_SOURCE is defined
 #endif
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4015: \$? = $ac_status" >&5
+  echo "$as_me:4011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4021: \$? = $ac_status" >&5
+  echo "$as_me:4017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4029,7 +4025,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4032: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4028: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4037,10 +4033,10 @@ echo "${as_me:-configure}:4032: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4040: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4036: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4043 "configure"
+#line 4039 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4048,23 +4044,23 @@ main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
 #endif
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4061: \$? = $ac_status" >&5
+  echo "$as_me:4057: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4067: \$? = $ac_status" >&5
+  echo "$as_me:4063: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4080,7 +4076,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4083: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4079: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -4190,25 +4186,23 @@ fi
 fi # cf_cv_posix_visible
 
 	# Some of these niche implementations use copy/paste, double-check...
-	if test "$cf_cv_xopen_source" != no ; then
-		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+	if test "$cf_cv_xopen_source" = no ; then
+		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:4196: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:4192: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4199 "configure"
+#line 4195 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 
   ;
@@ -4216,23 +4210,23 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4222: \$? = $ac_status" >&5
+  echo "$as_me:4216: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4228: \$? = $ac_status" >&5
+  echo "$as_me:4222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:4235: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:4229: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -4255,7 +4249,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:4258: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:4252: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -4267,7 +4261,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:4270: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:4264: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -4355,7 +4349,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:4358: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4352: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -4365,7 +4359,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:4368: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4362: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -4375,7 +4369,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:4378: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4372: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -4387,10 +4381,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:4390: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:4384: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4393 "configure"
+#line 4387 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4398,23 +4392,23 @@ main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4411: \$? = $ac_status" >&5
+  echo "$as_me:4405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4417: \$? = $ac_status" >&5
+  echo "$as_me:4411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -4423,12 +4417,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:4426: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:4420: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test "$cf_XOPEN_SOURCE_set" = yes
 	then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4431 "configure"
+#line 4425 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4436,23 +4430,23 @@ main (void)
 {
 
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-make an error
+#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
 #endif
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4449: \$? = $ac_status" >&5
+  echo "$as_me:4443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4455: \$? = $ac_status" >&5
+  echo "$as_me:4449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -4463,31 +4457,29 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:4466: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:4460: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:4471: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4465: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4478 "configure"
+#line 4472 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 
   ;
@@ -4495,16 +4487,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4501: \$? = $ac_status" >&5
+  echo "$as_me:4493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4507: \$? = $ac_status" >&5
+  echo "$as_me:4499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4516,19 +4508,17 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4519 "configure"
+#line 4511 "configure"
 #include "confdefs.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+$ac_includes_default
 
 int
 main (void)
 {
 
 #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
 #endif
 
   ;
@@ -4536,16 +4526,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4542: \$? = $ac_status" >&5
+  echo "$as_me:4532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4548: \$? = $ac_status" >&5
+  echo "$as_me:4538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4560,7 +4550,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4563: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4553: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4711,7 +4701,7 @@ for ac_prog in ggrep grep
 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:4714: checking for $ac_word" >&5
+echo "$as_me:4704: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4726,7 +4716,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:4729: found $ac_dir/$ac_word" >&5
+echo "$as_me:4719: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4734,10 +4724,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:4737: result: $GREP" >&5
+  echo "$as_me:4727: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:4740: result: no" >&5
+  echo "$as_me:4730: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4745,7 +4735,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:4748: checking for egrep" >&5
+echo "$as_me:4738: 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
@@ -4757,7 +4747,7 @@ else
 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:4760: checking for $ac_word" >&5
+echo "$as_me:4750: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4774,7 +4764,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:4777: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4767: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -4785,10 +4775,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:4788: result: $EGREP" >&5
+  echo "$as_me:4778: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:4791: result: no" >&5
+  echo "$as_me:4781: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4796,12 +4786,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4799: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4789: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:4804: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:4794: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -4811,7 +4801,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
-echo "$as_me:4814: checking how to run the C preprocessor" >&5
+echo "$as_me:4804: 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
@@ -4832,18 +4822,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4835 "configure"
+#line 4825 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:4840: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4846: \$? = $ac_status" >&5
+  echo "$as_me:4836: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4866,17 +4856,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4869 "configure"
+#line 4859 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:4873: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4863: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4879: \$? = $ac_status" >&5
+  echo "$as_me:4869: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4913,7 +4903,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:4916: result: $CPP" >&5
+echo "$as_me:4906: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -4923,18 +4913,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4926 "configure"
+#line 4916 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:4931: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4937: \$? = $ac_status" >&5
+  echo "$as_me:4927: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4957,17 +4947,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4960 "configure"
+#line 4950 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:4964: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4954: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4970: \$? = $ac_status" >&5
+  echo "$as_me:4960: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4995,7 +4985,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:4998: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:4988: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5007,13 +4997,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:5010: checking for ANSI C header files" >&5
+echo "$as_me:5000: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5016 "configure"
+#line 5006 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5021,13 +5011,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5024: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5014: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5030: \$? = $ac_status" >&5
+  echo "$as_me:5020: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5049,7 +5039,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5052 "configure"
+#line 5042 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5067,7 +5057,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5070 "configure"
+#line 5060 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5088,7 +5078,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5091 "configure"
+#line 5081 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5114,15 +5104,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5120: \$? = $ac_status" >&5
+  echo "$as_me:5110: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5125: \$? = $ac_status" >&5
+  echo "$as_me:5115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5135,7 +5125,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:5138: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5128: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5151,28 +5141,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5154: checking for $ac_header" >&5
+echo "$as_me:5144: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5160 "configure"
+#line 5150 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5169: \$? = $ac_status" >&5
+  echo "$as_me:5159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5175: \$? = $ac_status" >&5
+  echo "$as_me:5165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5182,7 +5172,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5192,20 +5182,20 @@ EOF
 fi
 done
 
-echo "$as_me:5195: checking whether exit is declared" >&5
+echo "$as_me:5185: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5201 "configure"
+#line 5191 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
 main (void)
 {
 #ifndef exit
-  char *p = (char *) exit; (void) p;
+  (void) exit;
 #endif
 
   ;
@@ -5213,16 +5203,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5219: \$? = $ac_status" >&5
+  echo "$as_me:5209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5225: \$? = $ac_status" >&5
+  echo "$as_me:5215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -5232,29 +5222,29 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5235: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:5225: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 for ac_header in fcntl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5241: checking for $ac_header" >&5
+echo "$as_me:5231: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5247 "configure"
+#line 5237 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5251: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5241: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5257: \$? = $ac_status" >&5
+  echo "$as_me:5247: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5273,7 +5263,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5276: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5288,23 +5278,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5291: checking for $ac_header" >&5
+echo "$as_me:5281: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5297 "configure"
+#line 5287 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5291: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5307: \$? = $ac_status" >&5
+  echo "$as_me:5297: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5323,7 +5313,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5316: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5333,7 +5323,7 @@ EOF
 fi
 done
 
-echo "$as_me:5336: checking for working mkstemp" >&5
+echo "$as_me:5326: checking for working mkstemp" >&5
 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
 if test "${cf_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5344,14 +5334,14 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5347 "configure"
+#line 5337 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
 
 int main(void)
 {
-	char *tmpl = "conftestXXXXXX";
+	static char tmpl[] = "conftestXXXXXX";
 	char name[2][80];
 	int n;
 	int result = 0;
@@ -5379,15 +5369,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5385: \$? = $ac_status" >&5
+  echo "$as_me:5375: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5390: \$? = $ac_status" >&5
+  echo "$as_me:5380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -5402,16 +5392,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:5405: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:5395: result: $cf_cv_func_mkstemp" >&5
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
-	echo "$as_me:5408: checking for mkstemp" >&5
+	echo "$as_me:5398: checking for mkstemp" >&5
 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5414 "configure"
+#line 5404 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5442,16 +5432,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5448: \$? = $ac_status" >&5
+  echo "$as_me:5438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5454: \$? = $ac_status" >&5
+  echo "$as_me:5444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -5461,7 +5451,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5464: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:5454: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -5476,23 +5466,23 @@ fi
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5479: checking for $ac_header" >&5
+echo "$as_me:5469: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5485 "configure"
+#line 5475 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5489: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5495: \$? = $ac_status" >&5
+  echo "$as_me:5485: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5511,7 +5501,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5514: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5521,7 +5511,7 @@ EOF
 fi
 done
 
-echo "$as_me:5524: checking for header declaring getopt variables" >&5
+echo "$as_me:5514: checking for header declaring getopt variables" >&5
 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
 if test "${cf_cv_getopt_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5531,7 +5521,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5534 "configure"
+#line 5524 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5544,16 +5534,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5550: \$? = $ac_status" >&5
+  echo "$as_me:5540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5556: \$? = $ac_status" >&5
+  echo "$as_me:5546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -5565,7 +5555,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:5568: result: $cf_cv_getopt_header" >&5
+echo "$as_me:5558: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -5585,13 +5575,13 @@ fi
 for ac_func in getopt vsnprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5588: checking for $ac_func" >&5
+echo "$as_me:5578: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5594 "configure"
+#line 5584 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5622,16 +5612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5628: \$? = $ac_status" >&5
+  echo "$as_me:5618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5634: \$? = $ac_status" >&5
+  echo "$as_me:5624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5641,7 +5631,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5644: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:5634: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5651,7 +5641,7 @@ EOF
 fi
 done
 
-echo "$as_me:5654: checking for maximum table size" >&5
+echo "$as_me:5644: checking for maximum table size" >&5
 echo $ECHO_N "checking for maximum table size... $ECHO_C" >&6
 
 # Check whether --with-max-table-size or --without-max-table-size was given.
@@ -5661,12 +5651,12 @@ if test "${with_max_table_size+set}" = set; then
 fi;
 if test -n "$with_max_table_size"
 then
-	echo "$as_me:5664: result: $with_max_table_size" >&5
+	echo "$as_me:5654: result: $with_max_table_size" >&5
 echo "${ECHO_T}$with_max_table_size" >&6
 	check=`expr "$with_max_table_size" + 0`
 	if test "x$check" != "x$with_max_table_size"
 	then
-		{ { echo "$as_me:5669: error: invalid value for --with-max-table-size: $with_max_table_size" >&5
+		{ { echo "$as_me:5659: error: invalid value for --with-max-table-size: $with_max_table_size" >&5
 echo "$as_me: error: invalid value for --with-max-table-size: $with_max_table_size" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5676,11 +5666,11 @@ cat >>confdefs.h <<EOF
 EOF
 
 else
-	echo "$as_me:5679: result: default" >&5
+	echo "$as_me:5669: result: default" >&5
 echo "${ECHO_T}default" >&6
 fi
 
-echo "$as_me:5683: checking if backtracking extension is wanted" >&5
+echo "$as_me:5673: checking if backtracking extension is wanted" >&5
 echo $ECHO_N "checking if backtracking extension is wanted... $ECHO_C" >&6
 
 # Check whether --enable-btyacc or --disable-btyacc was given.
@@ -5697,7 +5687,7 @@ else
 	enable_btyacc=yes
 
 fi;
-echo "$as_me:5700: result: $enable_btyacc" >&5
+echo "$as_me:5690: result: $enable_btyacc" >&5
 echo "${ECHO_T}$enable_btyacc" >&6
 if test "$enable_btyacc" = "no"; then
 	SKELETON=yaccpar
@@ -5710,7 +5700,7 @@ EOF
 	SKELETON=btyaccpar
 fi
 
-echo "$as_me:5713: checking for fgrep" >&5
+echo "$as_me:5703: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5722,7 +5712,7 @@ else
 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:5725: checking for $ac_word" >&5
+echo "$as_me:5715: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5739,7 +5729,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:5742: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5732: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5750,10 +5740,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:5753: result: $FGREP" >&5
+  echo "$as_me:5743: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:5756: result: no" >&5
+  echo "$as_me:5746: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5761,16 +5751,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5764: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5754: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:5769: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:5759: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:5773: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5763: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -5787,21 +5777,20 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5790: result: $enable_stdnoreturn" >&5
+echo "$as_me:5780: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:5794: checking for C11 _Noreturn feature" >&5
+echo "$as_me:5784: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5800 "configure"
+#line 5790 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+$ac_includes_default
 #include <stdnoreturn.h>
 static _Noreturn void giveup(void) { exit(0); }
 
@@ -5814,16 +5803,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5820: \$? = $ac_status" >&5
+  echo "$as_me:5809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5826: \$? = $ac_status" >&5
+  echo "$as_me:5815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5834,7 +5823,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5837: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5826: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5890,16 +5879,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5893: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5882: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5898: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5887: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5902: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5891: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5938,16 +5927,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5941: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5930: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5946: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5935: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5950: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5939: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5986,23 +5975,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5989: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5978: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5994: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5983: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5998: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5987: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:6005: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5994: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -6019,14 +6008,14 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:6022: result: $enable_warnings" >&5
+echo "$as_me:6011: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
 
 if test "x$have_x" = xyes; then echo "skipping X-const check"; fi
 cat > "conftest.$ac_ext" <<EOF
-#line 6029 "${as_me:-configure}"
+#line 6018 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -6042,7 +6031,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:6045: checking for $CC warning options..." >&5
+	{ echo "$as_me:6034: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -6058,12 +6047,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:6061: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:6050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6064: \$? = $ac_status" >&5
+  echo "$as_me:6053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:6066: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:6055: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -6071,7 +6060,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:6074: checking for $CC warning options..." >&5
+	{ echo "$as_me:6063: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -6094,12 +6083,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wwrite-strings
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:6097: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:6086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6100: \$? = $ac_status" >&5
+  echo "$as_me:6089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:6102: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:6091: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -6107,7 +6096,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:6110: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:6099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -6117,7 +6106,7 @@ echo "${as_me:-configure}:6110: testing feature is broken in gcc $GCC_VERSION ..
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:6120: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:6109: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -6150,10 +6139,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:6153: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:6142: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 6156 "${as_me:-configure}"
+#line 6145 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -6203,12 +6192,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:6206: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:6195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6209: \$? = $ac_status" >&5
+  echo "$as_me:6198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:6211: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:6200: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -6269,7 +6258,7 @@ fi
 
 fi
 
-echo "$as_me:6272: checking if you want to see long compiling messages" >&5
+echo "$as_me:6261: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -6303,10 +6292,10 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:6306: result: $enableval" >&5
+echo "$as_me:6295: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:6309: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6298: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -6328,7 +6317,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6331: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6320: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6442,23 +6431,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6445: checking for dmalloc.h" >&5
+	echo "$as_me:6434: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6451 "configure"
+#line 6440 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6444: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6461: \$? = $ac_status" >&5
+  echo "$as_me:6450: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6477,11 +6466,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6480: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:6469: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 
-echo "$as_me:6484: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:6473: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6489,7 +6478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6492 "configure"
+#line 6481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6498,7 +6487,7 @@ 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 dmalloc_debug ();
+char dmalloc_debug (void);
 int
 main (void)
 {
@@ -6508,16 +6497,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6514: \$? = $ac_status" >&5
+  echo "$as_me:6503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6520: \$? = $ac_status" >&5
+  echo "$as_me:6509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6528,7 +6517,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6531: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:6520: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -6543,7 +6532,7 @@ fi
 
 fi
 
-echo "$as_me:6546: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:6535: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -6565,7 +6554,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:6568: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:6557: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6679,23 +6668,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:6682: checking for dbmalloc.h" >&5
+	echo "$as_me:6671: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6688 "configure"
+#line 6677 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6692: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6681: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6698: \$? = $ac_status" >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6714,11 +6703,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6717: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:6706: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 
-echo "$as_me:6721: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:6710: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6726,7 +6715,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6729 "configure"
+#line 6718 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6735,7 +6724,7 @@ 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 debug_malloc ();
+char debug_malloc (void);
 int
 main (void)
 {
@@ -6745,16 +6734,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6751: \$? = $ac_status" >&5
+  echo "$as_me:6740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6757: \$? = $ac_status" >&5
+  echo "$as_me:6746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6765,7 +6754,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6768: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:6757: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -6780,7 +6769,7 @@ fi
 
 fi
 
-echo "$as_me:6783: checking if you want to use valgrind for testing" >&5
+echo "$as_me:6772: checking if you want to use valgrind for testing" >&5
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.
@@ -6802,7 +6791,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:6805: result: ${with_valgrind:-no}" >&5
+echo "$as_me:6794: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -6915,7 +6904,7 @@ fi
 	;;
 esac
 
-echo "$as_me:6918: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:6907: checking if you want to perform memory-leak testing" >&5
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
@@ -6926,7 +6915,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:6929: result: $with_no_leaks" >&5
+echo "$as_me:6918: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -6941,9 +6930,282 @@ EOF
 
 fi
 
+	echo "$as_me:6933: checking for PATH separator" >&5
+echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+	case "$cf_cv_system_name" in
+	(os2*)	PATH_SEPARATOR=';'  ;;
+	(*)	${PATH_SEPARATOR:=':'}  ;;
+	esac
+
+	echo "$as_me:6940: result: $PATH_SEPARATOR" >&5
+echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+echo "$as_me:6943: checking format of man-pages" >&5
+echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+
+# Check whether --with-manpage-format or --without-manpage-format was given.
+if test "${with_manpage_format+set}" = set; then
+  withval="$with_manpage_format"
+  MANPAGE_FORMAT=$withval
+else
+  MANPAGE_FORMAT=unknown
+fi;
+
+test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown
+MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'`
+
+cf_unknown=
+
+case "$MANPAGE_FORMAT" in
+(unknown)
+	if test -z "$MANPATH" ; then
+		MANPATH="/usr/man:/usr/share/man"
+	fi
+
+	# look for the 'date' man-page (it is most likely to be installed!)
+	MANPAGE_FORMAT=
+	cf_preform="no"
+	cf_catonly="yes"
+	cf_example="date"
+
+	IFS="${IFS:- 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+	for cf_dir in $MANPATH; do
+		test -z "$cf_dir" && cf_dir=/usr/man
+		for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
+		do
+			cf_test=`echo "$cf_name" | sed -e 's/*//'`
+			if test "x$cf_test" = "x$cf_name" ; then
+
+				case "$cf_name" in
+				(*.bz2) MANPAGE_FORMAT="$MANPAGE_FORMAT bzip2";;
+				(*.xz)  MANPAGE_FORMAT="$MANPAGE_FORMAT xz";;
+				(*.gz)  MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";;
+				(*.Z)   MANPAGE_FORMAT="$MANPAGE_FORMAT compress";;
+				(*.0)   MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";;
+				(*)     MANPAGE_FORMAT="$MANPAGE_FORMAT normal";;
+				esac
+
+				case "$cf_name" in
+				($cf_dir/man*)
+					cf_catonly=no
+					;;
+				($cf_dir/cat*)
+					cf_preform=yes
+					;;
+				esac
+				break
+			fi
+
+			# if we found a match in either man* or cat*, stop looking
+			if test -n "$MANPAGE_FORMAT" ; then
+				cf_found=no
+				test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted"
+				test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly"
+				case "$cf_name" in
+				($cf_dir/cat*)
+					cf_found=yes
+					;;
+				esac
+				test "$cf_found" = yes && break
+			fi
+		done
+		# only check the first directory in $MANPATH where we find manpages
+		if test -n "$MANPAGE_FORMAT" ; then
+			break
+		fi
+	done
+	# if we did not find the example, just assume it is normal
+	test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal
+	IFS="$ac_save_ifs"
+	;;
+(*)
+	for cf_option in $MANPAGE_FORMAT; do
+	case "$cf_option" in
+	(xz|bzip2|gzip|compress|BSDI|normal|formatted|catonly)
+		;;
+	(*)
+		cf_unknown="$cf_unknown $cf_option"
+		;;
+	esac
+	done
+	;;
+esac
+
+echo "$as_me:7034: result: $MANPAGE_FORMAT" >&5
+echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+if test -n "$cf_unknown" ; then
+	{ echo "$as_me:7037: WARNING: Unexpected manpage-format $cf_unknown" >&5
+echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+fi
+
+cf_manpage_format=no
+cf_manpage_inboth=no
+cf_manpage_so_strip=
+cf_manpage_compress=
+
+for cf_item in $MANPAGE_FORMAT
+do
+case "$cf_item" in
+(catonly)
+	cf_manpage_format=yes
+	cf_manpage_inboth=no
+	;;
+(formatted)
+	cf_manpage_format=yes
+	cf_manpage_inboth=yes
+	;;
+(compress)
+	cf_manpage_so_strip="Z"
+	cf_manpage_compress=compress
+	;;
+(gzip)
+	cf_manpage_so_strip="gz"
+	cf_manpage_compress=gzip
+	;;
+(bzip2)
+	cf_manpage_so_strip="bz2"
+	cf_manpage_compress=bzip2
+	;;
+(xz)
+	cf_manpage_so_strip="xz"
+	cf_manpage_compress=xz
+	;;
+esac
+done
+
+echo "$as_me:7076: 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:7080: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:7083: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
+fi
+
+cf_install_man=install-man
+ac_config_files="$ac_config_files $cf_install_man"
+cf_install_man=$cf_install_man.in
+echo $as_me: creating $cf_install_man
+cat >$cf_install_man <<"CF_EOF"
+#!/bin/sh
+# generated by CF_INSTALL_MAN
+
+LANG=C;     export LANG
+LC_ALL=C;   export LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+LANGUAGE=C; export LANGUAGE
+
+INSTALL="@INSTALL@"
+INSTALL_DATA="@INSTALL_DATA@"
+
+usage() {
+	cat <<EOF
+Usage: install-man [-l] [source] target
+EOF
+	exit 1
+}
+
+failed() {
+	echo "?? $*" >&2
+	exit 1
+}
+
+test $# != 0 || usage
+OPTS=
+case "x$1" in
+(x-l)
+	OPTS="link"
+	shift
+	;;
+(x-*)
+	usage
+	;;
+esac
+
+source=
+if test $# = 2 ; then
+	source=$1; shift
+	target=$1
+elif test $# = 1 ; then
+	test -n "$OPTS" && usage
+	target=$1
+else
+	usage
+fi
+
+origin_name=`echo "$source" |sed -e 's%^.*/%%' -e 's%\..*%%'`
+actual_name=`echo "$origin_name" |sed '@program_transform_name@'`
+leading_cap=`echo "$actual_name" | sed -e 's%^\(.\).*$%\1%' | tr a-z A-Z``echo "$actual_name" | sed -e 's%^.%%'`
+capitalized=`echo "$actual_name" | tr a-z A-Z`
+
+cf_tmpdir=`mktemp -d`
+trap 'rm -rf "$cf_tmpdir"; exit 1' 1 2 3 15
+trap 'rm -rf "$cf_tmpdir"; exit 0' 0
+
+if test -n "$source" ; then
+	suffix=
+	test -n "@cf_manpage_so_strip" && suffix=".@cf_manpage_so_strip@"
+	if test "x$OPTS" = xlink ; then
+		source_dir=`echo "$source" | sed -e "s%/[^/]*$%%"`
+		target_dir=`echo "$target" | sed -e "s%/[^/]*$%%"`
+		sourcelink="${source}${suffix}"
+		targetfile="${target}${suffix}"
+		targetlink="${target_dir}/${sourcelink}"
+		if test ! -d "$target_dir" ; then
+			failed "target directory does not exist: $target_dir"
+		elif test ! -f "$targetfile" ; then
+			failed "target file does not exist: $targetfile"
+		elif test "$source" != "$source_dir" ; then
+			failed "unexpected directory for source-link: $source_dir"
+		fi
+		test -f "$targetlink" && failed "already exists $targetlink"
+		( cd "$target_dir" && @LN_S@ "`echo "$targetfile" | sed -e 's%^.*/%%'`" "$sourcelink" )
+		test -f "$targetlink" || failed "cannot create $targetlink"
+		target="$targetlink"
+	else
+		echo "** installing $source to $target"
+		interim="$cf_tmpdir"/"`basename $source`"
+		if test "x$origin_name" != "x$actual_name" ; then
+			sed \
+				-e "/^.ds N/s%N.*%N $leading_cap%" \
+				-e "/^.ds n/s%n.*%n $actual_name%" \
+				-e "/^\.TH/s%[ ][ ]*[^ ][^ ]*% $capitalized%" \
+				-e "/^\.SH[ ][ ]*NAME/,/[ ]\\\\-[ ]/s%^\\\\\\*[Nn]%$actual_name%" \
+				"$source" >"$interim" || exit 1
+			diff -c "$source" "$interim"
+		else
+			cp "$source" "$interim" || exit 1
+		fi
+		if test -n "@cf_manpage_compress@" ; then
+			@cf_manpage_compress@ "$interim"
+			source="${interim}${suffix}"
+		fi
+		if test -d "$target" ; then
+			target="$target"/"$source"
+		else
+			test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@"
+		fi
+		$INSTALL_DATA "$source" "$target" || exit 1
+	fi
+	echo "...installed $target"
+else
+	echo "** removing $target"
+	test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@"
+	if test -f "$target" ; then
+		rm -f "$target"
+		echo "...removed $target"
+	else
+		echo "...not found"
+	fi
+fi
+exit 0
+CF_EOF
+
 # Extract the first word of "groff", so it can be a program name with args.
 set dummy groff; ac_word=$2
-echo "$as_me:6946: checking for $ac_word" >&5
+echo "$as_me:7208: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GROFF_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6960,7 +7222,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GROFF_PATH="$ac_dir/$ac_word"
-   echo "$as_me:6963: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7225: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6972,10 +7234,10 @@ fi
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:6975: result: $GROFF_PATH" >&5
+  echo "$as_me:7237: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:6978: result: no" >&5
+  echo "$as_me:7240: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6983,7 +7245,7 @@ for ac_prog in nroff mandoc
 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:6986: checking for $ac_word" >&5
+echo "$as_me:7248: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NROFF_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7000,7 +7262,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NROFF_PATH="$ac_dir/$ac_word"
-   echo "$as_me:7003: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7265: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7011,10 +7273,10 @@ fi
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:7014: result: $NROFF_PATH" >&5
+  echo "$as_me:7276: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:7017: result: no" >&5
+  echo "$as_me:7279: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7024,7 +7286,7 @@ test -n "$NROFF_PATH" || NROFF_PATH="no"
 
 # Extract the first word of "tbl", so it can be a program name with args.
 set dummy tbl; ac_word=$2
-echo "$as_me:7027: checking for $ac_word" >&5
+echo "$as_me:7289: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TBL_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7041,7 +7303,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TBL_PATH="$ac_dir/$ac_word"
-   echo "$as_me:7044: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7306: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7053,10 +7315,10 @@ fi
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:7056: result: $TBL_PATH" >&5
+  echo "$as_me:7318: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:7059: result: no" >&5
+  echo "$as_me:7321: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7076,7 +7338,7 @@ case "x${with_man2html}" in
 (x|xyes)
 	# Extract the first word of "man2html", so it can be a program name with args.
 set dummy man2html; ac_word=$2
-echo "$as_me:7079: checking for $ac_word" >&5
+echo "$as_me:7341: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_man2html+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7093,7 +7355,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_man2html="$ac_dir/$ac_word"
-   echo "$as_me:7096: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7358: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7105,16 +7367,16 @@ fi
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:7108: result: $cf_man2html" >&5
+  echo "$as_me:7370: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:7111: result: no" >&5
+  echo "$as_me:7373: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:7117: checking for the modified Earl Hood script" >&5
+		echo "$as_me:7379: checking for the modified Earl Hood script" >&5
 echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6
 		if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at the end' >/dev/null )
 		then
@@ -7123,7 +7385,7 @@ echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:7126: result: $cf_man2html_ok" >&5
+		echo "$as_me:7388: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -7132,7 +7394,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6
 	esac
 esac
 
-echo "$as_me:7135: checking for program to convert manpage to html" >&5
+echo "$as_me:7397: checking for program to convert manpage to html" >&5
 echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6
 
 # Check whether --with-man2html or --without-man2html was given.
@@ -7147,11 +7409,11 @@ cf_with_groff=no
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:7150: result: man2html" >&5
+	echo "$as_me:7412: result: man2html" >&5
 echo "${ECHO_T}man2html" >&6
 	# Extract the first word of "man2html", so it can be a program name with args.
 set dummy man2html; ac_word=$2
-echo "$as_me:7154: checking for $ac_word" >&5
+echo "$as_me:7416: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_man2html+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7168,7 +7430,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_man2html="$ac_dir/$ac_word"
-   echo "$as_me:7171: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7433: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7180,10 +7442,10 @@ fi
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:7183: result: $cf_man2html" >&5
+  echo "$as_me:7445: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:7186: result: no" >&5
+  echo "$as_me:7448: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7191,11 +7453,11 @@ fi
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:7194: result: $cf_man2html" >&5
+	echo "$as_me:7456: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:7198: result: $cf_man2html" >&5
+	echo "$as_me:7460: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -7236,12 +7498,12 @@ else
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:7239: checking if nroff is really groff" >&5
+		echo "$as_me:7501: checking if nroff is really groff" >&5
 echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6
 		cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`"
 		test -n "$cf_check_groff" && cf_check_groff=yes
 		test -n "$cf_check_groff" || cf_check_groff=no
-		echo "$as_me:7244: result: $cf_check_groff" >&5
+		echo "$as_me:7506: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -7272,14 +7534,14 @@ case ".$cf_man2html" in
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7275: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:7537: error: expected a pathname, not \"$cf_man2html\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 	MAN2HTML_PATH="$cf_man2html"
-	echo "$as_me:7282: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:7544: checking for $cf_man2html top/bottom margins" >&5
 echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6
 
 	# for this example, expect 3 lines of content, the remainder is head/foot
@@ -7297,10 +7559,10 @@ CF_EOF
 	cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"`
 	cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot"
 
-	echo "$as_me:7300: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:7562: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:7303: checking for pagesize to use" >&5
+	echo "$as_me:7565: checking for pagesize to use" >&5
 echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6
 	for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 	do
@@ -7325,7 +7587,7 @@ CF_EOF
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:7328: result: $cf_man2html_page" >&5
+	echo "$as_me:7590: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -7344,13 +7606,13 @@ fi
 
 chmod 700 $MAN2HTML_TEMP
 
-echo "$as_me:7347: checking for mode_t" >&5
+echo "$as_me:7609: 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
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7353 "configure"
+#line 7615 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7365,16 +7627,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7371: \$? = $ac_status" >&5
+  echo "$as_me:7633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7377: \$? = $ac_status" >&5
+  echo "$as_me:7639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -7384,7 +7646,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:7387: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:7649: 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
   :
@@ -7408,7 +7670,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -7477,7 +7739,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:7480: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:7742: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -7610,7 +7872,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20230114,
+configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -7655,7 +7917,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:7658: error: ambiguous option: $1
+    { { echo "$as_me:7920: 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;}
@@ -7674,7 +7936,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:7677: error: unrecognized option: $1
+  -*) { { echo "$as_me:7939: 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;}
@@ -7693,7 +7955,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230114, executed with
+This file was extended by $as_me 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -7711,7 +7973,7 @@ do
   # Handling of arguments.
   "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
-  *) { { echo "$as_me:7714: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:7976: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -7841,6 +8103,11 @@ s,@ECHO_LD@,$ECHO_LD,;t t
 s,@RULE_CC@,$RULE_CC,;t t
 s,@SHOW_CC@,$SHOW_CC,;t t
 s,@ECHO_CC@,$ECHO_CC,;t t
+s,@cf_manpage_format@,$cf_manpage_format,;t t
+s,@cf_manpage_inboth@,$cf_manpage_inboth,;t t
+s,@cf_manpage_so_strip@,$cf_manpage_so_strip,;t t
+s,@cf_manpage_compress@,$cf_manpage_compress,;t t
+s,@LN_S@,$LN_S,;t t
 s,@GROFF_PATH@,$GROFF_PATH,;t t
 s,@NROFF_PATH@,$NROFF_PATH,;t t
 s,@TBL_PATH@,$TBL_PATH,;t t
@@ -7982,7 +8249,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:7985: creating $ac_file" >&5
+    { echo "$as_me:8252: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -8000,7 +8267,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:8003: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:8270: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -8013,7 +8280,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:8016: error: cannot find input file: $f" >&5
+           { { echo "$as_me:8283: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -8029,7 +8296,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:8032: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:8299: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -8038,7 +8305,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:8041: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:8308: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -8066,11 +8333,11 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out
   rm -f "$tmp"/stdin
 EOF
-: "${FGREP:=grep -F}"
-: "${EGREP:=grep -E}"
+test -n "${FGREP}" || FGREP="grep -F"
+test -n "${EGREP}" || EGREP="grep -E"
 cat >>"$CONFIG_STATUS" <<EOF
-  : "\${FGREP:=$FGREP}"
-  : "\${EGREP:=$EGREP}"
+  test -n "\${FGREP}" || FGREP="$FGREP"
+  test -n "\${EGREP}" || EGREP="$EGREP"
 EOF
 cat >>"$CONFIG_STATUS" <<\EOF
   if test x"$ac_file" != x-; then
@@ -8083,7 +8350,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:8086: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:8353: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -8094,7 +8361,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:8097: WARNING: Some variables may not be substituted:
+      { echo "$as_me:8364: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -8143,7 +8410,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:8146: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:8413: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -8154,7 +8421,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:8157: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:8424: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -8167,7 +8434,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:8170: error: cannot find input file: $f" >&5
+           { { echo "$as_me:8437: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -8220,7 +8487,8 @@ EOF
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>"$CONFIG_STATUS"
-echo '  if ${EGREP-grep -E} "^[ 	]*#[ 	]*define" "$tmp"/in >/dev/null; then' >>"$CONFIG_STATUS"
+echo '  test -n "${EGREP}" || EGREP="grep -E"' >>"$CONFIG_STATUS"
+echo '  if ${EGREP} "^[ 	]*#[ 	]*define" "$tmp"/in >/dev/null; then' >>"$CONFIG_STATUS"
 echo '  # If there are no defines, we may have an empty if/fi' >>"$CONFIG_STATUS"
 echo '  :' >>"$CONFIG_STATUS"
 rm -f conftest.tail
@@ -8285,7 +8553,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:8288: $ac_file is unchanged" >&5
+      { echo "$as_me:8556: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/contrib/byacc/configure.in b/contrib/byacc/configure.in
index 165f059ef3f7..4b59b2dd00e4 100644
--- a/contrib/byacc/configure.in
+++ b/contrib/byacc/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with 'autoconf' to produce a 'configure' script
-dnl $Id: configure.in,v 1.28 2023/02/02 00:14:51 tom Exp $
+dnl $Id: configure.in,v 1.29 2023/05/19 07:58:43 tom Exp $
 AC_PREREQ(2.52.20200802)
-AC_REVISION($Revision: 1.28 $)
+AC_REVISION($Revision: 1.29 $)
 AC_INIT(main.c)
 AC_CONFIG_HEADER(config.h:config_h.in)
 
@@ -60,6 +60,8 @@ AC_SUBST(SKELETON)
 CF_ENABLE_WARNINGS(Wwrite-strings,yes)
 CF_DISABLE_ECHO
 CF_DISABLE_LEAKS
+CF_MANPAGE_FORMAT
+CF_INSTALL_MAN
 CF_WITH_MAN2HTML
 
 AC_TYPE_MODE_T
diff --git a/contrib/byacc/defs.h b/contrib/byacc/defs.h
index 62855e41ed86..5e0fd018c175 100644
--- a/contrib/byacc/defs.h
+++ b/contrib/byacc/defs.h
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.71 2022/11/06 21:44:54 tom Exp $ */
+/* $Id: defs.h,v 1.74 2023/05/18 21:28:05 tom Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -122,6 +122,7 @@ typedef enum
     ,NONPOSIX_DEBUG
 
     /* other bison "extensions", some useful */
+    ,HACK_DEFINE
     ,ERROR_VERBOSE
     ,EXPECT
     ,EXPECT_RR
@@ -187,7 +188,7 @@ SYM_CASES;
 
 #define DO_FREE(x)	if (x) { FREE(x); x = 0; }
 
-#define NO_SPACE(p)	if (p == 0) no_space(); assert(p != 0)
+#define NO_SPACE(p)	do { if (p == 0) on_error(); assert(p != 0); } while (0)
 
 /* messages */
 #define PLURAL(n) ((n) > 1 ? "s" : "")
@@ -470,41 +471,45 @@ struct ainfo
     char *a_cptr;
 };
 
-extern void arg_number_disagree_warning(int a_lineno, char *a_name);
-extern void arg_type_disagree_warning(int a_lineno, int i, char *a_name);
-extern GCC_NORETURN void at_error(int a_lineno, char *a_line, char *a_cptr);
+extern void arg_number_disagree_warning(int a_lineno, const char *a_name);
+extern void arg_type_disagree_warning(int a_lineno, int i, const char *a_name);
+extern GCC_NORETURN void at_error(int a_lineno, const char *a_line, const char *a_cptr);
 extern void at_warning(int a_lineno, int i);
 extern GCC_NORETURN void bad_formals(void);
-extern void default_action_warning(char *s);
+extern void default_action_warning(const char *s);
 extern void destructor_redeclared_warning(const struct ainfo *);
-extern GCC_NORETURN void dollar_error(int a_lineno, char *a_line, char *a_cptr);
+extern void dislocations_warning(void);
+extern GCC_NORETURN void dollar_error(int a_lineno, const char *a_line, const char *a_cptr);
 extern void dollar_warning(int a_lineno, int i);
 extern GCC_NORETURN void fatal(const char *msg);
-extern GCC_NORETURN void illegal_character(char *c_cptr);
-extern GCC_NORETURN void illegal_tag(int t_lineno, char *t_line, char *t_cptr);
+extern GCC_NORETURN void illegal_character(const char *c_cptr);
+extern GCC_NORETURN void illegal_tag(int t_lineno, const char *t_line, const char *t_cptr);
 extern GCC_NORETURN void missing_brace(void);
 extern GCC_NORETURN void no_grammar(void);
-extern GCC_NORETURN void no_space(void);
+extern GCC_NORETURN void on_error(void);
 extern GCC_NORETURN void open_error(const char *filename);
-extern GCC_NORETURN void over_unionized(char *u_cptr);
+extern GCC_NORETURN void over_unionized(const char *u_cptr);
 extern void prec_redeclared(void);
-extern void reprec_warning(char *s);
+extern void reprec_warning(const char *s);
 extern void restarted_warning(void);
-extern void retyped_warning(char *s);
-extern void revalued_warning(char *s);
-extern void start_requires_args(char *a_name);
-extern GCC_NORETURN void syntax_error(int st_lineno, char *st_line, char *st_cptr);
+extern void retyped_warning(const char *s);
+extern void revalued_warning(const char *s);
+extern void start_requires_args(const char *a_name);
+extern GCC_NORETURN void syntax_error(int st_lineno, const char *st_line, const char *st_cptr);
 extern GCC_NORETURN void terminal_lhs(int s_lineno);
-extern GCC_NORETURN void terminal_start(char *s);
-extern GCC_NORETURN void tokenized_start(char *s);
-extern GCC_NORETURN void undefined_goal(char *s);
-extern void undefined_symbol_warning(char *s);
+extern GCC_NORETURN void terminal_start(const char *s);
+extern GCC_NORETURN void tokenized_start(const char *s);
+extern GCC_NORETURN void undefined_goal(const char *s);
+extern void undefined_symbol_warning(const char *s);
 extern GCC_NORETURN void unexpected_EOF(void);
-extern void unknown_arg_warning(int d_lineno, const char *dlr_opt,
-				const char *d_arg, const char *d_line,
+extern void unknown_arg_warning(int d_lineno,
+				const char *dlr_opt,
+				const char *d_arg,
+				const char *d_line,
 				const char *d_cptr);
 extern GCC_NORETURN void unknown_rhs(int i);
 extern void unsupported_flag_warning(const char *flag, const char *details);
+extern GCC_NORETURN void unexpected_value(const struct ainfo *);
 extern GCC_NORETURN void unterminated_action(const struct ainfo *);
 extern GCC_NORETURN void unterminated_comment(const struct ainfo *);
 extern GCC_NORETURN void unterminated_string(const struct ainfo *);
@@ -512,11 +517,11 @@ extern GCC_NORETURN void unterminated_text(const struct ainfo *);
 extern GCC_NORETURN void unterminated_union(const struct ainfo *);
 extern void untyped_arg_warning(int a_lineno, const char *dlr_opt, const char *a_name);
 extern GCC_NORETURN void untyped_lhs(void);
-extern GCC_NORETURN void untyped_rhs(int i, char *s);
-extern GCC_NORETURN void used_reserved(char *s);
+extern GCC_NORETURN void untyped_rhs(int i, const char *s);
+extern GCC_NORETURN void used_reserved(const char *s);
 extern GCC_NORETURN void unterminated_arglist(const struct ainfo *);
 extern void wrong_number_args_warning(const char *which, const char *a_name);
-extern void wrong_type_for_arg_warning(int i, char *a_name);
+extern void wrong_type_for_arg_warning(int i, const char *a_name);
 
 /* graph.c */
 extern void graph(void);
diff --git a/contrib/byacc/error.c b/contrib/byacc/error.c
index 07dc89417cbe..ceb45ca9b921 100644
--- a/contrib/byacc/error.c
+++ b/contrib/byacc/error.c
@@ -1,4 +1,4 @@
-/* $Id: error.c,v 1.14 2016/12/02 18:35:55 tom Exp $ */
+/* $Id: error.c,v 1.17 2023/05/18 21:38:35 tom Exp $ */
 
 /* routines for printing error messages  */
 
@@ -12,10 +12,13 @@ fatal(const char *msg)
 }
 
 void
-no_space(void)
+on_error(void)
 {
-    fprintf(stderr, "%s: f - out of space\n", myname);
-    done(2);
+    const char *msg;
+    if (errno && (msg = strerror(errno)) != NULL)
+	fatal(msg);
+    else
+	fatal("unknown error");
 }
 
 void
@@ -68,7 +71,7 @@ print_pos(const char *st_line, const char *st_cptr)
 }
 
 void
-syntax_error(int st_lineno, char *st_line, char *st_cptr)
+syntax_error(int st_lineno, const char *st_line, const char *st_cptr)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", syntax error\n",
 	    myname, st_lineno, input_file_name);
@@ -77,6 +80,15 @@ syntax_error(int st_lineno, char *st_line, char *st_cptr)
 }
 
 void
+unexpected_value(const struct ainfo *a)
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unexpected value\n",
+	    myname, a->a_lineno, input_file_name);
+    print_pos(a->a_line, a->a_cptr);
+    done(1);
+}
+
+void
 unterminated_comment(const struct ainfo *a)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", unmatched /*\n",
@@ -113,7 +125,7 @@ declaration\n", myname, a->a_lineno, input_file_name);
 }
 
 void
-over_unionized(char *u_cptr)
+over_unionized(const char *u_cptr)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", too many %%union \
 declarations\n", myname, lineno, input_file_name);
@@ -122,7 +134,7 @@ declarations\n", myname, lineno, input_file_name);
 }
 
 void
-illegal_tag(int t_lineno, char *t_line, char *t_cptr)
+illegal_tag(int t_lineno, const char *t_line, const char *t_cptr)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", illegal tag\n",
 	    myname, t_lineno, input_file_name);
@@ -131,7 +143,7 @@ illegal_tag(int t_lineno, char *t_line, char *t_cptr)
 }
 
 void
-illegal_character(char *c_cptr)
+illegal_character(const char *c_cptr)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", illegal character\n",
 	    myname, lineno, input_file_name);
@@ -140,7 +152,7 @@ illegal_character(char *c_cptr)
 }
 
 void
-used_reserved(char *s)
+used_reserved(const char *s)
 {
     fprintf(stderr,
 	    "%s: e - line %d of \"%s\", illegal use of reserved symbol \
@@ -149,7 +161,7 @@ used_reserved(char *s)
 }
 
 void
-tokenized_start(char *s)
+tokenized_start(const char *s)
 {
     fprintf(stderr,
 	    "%s: e - line %d of \"%s\", the start symbol %s cannot be \
@@ -158,14 +170,14 @@ declared to be a token\n", myname, lineno, input_file_name, s);
 }
 
 void
-retyped_warning(char *s)
+retyped_warning(const char *s)
 {
     fprintf(stderr, "%s: w - line %d of \"%s\", the type of %s has been \
 redeclared\n", myname, lineno, input_file_name, s);
 }
 
 void
-reprec_warning(char *s)
+reprec_warning(const char *s)
 {
     fprintf(stderr,
 	    "%s: w - line %d of \"%s\", the precedence of %s has been \
@@ -173,14 +185,14 @@ redeclared\n", myname, lineno, input_file_name, s);
 }
 
 void
-revalued_warning(char *s)
+revalued_warning(const char *s)
 {
     fprintf(stderr, "%s: w - line %d of \"%s\", the value of %s has been \
 redeclared\n", myname, lineno, input_file_name, s);
 }
 
 void
-terminal_start(char *s)
+terminal_start(const char *s)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s is a \
 token\n", myname, lineno, input_file_name, s);
@@ -234,7 +246,7 @@ end of the current rule\n", myname, a_lineno, input_file_name, i);
 }
 
 void
-dollar_error(int a_lineno, char *a_line, char *a_cptr)
+dollar_error(int a_lineno, const char *a_line, const char *a_cptr)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", illegal $-name\n",
 	    myname, a_lineno, input_file_name);
@@ -243,6 +255,13 @@ dollar_error(int a_lineno, char *a_line, char *a_cptr)
 }
 
 void
+dislocations_warning(void)
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", expected %%locations\n",
+	    myname, lineno, input_file_name);
+}
+
+void
 untyped_lhs(void)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", $$ is untyped\n",
@@ -251,7 +270,7 @@ untyped_lhs(void)
 }
 
 void
-untyped_rhs(int i, char *s)
+untyped_rhs(int i, const char *s)
 {
     fprintf(stderr, "%s: e - line %d of \"%s\", $%d (%s) is untyped\n",
 	    myname, lineno, input_file_name, i, s);
@@ -267,7 +286,7 @@ unknown_rhs(int i)
 }
 
 void
-default_action_warning(char *s)
+default_action_warning(const char *s)
 {
     fprintf(stderr,
 	    "%s: w - line %d of \"%s\", the default action for %s assigns an \
@@ -276,14 +295,14 @@ undefined value to $$\n",
 }
 
 void
-undefined_goal(char *s)
+undefined_goal(const char *s)
 {
     fprintf(stderr, "%s: e - the start symbol %s is undefined\n", myname, s);
     done(1);
 }
 
 void
-undefined_symbol_warning(char *s)
+undefined_symbol_warning(const char *s)
 {
     fprintf(stderr, "%s: w - the symbol %s is undefined\n", myname, s);
 }
@@ -306,7 +325,7 @@ end of the current rule\n", myname, a_lineno, input_file_name, i);
 }
 
 void
-at_error(int a_lineno, char *a_line, char *a_cptr)
+at_error(int a_lineno, const char *a_line, const char *a_cptr)
 {
     fprintf(stderr,
 	    "%s: e - line %d of \"%s\", illegal @$ or @N reference\n",
@@ -326,7 +345,7 @@ unterminated_arglist(const struct ainfo *a)
 }
 
 void
-arg_number_disagree_warning(int a_lineno, char *a_name)
+arg_number_disagree_warning(int a_lineno, const char *a_name)
 {
     fprintf(stderr, "%s: w - line %d of \"%s\", number of arguments of %s "
 	    "doesn't agree with previous declaration\n",
@@ -343,7 +362,7 @@ bad_formals(void)
 }
 
 void
-arg_type_disagree_warning(int a_lineno, int i, char *a_name)
+arg_type_disagree_warning(int a_lineno, int i, const char *a_name)
 {
     fprintf(stderr, "%s: w - line %d of \"%s\", type of argument %d "
 	    "to %s doesn't agree with previous declaration\n",
@@ -351,8 +370,10 @@ arg_type_disagree_warning(int a_lineno, int i, char *a_name)
 }
 
 void
-unknown_arg_warning(int d_lineno, const char *dlr_opt, const char *d_arg, const char
-		    *d_line, const char *d_cptr)
+unknown_arg_warning(int d_lineno, const char *dlr_opt,
+		    const char *d_arg,
+		    const char *d_line,
+		    const char *d_cptr)
 {
     fprintf(stderr, "%s: w - line %d of \"%s\", unknown argument %s%s\n",
 	    myname, d_lineno, input_file_name, dlr_opt, d_arg);
@@ -376,7 +397,7 @@ wrong_number_args_warning(const char *which, const char *a_name)
 }
 
 void
-wrong_type_for_arg_warning(int i, char *a_name)
+wrong_type_for_arg_warning(int i, const char *a_name)
 {
     fprintf(stderr,
 	    "%s: w - line %d of \"%s\", wrong type for default argument %d to %s\n",
@@ -385,7 +406,7 @@ wrong_type_for_arg_warning(int i, char *a_name)
 }
 
 void
-start_requires_args(char *a_name)
+start_requires_args(const char *a_name)
 {
     fprintf(stderr,
 	    "%s: w - line %d of \"%s\", start symbol %s requires arguments\n",
diff --git a/contrib/byacc/main.c b/contrib/byacc/main.c
index 89aeadfa9146..dda0da231713 100644
--- a/contrib/byacc/main.c
+++ b/contrib/byacc/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.73 2021/08/08 20:39:34 tom Exp $ */
+/* $Id: main.c,v 1.74 2023/05/11 07:51:36 tom Exp $ */
 
 #include <signal.h>
 #if !defined(_WIN32) || defined(__MINGW32__)
@@ -563,8 +563,8 @@ static char *
 alloc_file_name(size_t len, const char *suffix)
 {
     char *result = TMALLOC(char, len + strlen(suffix) + 1);
-    if (result == 0)
-	no_space();
+    if (result == NULL)
+	on_error();
     strcpy(result, file_prefix);
     strcpy(result + len, suffix);
     return result;
diff --git a/contrib/byacc/makefile.in b/contrib/byacc/makefile.in
index 62d4eb78d661..7092b879f992 100644
--- a/contrib/byacc/makefile.in
+++ b/contrib/byacc/makefile.in
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.25 2022/11/06 21:03:11 tom Exp $
+# $Id: makefile.in,v 1.26 2023/05/19 23:16:31 tom Exp $
 #
 # UNIX template-makefile for Berkeley Yacc
 
@@ -99,7 +99,7 @@ all : $(THIS)$x
 
 install: all installdirs
 	$(INSTALL_PROGRAM) $(THIS)$x $(bindir)/$(actual_bin)
-	- $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(mandir)/$(actual_man)
+	@ $(SHELL) ./install-man $(srcdir)/$(THIS).1 $(mandir)/$(actual_man)
 
 installdirs:
 	mkdir -p $(bindir)
@@ -107,7 +107,7 @@ installdirs:
 
 uninstall:
 	- rm -f $(bindir)/$(actual_bin)
-	- rm -f $(mandir)/$(actual_man)
+	@ $(SHELL) ./install-man $(mandir)/$(actual_man)
 
 ################################################################################
 .SUFFIXES : .c $o .i .skel
@@ -135,7 +135,7 @@ clean :: mostlyclean
 	- rm -f $(THIS)$x
 
 distclean :: clean
-	- rm -f config.log config.cache config.status config.h makefile man2html.tmp
+	- rm -f config.log config.cache config.status config.h makefile man2html.tmp install-man*
 	- rm -f $(testdir)/yacc/test-* $(testdir)/btyacc/test-*
 
 realclean :: distclean
diff --git a/contrib/byacc/mstring.c b/contrib/byacc/mstring.c
index 1110a7b89f39..c7b941a5f204 100644
--- a/contrib/byacc/mstring.c
+++ b/contrib/byacc/mstring.c
@@ -1,4 +1,4 @@
-/* $Id: mstring.c,v 1.9 2019/11/19 23:54:53 tom Exp $ */
+/* $Id: mstring.c,v 1.10 2023/02/26 10:15:01 tom Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -40,7 +40,7 @@ msprintf(struct mstring *s, const char *fmt, ...)
     do
     {
 	va_start(args, fmt);
-	len = (size_t) vsnprintf(buf_ptr, buf_len, fmt, args);
+	len = (size_t)vsnprintf(buf_ptr, buf_len, fmt, args);
 	va_end(args);
 	if ((changed = (len > buf_len)) != 0)
 	{
@@ -57,17 +57,17 @@ msprintf(struct mstring *s, const char *fmt, ...)
     while (changed);
 #else
     va_start(args, fmt);
-    len = (size_t) vsprintf(buf_ptr, fmt, args);
+    len = (size_t)vsprintf(buf_ptr, fmt, args);
     va_end(args);
     if (len >= buf_len)
 	return;
 #endif
 
-    if (len > (size_t) (s->end - s->ptr))
+    if (len > (size_t)(s->end - s->ptr))
     {
 	char *new_base;
-	size_t cp = (size_t) (s->ptr - s->base);
-	size_t cl = (size_t) (s->end - s->base);
+	size_t cp = (size_t)(s->ptr - s->base);
+	size_t cl = (size_t)(s->end - s->base);
 	size_t nl = cl;
 	while (len > (nl - cp))
 	    nl = nl + nl + TAIL;
@@ -97,7 +97,7 @@ mputchar(struct mstring *s, int ch)
 	return ch;
     if (s->ptr == s->end)
     {
-	size_t len = (size_t) (s->end - s->base);
+	size_t len = (size_t)(s->end - s->base);
 	if ((s->base = realloc(s->base, len + len + TAIL)))
 	{
 	    s->ptr = s->base + len;
diff --git a/contrib/byacc/output.c b/contrib/byacc/output.c
index cd2f5aa9c118..fa9689bb0369 100644
--- a/contrib/byacc/output.c
+++ b/contrib/byacc/output.c
@@ -1,4 +1,4 @@
-/* $Id: output.c,v 1.100 2022/01/09 18:03:56 tom Exp $ */
+/* $Id: output.c,v 1.101 2023/05/16 21:19:48 tom Exp $ */
 
 #include "defs.h"
 
@@ -1623,21 +1623,14 @@ output_pure_parser(FILE * fp)
     if (fp == code_file)
 	++outline;
     fprintf(fp, "#define YYPURE %d\n", pure_parser);
-    putc_code(fp, '\n');
-}
-
 #if defined(YY_NO_LEAKS)
-static void
-output_no_leaks(FILE * fp)
-{
-    putc_code(fp, '\n');
-
     if (fp == code_file)
 	++outline;
     fputs("#define YY_NO_LEAKS 1\n", fp);
+#else
     putc_code(fp, '\n');
-}
 #endif
+}
 
 static void
 output_trailing_text(void)
@@ -2092,9 +2085,6 @@ output(void)
 
     output_prefix(fp);
     output_pure_parser(fp);
-#if defined(YY_NO_LEAKS)
-    output_no_leaks(fp);
-#endif
     output_stored_text(fp);
     output_stype(fp);
 #if defined(YYBTYACC)
diff --git a/contrib/byacc/package/byacc.spec b/contrib/byacc/package/byacc.spec
deleted file mode 100644
index 6c9e43c4c149..000000000000
--- a/contrib/byacc/package/byacc.spec
+++ /dev/null
@@ -1,119 +0,0 @@
-Summary: public domain Berkeley LALR Yacc parser generator
-
-%global AppVersion 2.0
-%global AppPatched 20230201
-
-%global AltProgram byacc2
-%global UseProgram yacc
-
-# $Id: byacc.spec,v 1.70 2023/02/02 00:12:06 tom Exp $
-Name: byacc
-Version: %{AppVersion}.%{AppPatched}
-Release: 1
-License: Public Domain, MIT
-URL: https://invisible-island.net/%{name}/
-Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz
-
-%description
-This package provides a parser generator utility that reads a grammar
-specification from a file and generates an LR(1) parser for it.  The
-parsers consist of a set of LALR(1) parsing tables and a driver
-routine written in the C programming language.  It has a public domain
-license which includes the generated C.
-
-%package -n byacc2
-Summary: public domain Berkeley LALR Yacc parser generator with backtracking
-
-%description -n byacc2
-This package provides a parser generator utility that reads a grammar
-specification from a file and generates an LR(1) parser for it.  The
-parsers consist of a set of LALR(1) parsing tables and a driver
-routine written in the C programming language.  It has a public domain
-license which includes the generated C.
-
-This package has the backtracking extension.
-
-%prep
-
-%global debug_package %{nil}
-
-%setup -q -n %{name}-%{AppPatched}
-
-%build
-%define my_srcdir ..
-%define CFG_OPTS \\\
-  --verbose \\\
-  --disable-echo \\\
-  --enable-stdnoreturn \\\
-  --target %{_target_platform} \\\
-  --prefix=%{_prefix} \\\
-  --srcdir=%{my_srcdir} \\\
-  --bindir=%{_bindir} \\\
-  --libdir=%{_libdir} \\\
-  --mandir=%{_mandir}
-
-%global _configure ../configure
-
-mkdir BUILD-byacc
-pushd BUILD-byacc
-CONFIGURE_TOP=%{my_srcdir} \
-%configure %{CFG_OPTS} \
-  --program-prefix=b \
-make
-popd
-
-mkdir BUILD-byacc2
-pushd BUILD-byacc2
-CONFIGURE_TOP=%{my_srcdir} \
-%configure %{CFG_OPTS} \
-  --enable-btyacc \
-  --program-transform-name='s,\<yacc,byacc2,g' \
-  --with-max-table-size=123456 \
-make
-popd
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-pushd BUILD-byacc
-make install DESTDIR=$RPM_BUILD_ROOT
-( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{name} %{UseProgram} )
-popd
-
-pushd BUILD-byacc2
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%files
-%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
-%license LICENSE
-%{_bindir}/%{name}
-%{_bindir}/%{UseProgram}
-%{_mandir}/man1/%{name}.*
-
-%files -n byacc2
-%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README README.BTYACC
-%license LICENSE
-%{_bindir}/%{AltProgram}
-%{_mandir}/man1/%{AltProgram}.*
-
-%changelog
-# each patch should add its ChangeLog entries here
-
-* Sun Jan 09 2022 Thomas Dickey
-- rpmlint
-
-* Sat Jan 01 2022 Thomas Dickey
-- rename btyacc package to byacc2 to co-exist with traditional btyacc
-
-* Fri May 25 2018 Thomas Dickey
-- add btyacc package
-
-* Sun Jul 09 2017 Thomas Dickey
-- use predefined "configure"
-
-* Sun Jun 06 2010 Thomas Dickey
-- initial version
diff --git a/contrib/byacc/package/debian/changelog b/contrib/byacc/package/debian/changelog
deleted file mode 100644
index a7a04bcc4698..000000000000
--- a/contrib/byacc/package/debian/changelog
+++ /dev/null
@@ -1,519 +0,0 @@
-byacc (1:2.0.20230201) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 01 Feb 2023 19:12:06 -0500
-
-byacc (1:2.0.20221229) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 29 Dec 2022 05:23:05 -0500
-
-byacc (1:2.0.20221106) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Nov 2022 10:51:43 -0500
-
-byacc (1:2.0.20220128) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Jan 2022 08:38:52 -0500
-
-byacc (1:2.0.20220114) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 14 Jan 2022 16:33:35 -0500
-
-byacc (1:2.0.20220109) unstable; urgency=low
-
-  * maintenance updates, modify packaging to more closely match distributors.
-    In particular, correct versioning using an epoch.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Jan 2022 10:49:20 -0500
-
-byacc (20220102) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 02 Jan 2022 11:12:56 -0500
-
-byacc (20220101) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jan 2022 07:06:35 -0500
-
-byacc (20211224) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Dec 2021 19:13:22 -0500
-
-byacc (20210808) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 08 Aug 2021 15:26:10 -0400
-
-byacc (20210802) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 02 Aug 2021 16:50:01 -0400
-
-byacc (20210801) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Aug 2021 15:30:22 -0400
-
-byacc (20210619) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Jun 2021 14:06:48 -0400
-
-byacc (20210520) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 May 2021 15:25:00 -0400
-
-byacc (20210328) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 28 Mar 2021 11:14:10 -0400
-
-byacc (20210109) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Jan 2021 09:32:51 -0500
-
-byacc (20200910) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 10 Sep 2020 10:45:10 -0400
-
-byacc (20200330) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 30 Mar 2020 19:31:42 -0400
-
-byacc (20191125) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 25 Nov 2019 18:13:14 -0500
-
-byacc (20191119) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 19 Nov 2019 20:40:56 -0500
-
-byacc (20191103) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Nov 2019 16:42:41 -0500
-
-byacc (20190617) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Jun 2019 15:51:03 -0400
-
-byacc (20190616) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Jun 2019 08:55:03 -0400
-
-byacc (20180609) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Jun 2018 20:42:16 -0400
-
-byacc (20180525) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 21 May 2018 18:50:44 -0400
-
-byacc (20180510) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 10 May 2018 04:59:09 -0400
-
-byacc (20180509) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 09 May 2018 21:13:51 -0400
-
-byacc (20180508) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 08 May 2018 16:24:39 -0400
-
-byacc (20170709) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Jul 2017 13:49:13 -0400
-
-byacc (20170430) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 30 Apr 2017 16:55:15 -0400
-
-byacc (20170201) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 01 Feb 2017 04:55:04 -0500
-
-byacc (20161202) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 02 Dec 2016 07:58:46 -0500
-
-byacc (20160606) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 06 Jun 2016 20:44:26 -0400
-
-byacc (20160601) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 06 Jun 2016 05:21:18 -0400
-
-byacc (20160324) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 24 Mar 2016 19:55:52 -0400
-
-byacc (20150711) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 10 Jul 2015 20:53:15 -0400
-
-byacc (20150705) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Jul 2015 18:24:51 -0400
-
-byacc (20141128) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 28 Nov 2014 10:42:17 -0500
-
-byacc (20141006) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 06 Oct 2014 18:52:03 -0400
-
-byacc (20141005) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 27 Jul 2014 10:45:06 -0400
-
-byacc (20140715) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 15 Jul 2014 15:36:54 -0400
-
-byacc (20140527) unstable; urgency=low
-
-  * remove obsolete option from usage message
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 27 May 2014 22:01:55 -0400
-
-byacc (20140422) unstable; urgency=low
-
-  * maintenance updates
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 22 Apr 2014 04:13:20 -0400
-
-byacc (20140409) unstable; urgency=low
-
-  * integrate Tom Shield's btyacc-related changes
-  * add test-cases to fill in gaps reported by lcov
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 09 Apr 2014 15:53:59 -0400
-
-byacc (20140101) unstable; urgency=low
-
-  * yytname[] changes
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 01 Jan 2014 10:02:12 -0500
-
-byacc (20130925) unstable; urgency=low
-
-  * increase default stack-size
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 25 Sep 2013 18:41:54 -0400
-
-byacc (20130304) unstable; urgency=low
-
-  * changes prompted by Richard Mitton bug-report
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 04 Mar 2013 20:17:32 -0500
-
-byacc (20121003) unstable; urgency=low
-
-  * changes from or prompted by Adrian Bunk.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Sep 2012 09:14:31 -0400
-
-byacc (20120526) unstable; urgency=low
-
-  * minor code-cleanup.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 May 2012 12:14:17 -0400
-
-byacc (20120115) unstable; urgency=low
-
-  * add testcases, improve documentation for "-s" option.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 13 Jan 2012 20:44:34 -0500
-
-byacc (20111219) unstable; urgency=low
-
-  * add "-s" option.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 19 Dec 2011 20:54:09 -0500
-
-byacc (20110908) unstable; urgency=low
-
-  * add "-i" option.
-  * add error-check in reader.c
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 05 Sep 2011 20:05:51 -0400
-
-byacc (20101229) unstable; urgency=low
-
-  * fixes from Christos Zoulos
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 29 Dec 2010 13:03:50 -0500
-
-byacc (20101226) unstable; urgency=low
-
-  * portability fix for MinGW
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 Dec 2010 19:37:54 -0500
-
-byacc (20101127) unstable; urgency=low
-
-  * corrected yyerror use of %parse-param data
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Nov 2010 12:32:00 -0500
-
-byacc (20101126) unstable; urgency=low
-
-  * additional fix to generated code to avoid symbol conflict
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 26 Nov 2010 04:23:08 -0500
-
-byacc (20101124) unstable; urgency=low
-
-  * amend fix for Red Hat #112617 to restore warning message.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 22 Nov 2010 08:21:23 -0500
-
-byacc (20101122) unstable; urgency=low
-
-  * fix for generated header to avoid symbol conflict
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 22 Nov 2010 08:21:23 -0500
-
-byacc (20100610) unstable; urgency=low
-
-  * Add package scripts to upstream source, for test-builds.
-
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 10 Jun 2010 08:59:11 -0400
-
-byacc (20100216-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/source/format: Added using format "3.0 (quilt)"
-
- -- Dave Beckett <dajobe@debian.org>  Tue, 20 Apr 2010 12:56:11 -0700
-
-byacc (20091027-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/control:
-    - Updated to policy 3.8.4
-    - Add ${misc:Depends}
-
- -- Dave Beckett <dajobe@debian.org>  Tue, 02 Feb 2010 21:36:34 -0800
-
-byacc (20090221-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Dave Beckett <dajobe@debian.org>  Thu, 26 Feb 2009 21:06:20 -0800
-
-byacc (20080826-1) unstable; urgency=high
-
-  * New upstream release
-  * debian/patches/02-skeleton.patch: Removed - merged upstream
-  * debian/control: Updated to policy 3.8.0
-  * debian/preinst, debian/postrm: removed - empty (lintian)
-  * debian/watch: version 3 and make FTP passive
-  * Acknowledge NMU - thanks.
-
- -- Dave Beckett <dajobe@debian.org>  Wed, 11 Sep 2008 23:58:00 -0700
-
-byacc (20070509-1.1) unstable; urgency=high
-
-  * Non-maintainer upload.
-  * Fix stack overflow in skeleton.c with upstream patch.
-    Closes: #491182 aka CVE-2008-3196
-
- -- Thomas Viehmann <tv@beamnet.de>  Sun, 24 Aug 2008 23:13:07 +0200
-
-byacc (20070509-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/watch: Fix to use passive FTP
-  * debian/compat: added instead of use of DH_COMPAT in debian/rules
-
- -- Dave Beckett <dajobe@debian.org>  Tue, 26 Jun 2007 22:39:45 -0700
-
-byacc (20050813-1) unstable; urgency=low
-
-  * New upstream release:
-    - Do not close union_file for -d option (Closes: #322858)
-
- -- Dave Beckett <dajobe@debian.org>  Sun, 14 Aug 2005 10:14:12 +0100
-
-byacc (20050505-1) unstable; urgency=low
-
-  * New maintainer (Closes: #321377)
-  * Switch to new upstream and new source (Closes: #240662)
-  * debian/copyright: Update to new upstream and add source information
-    (Closes: #166300)
-  * Acknowledge fix in NMUs (Closes: #283174)
-  * New manual page does not have the formatting problem (Closes: #100947)
-  * Added debian/watch file.
-
- -- Dave Beckett <dajobe@debian.org>  Fri,  5 Aug 2005 22:50:20 +0100
-
-byacc (1.9.1-1.1) unstable; urgency=low
-
-  * Remove alternative in prerm.  Closes: #283174
-
- -- LaMont Jones <lamont@debian.org>  Fri, 26 Nov 2004 18:49:09 -0700
-
-byacc (1.9.1-1) unstable; urgency=low
-
-  * Maintainer upload.
-  * Fixed alternatives entry, closes: Bug#146195;
-  * Changed priority to "extra" at behest of Daniel Bungert,
-    closes: Bug#142271.
-  * Fixed awful packaging error which meant the test/ directory was excluded
-    from the orig.tar.gz.
-
- -- Jason Henry Parker <henry@debian.org>  Fri, 27 Sep 2002 16:25:27 -0400
-
-byacc (1.9-13.1) unstable; urgency=low
-
-  * Non-maintainer upload
-  * Removed erraneous escapes in manpage - some data wasn't visable,
-    closes: Bug#100947
-  * Alternatives entry added, closes: Bug#113168
-  * Standards-version: 3.5.6
-  * Maintainer script cleaning
-
- -- Daniel Bungert <drb@debian.org>  Fri, 29 Mar 2002 16:58:30 -0500
-
-byacc (1.9-13) unstable; urgency=low
-
-  * Applied patch from "Randolph Chung" <tausq@debian.org> to fix build problems
-    on ia64, closes: Bug#91966
-
- -- Jason Henry Parker <henry@debian.org>  Thu, 29 Mar 2001 21:41:19 +1000
-
-byacc (1.9-12) unstable; urgency=low
-
-  * Updated to latest version of debhelper, and Standards-Version: 3.2.1.0, closes: Bug#81444
-  * Added Build-Depends: debhelper, closes: Bug#70207
-  * Removed mktemp() calls in main.c
-  
- -- Jason Henry Parker <henry@debian.org>  Mon, 18 Dec 2000 08:02:54 +1000
-
-byacc (1.9-11.7) unstable; urgency=low
-
-  * New maintainer.
-  * Updated to dh_make and standards version 2.4.0.0, no lintian errors
-    or warnings.
-  * Added several more files from the upstream distribution to
-    /usr/doc/byacc.
-
- -- Jason Henry Parker <henry@debian.org>  Sat,  2 Jan 1999 03:04:17 +1000
-
-byacc (1.9-11.6) unstable; urgency=low
-
-  * Patch by <mdorman@law.miami.edu> to remove some
-    superfluous files that can interfere with the build process on other
-    architectures. (Bug #21607).
-
- -- Vincent Renardias <vincent@waw.com>  Fri, 24 Apr 1998 19:56:58 +0200
-
-byacc (1.9-11.5) unstable; urgency=low
-
-  * Added 'binary-arch' target in debian/rules (Bug #12742).
-
- -- Vincent Renardias <vincent@waw.com>  Sun, 9 Nov 1997 23:37:31 +0100
-
-byacc (1.9-11.4) unstable; urgency=low
-
-  * Cosmetic change (Fix bug #9623).
-
- -- Vincent Renardias <vincent@waw.com>  Fri, 9 May 1997 16:30:24 +0200
-
-byacc (1.9-11.3) unstable; urgency=low
-
-  * Rebuilt with libc6.
-
- -- Debian QA Group <debian-qa@lists.debian.org>  Thu, 1 May 1997 22:02:04 +0200
-
-byacc (1.9-11.2) unstable; urgency=low
-
-  * Orphaned the package at his maintainer's request (dgregor@coil.com).
-
- -- Debian QA Group <debian-qa@lists.debian.org>  Sun, 20 Apr 1997 20:03:03 +0200
-
-byacc (1.9-11.1) unstable; urgency=low
-
-  * Converted to new source format (Fixes #8085).
-  * Compressed manpage.
-  * Fixed to allow compilation on non-i386 (Fixes #3361).
-  * Added extended description (Fixes #3567).
-  * Added diversion to avoid conflict with bison (Fixes #8086). 
-
- -- Vincent Renardias <vincent@waw.com>  Sun, 20 Apr 1997 15:59:28 +0200
diff --git a/contrib/byacc/package/debian/control b/contrib/byacc/package/debian/control
deleted file mode 100644
index 95e709a3ee99..000000000000
--- a/contrib/byacc/package/debian/control
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: byacc
-Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
-Uploaders: Thomas E. Dickey <dickey@his.com>
-Section: devel
-Priority: optional
-Standards-Version: 4.6.0.1
-Build-Depends: debhelper-compat (= 12),
-Rules-Requires-Root: no
-Homepage: https://invisible-island.net/byacc/
-Vcs-Browser: https://salsa.debian.org/debian/byacc
-Vcs-Git: https://salsa.debian.org/debian/byacc.git
-
-Package: byacc2
-Provides: yacc
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: public domain Berkeley LALR Yacc parser generator
- This package provides a parser generator utility that reads a grammar
- specification from a file and generates an LR(1) parser for it.  The
- parsers consist of a set of LALR(1) parsing tables and a driver
- routine written in the C programming language.  It has a public domain
- license which includes the generated C.
- .
- This package has the backtracking extension, adapted from btyacc.
- The package is renamed to allow installing at the same time as "byacc".
- .
- Related packages: bison, btyacc, byacc, antlr
diff --git a/contrib/byacc/package/debian/copyright b/contrib/byacc/package/debian/copyright
deleted file mode 100644
index d80760fbf382..000000000000
--- a/contrib/byacc/package/debian/copyright
+++ /dev/null
@@ -1,129 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: byacc
-Upstream-Contact: <dickey@invisible-island.net> (Thomas E. Dickey)
-Source: https://invisible-island.net/byacc/
-
-Files: *
-Copyright:  2001-2022,2023 by Thomas E. Dickey
-License: public-domain
-    Berkeley Yacc is in the public domain; changes made to it by the current
-    maintainer are likewise unrestricted.  That applies to most of the files.
-    A few files (currently those related to autoconf scripting) have other
-    licenses as noted here.
-    .
-    Current byacc upstream maintainer: Thomas Dickey <dickey@invisible-island.net>
-    .
-    Public domain notice and no warranty:
-    -------------------------------------------------------------------------------
-        Berkeley Yacc is an LALR(1) parser generator.  Berkeley Yacc has been made
-    as compatible as possible with AT&T Yacc.  Berkeley Yacc can accept any input
-    specification that conforms to the AT&T Yacc documentation.  Specifications
-    that take advantage of undocumented features of AT&T Yacc will probably be
-    rejected.
-    .
-        Berkeley Yacc is distributed with no warranty whatever.  The code
-    is certain to contain errors.  Neither the author nor any contributor
-    takes responsibility for any consequences of its use.
-    .
-        Berkeley Yacc is in the public domain.  The data structures and algorithms
-    used in Berkeley Yacc are all either taken from documents available to the
-    general public or are inventions of the author.  Anyone may freely distribute
-    source or binary forms of Berkeley Yacc whether unchanged or modified.
-    Distributers may charge whatever fees they can obtain for Berkeley Yacc.
-    Programs generated by Berkeley Yacc may be distributed freely.
-    .
-        Please report bugs to
-    .
-                            robert.corbett@eng.Sun.COM
-    .
-    Include a small example if possible.  Please include the banner string from
-    skeleton.c with the bug report.  Do not expect rapid responses.
-    -------------------------------------------------------------------------------
-
-Files: aclocal.m4
-Copyright:  2004-2022,2023 by Thomas E. Dickey
-License: other-BSD
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, distribute with modifications, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    .
-    The above copyright notice and this permission notice shall be included
-    in all copies or portions of the Software.
-    .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-    THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    .
-    Except as contained in this notice, the name(s) of the above copyright
-    holders shall not be used in advertising or otherwise to promote the
-    sale, use or other dealings in this Software without prior written
-    authorization.
-
-Files: install-sh
-Copyright:  1994 X Consortium
-License: other-BSD
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    .
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-    .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    .
-    Except as contained in this notice, the name of the X Consortium shall not
-    be used in advertising or otherwise to promote the sale, use or other deal-
-    ings in this Software without prior written authorization from the X Consor-
-    tium.
-    .
-    FSF changes to this file are in the public domain.
-    .
-    Calling this script install-sh is preferred over install.sh, to prevent
-    `make' implicit rules from creating a file called install from it
-    when there is no Makefile.
-    .
-    This script is compatible with the BSD install script, but was written
-    from scratch.  It can only install one file at a time, a restriction
-    shared with many OS's install programs.
-
-Files: package/debian/*
-Copyright:  2012-2022,2023 Thomas E. Dickey
-License: other-BSD
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose and without fee is hereby granted,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation, and that the name of the above listed
-    copyright holder(s) not be used in advertising or publicity pertaining
-    to distribution of the software without specific, written prior
-    permission.
-    .
-    THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-    LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Files: config.guess config.sub
-Copyright: 1992-2021 Free Software Foundation, Inc.
-License: GPL-3
-    On Debian systems, the complete text of the GNU General
-    Public License can be found in '/usr/share/common-licenses/GPL-3'
diff --git a/contrib/byacc/package/debian/rules b/contrib/byacc/package/debian/rules
deleted file mode 100755
index 81b0e7c6f0c6..000000000000
--- a/contrib/byacc/package/debian/rules
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
-
-%:
-	dh $@
-
-# dh_autoreconf interferes with portability -- skip it
-override_dh_autoreconf:
-	echo "skip: dh_autoreconf autoreconf-dickey -- -f -i"
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--enable-warnings \
-		--verbose \
-		--enable-stdnoreturn \
-		--enable-btyacc \
-		--with-max-table-size=123456 \
-		--program-transform-name='s,^yacc,byacc2,'
-
-	# workaround for whatis
-	sed -i '/- an LALR/s,^..N,byacc2,' yacc.1
-
-	# omit tests which rely upon getopt error-messages
-	sed -i.bak '/MYFILE=nosuchfile/,/# Test special cases/d' test/run_test.sh
-	diff -u test/run_test.sh.bak test/run_test.sh || echo OK
diff --git a/contrib/byacc/package/debian/source/format b/contrib/byacc/package/debian/source/format
deleted file mode 100644
index 89ae9db8f88b..000000000000
--- a/contrib/byacc/package/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/contrib/byacc/package/debian/watch b/contrib/byacc/package/debian/watch
deleted file mode 100644
index a31bf234aacc..000000000000
--- a/contrib/byacc/package/debian/watch
+++ /dev/null
@@ -1,20 +0,0 @@
-version=4
-
-# upstream provides tarballs such as "byacc-20220101.tgz" (originally to
-# keep the filenames compatible with systems where multiple "." are illegal).
-#
-# The version number (2.0) is current since late 2020; before that it was
-# "1.9" for a long time.  Use
-#    byacc -V
-# to see the version number:
-#    byacc - 2.0 20220101
-#
-# The introduction of the back-tracking configuration motivated the change of
-# major/minor numbers; for compatibility the parser skeleton still says "1.9".
-#
-# Patch-dates are always # in yyyymmdd format.
-
-opts=pgpmode=auto,\
-dversionmangle=s/^2\.0\.//,\
-oversionmangle=s/^(.*)/2.0.$1/ \
- https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz
diff --git a/contrib/byacc/package/mingw-byacc.spec b/contrib/byacc/package/mingw-byacc.spec
deleted file mode 100644
index 0ba6dd22f539..000000000000
--- a/contrib/byacc/package/mingw-byacc.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-Summary: public domain Berkeley LALR Yacc parser generator
-
-%global AppVersion 2.0
-%global AppPatched 20230201
-
-%global UseProgram yacc
-
-# $Id: mingw-byacc.spec,v 1.47 2023/02/02 00:12:06 tom Exp $
-Name: byacc
-Version: %{AppVersion}.%{AppPatched}
-Release: 1
-License: Public Domain, MIT
-URL: https://invisible-island.net/%{name}/
-Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz
-
-%description
-This package provides a parser generator utility that reads a grammar
-specification from a file and generates an LR(1) parser for it.  The
-parsers consist of a set of LALR(1) parsing tables and a driver
-routine written in the C programming language.  It has a public domain
-license which includes the generated C.
-
-%prep
-
-%global debug_package %{nil}
-
-%setup -q -n %{name}-%{AppPatched}
-
-%build
-%configure --verbose \
-		--program-prefix=b \
-		--target %{_target_platform} \
-		--prefix=%{_prefix} \
-		--bindir=%{_bindir} \
-		--libdir=%{_libdir} \
-		--mandir=%{_mandir}
-
-make
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{name} %{UseProgram} )
-
-strip $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%files
-%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
-%license LICENSE
-%{_bindir}/%{name}
-%{_bindir}/%{UseProgram}
-%{_mandir}/man1/%{name}.*
-
-%changelog
-# each patch should add its ChangeLog entries here
-
-* Sun Jan 09 2022 Thomas Dickey
-- rpmlint
-
-* Sun Jul 09 2017 Thomas Dickey
-- use predefined "configure"
-
-* Wed Sep 25 2013 Thomas Dickey
-- cloned from byacc.spec
diff --git a/contrib/byacc/package/pkgsrc/DESCR b/contrib/byacc/package/pkgsrc/DESCR
deleted file mode 100644
index fe018659e9a4..000000000000
--- a/contrib/byacc/package/pkgsrc/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Berkeley Yacc (byacc) is a LALR(1) parser generator.  Berkeley Yacc
-has been made as compatible as possible with AT&T Yacc.  Berkeley
-Yacc can accept any input specification that conforms to the AT&T
-Yacc documentation.
-
-Some programs depend on a byacc (instead of bison).
diff --git a/contrib/byacc/package/pkgsrc/Makefile b/contrib/byacc/package/pkgsrc/Makefile
deleted file mode 100644
index 4bde471dcc19..000000000000
--- a/contrib/byacc/package/pkgsrc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $
-#
-
-DISTNAME=	byacc-20230201
-CATEGORIES=	devel
-MASTER_SITES=	https://invisible-mirror.net/archives/byacc/
-DIST_SUBDIR=	byacc-20220101
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	fcambus@NetBSD.org
-HOMEPAGE=	https://invisible-island.net/byacc/byacc.html
-COMMENT=	Berkeley Yacc
-LICENSE=	public-domain
-
-
-GNU_CONFIGURE=	YES
-MAKE_FILE=	makefile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/contrib/byacc/package/pkgsrc/PLIST b/contrib/byacc/package/pkgsrc/PLIST
deleted file mode 100644
index 5bcfece36ca8..000000000000
--- a/contrib/byacc/package/pkgsrc/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/13 14:11:54 wiz Exp $
-bin/yacc
-man/man1/yacc.1
diff --git a/contrib/byacc/package/pkgsrc/distinfo b/contrib/byacc/package/pkgsrc/distinfo
deleted file mode 100644
index 99252a686757..000000000000
--- a/contrib/byacc/package/pkgsrc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2008/07/24 17:13:00 tonnerre Exp $
-
-SHA1 (byacc-20050813.tgz) = 3258494f3422eb3150944c1823af1c9c2c386062
-RMD160 (byacc-20050813.tgz) = 3ee159857a79025a83e2b0807577925fe460f816
-Size (byacc-20050813.tgz) = 138684 bytes
-SHA1 (patch-aa) = decae78775a5e0f1e1f7aaaa258da53903aa1f7a
diff --git a/contrib/byacc/reader.c b/contrib/byacc/reader.c
index 85d6506e0a1f..49e90dee1aec 100644
--- a/contrib/byacc/reader.c
+++ b/contrib/byacc/reader.c
@@ -1,4 +1,4 @@
-/* $Id: reader.c,v 1.91 2022/01/09 18:04:58 tom Exp $ */
+/* $Id: reader.c,v 1.104 2023/05/18 21:18:17 tom Exp $ */
 
 #include "defs.h"
 
@@ -20,6 +20,11 @@
 /* this is a hard limit, but seems more than adequate */
 #define MAXARGS	20
 
+/* limit the size of optional names for %union */
+#define NAME_LEN 32
+
+#define IS_ALNUM(c) (isalnum(c) || (c) == '_')
+
 #define begin_case(f,n) fprintf(f, "case %d:\n", (int)(n))
 
 #define end_case(f) \
@@ -27,6 +32,17 @@
 	    fprintf_lineno(f, 1, ""); \
 	    fprintf(f, "break;\n")
 
+#define begin_ainfo(data, offset) do { \
+	    data.a_lineno = lineno; \
+	    data.a_line = dup_line(); \
+	    data.a_cptr = data.a_line + (cptr - line - offset); \
+	} while (0)
+
+#define end_ainfo(data) do { \
+	    FREE(data.a_line); \
+	    memset(&data, 0, sizeof(data)); \
+	} while (0)
+
 static void start_rule(bucket *bp, int s_lineno);
 #if defined(YYBTYACC)
 static void copy_initial_action(void);
@@ -44,8 +60,22 @@ static char **tag_table;
 
 static char saw_eof;
 char unionized;
-char *cptr, *line;
-static int linesize;
+
+char *line;		/* current input-line */
+char *cptr;		/* position within current input-line */
+static size_t linesize;	/* length of current input-line */
+
+typedef struct
+{
+    char *line_data;	/* saved input-line */
+    size_t line_used;	/* position within saved input-line */
+    size_t line_size;	/* length of saved input-line */
+    fpos_t line_fpos;	/* pointer before reading past saved input-line */
+}
+SAVE_LINE;
+
+static SAVE_LINE save_area;
+static int must_save;	/* request > 0, triggered < 0, inactive 0 */
 
 static bucket *goal;
 static Value_t prec;
@@ -265,14 +295,58 @@ line_directive(void)
 }
 
 static void
+save_line(void)
+{
+    /* remember to save the input-line if we call get_line() */
+    if (!must_save)
+    {
+	must_save = 1;
+	save_area.line_used = (size_t)(cptr - line);
+    }
+}
+
+static void
+restore_line(void)
+{
+    /* if we saved the line, restore it */
+    if (must_save < 0)
+    {
+	free(line);
+	line = save_area.line_data;
+	cptr = save_area.line_used + line;
+	linesize = save_area.line_size;
+	if (fsetpos(input_file, &save_area.line_fpos) != 0)
+	    on_error();
+	memset(&save_area, 0, sizeof(save_area));
+    }
+    else if (must_save > 0)
+    {
+	cptr = line + save_area.line_used;
+    }
+    must_save = 0;
+}
+
+static void
 get_line(void)
 {
     FILE *f = input_file;
 
+    if (must_save > 0)
+    {
+	save_area.line_data = TMALLOC(char, linesize);
+	save_area.line_used = (size_t)(cptr - line);
+	save_area.line_size = linesize;
+	NO_SPACE(save_area.line_data);
+	memcpy(save_area.line_data, line, linesize);
+	if (fgetpos(f, &save_area.line_fpos) != 0)
+	    on_error();
+	must_save = -must_save;
+    }
+
     do
     {
 	int c;
-	int i;
+	size_t i;
 
 	if (saw_eof || (c = getc(f)) == EOF)
 	{
@@ -348,9 +422,8 @@ skip_comment(void)
 {
     char *s;
     struct ainfo a;
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line);
+
+    begin_ainfo(a, 0);
 
     s = cptr + 2;
     for (;;)
@@ -358,7 +431,7 @@ skip_comment(void)
 	if (*s == '*' && s[1] == '/')
 	{
 	    cptr = s + 2;
-	    FREE(a.a_line);
+	    end_ainfo(a);
 	    return;
 	}
 	if (*s == '\n')
@@ -425,6 +498,7 @@ nextc(void)
     {
 	switch (ch = next_inline())
 	{
+	case '\0':
 	case '\n':
 	    get_line();
 	    break;
@@ -459,6 +533,7 @@ keywords[] = {
     { "binary",      NONASSOC },
     { "code",        XCODE },
     { "debug",       NONPOSIX_DEBUG },
+    { "define",      HACK_DEFINE },
 #if defined(YYBTYACC)
     { "destructor",  DESTRUCTOR },
 #endif
@@ -475,6 +550,7 @@ keywords[] = {
     { "locations",   LOCATIONS },
 #endif
     { "nonassoc",    NONASSOC },
+    { "nterm",       TYPE },
     { "parse-param", PARSE_PARAM },
     { "pure-parser", PURE_PARSER },
     { "right",       RIGHT },
@@ -597,9 +673,8 @@ copy_string(int quote)
 {
     struct mstring *temp = msnew();
     struct ainfo a;
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line - 1);
+
+    begin_ainfo(a, 1);
 
     for (;;)
     {
@@ -608,7 +683,7 @@ copy_string(int quote)
 	mputc(temp, c);
 	if (c == quote)
 	{
-	    FREE(a.a_line);
+	    end_ainfo(a);
 	    return msdone(temp);
 	}
 	if (c == '\n')
@@ -649,9 +724,8 @@ copy_comment(void)
     else if (c == '*')
     {
 	struct ainfo a;
-	a.a_lineno = lineno;
-	a.a_line = dup_line();
-	a.a_cptr = a.a_line + (cptr - line - 1);
+
+	begin_ainfo(a, 1);
 
 	mputc(temp, c);
 	++cptr;
@@ -663,7 +737,7 @@ copy_comment(void)
 	    {
 		mputc(temp, '/');
 		++cptr;
-		FREE(a.a_line);
+		end_ainfo(a);
 		return msdone(temp);
 	    }
 	    if (c == '\n')
@@ -706,6 +780,16 @@ copy_code(void)
 	c = *++cptr;
 	if (c == EOF)
 	    unexpected_EOF();
+	if (c == '\0')
+	{
+	    get_line();
+	    if (line == NULL)
+	    {
+		unexpected_EOF();
+		/*NOTREACHED */
+	    }
+	    c = *cptr;
+	}
 	if (isspace(UCH(c)))
 	    continue;
 
@@ -806,9 +890,8 @@ copy_text(void)
     FILE *f = text_file;
     int need_newline = 0;
     struct ainfo a;
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line - 2);
+
+    begin_ainfo(a, 2);
 
     if (*cptr == '\n')
     {
@@ -858,7 +941,7 @@ copy_text(void)
 	    if (need_newline)
 		putc('\n', f);
 	    ++cptr;
-	    FREE(a.a_line);
+	    end_ainfo(a);
 	    return;
 	}
 	/* FALLTHRU */
@@ -873,9 +956,12 @@ copy_text(void)
 static void
 puts_both(const char *s)
 {
-    fputs(s, text_file);
-    if (dflag)
-	fputs(s, union_file);
+    if (s && *s)
+    {
+	fputs(s, text_file);
+	if (dflag)
+	    fputs(s, union_file);
+    }
 }
 
 static void
@@ -892,9 +978,16 @@ copy_union(void)
     int c;
     int depth;
     struct ainfo a;
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line - 6);
+    char prefix_buf[NAME_LEN + 1];
+    size_t prefix_len = 0;
+    char filler_buf[NAME_LEN + 1];
+    size_t filler_len = 0;
+    int in_prefix = 1;
+
+    prefix_buf[0] = '\0';
+    filler_buf[0] = '\0';
+
+    begin_ainfo(a, 6);
 
     if (unionized)
 	over_unionized(cptr - 6);
@@ -908,12 +1001,51 @@ copy_union(void)
     puts_both("#define YYSTYPE_IS_DECLARED 1\n");
 
     fprintf_lineno(text_file, lineno, input_file_name);
-    puts_both("typedef union");
 
     depth = 0;
   loop:
     c = *cptr++;
-    putc_both(c);
+    if (in_prefix)
+    {
+	if (c == L_CURL)
+	{
+	    in_prefix = 0;
+	    if (prefix_len)
+	    {
+		puts_both("union ");
+		puts_both(prefix_buf);
+		puts_both(filler_buf);
+	    }
+	    else
+	    {
+		puts_both("typedef union YYSTYPE");
+		puts_both(filler_buf);
+	    }
+	}
+	else if (isspace(c))
+	{
+	    if (filler_len >= sizeof(filler_buf) - 1)
+	    {
+		puts_both(filler_buf);
+		filler_len = 0;
+	    }
+	    filler_buf[filler_len++] = (char)c;
+	    filler_buf[filler_len] = 0;
+	    if (c != '\n')
+		goto loop;
+	}
+	else if (IS_IDENT(c))
+	{
+	    if (prefix_len < NAME_LEN)
+	    {
+		prefix_buf[prefix_len++] = (char)c;
+		prefix_buf[prefix_len] = 0;
+	    }
+	    goto loop;
+	}
+    }
+    if (c != '\n' || !in_prefix)
+	putc_both(c);
     switch (c)
     {
     case '\n':
@@ -929,9 +1061,15 @@ copy_union(void)
     case R_CURL:
 	if (--depth == 0)
 	{
-	    puts_both(" YYSTYPE;\n");
+	    puts_both(prefix_len ? "; " : " YYSTYPE;\n");
+	    if (prefix_len)
+	    {
+		puts_both("typedef union ");
+		puts_both(prefix_buf);
+		puts_both(" YYSTYPE;\n");
+	    }
 	    puts_both("#endif /* !YYSTYPE_IS_DECLARED */\n");
-	    FREE(a.a_line);
+	    end_ainfo(a);
 	    return;
 	}
 	goto loop;
@@ -1017,9 +1155,9 @@ trim_blanks(char *buffer)
 static int
 more_curly(void)
 {
-    char *save = cptr;
     int result = 0;
     int finish = 0;
+    save_line();
     do
     {
 	switch (next_inline())
@@ -1036,7 +1174,7 @@ more_curly(void)
 	++cptr;
     }
     while (!finish);
-    cptr = save;
+    restore_line();
     return result;
 }
 
@@ -1053,6 +1191,24 @@ save_param(int k, char *buffer, int name, int type2)
     buffer[type2] = '\0';
     (void)trim_blanks(p->type2);
 
+    if (!IS_ALNUM(buffer[name]))
+    {
+	int n;
+	for (n = name - 1; n >= 0; --n)
+	{
+	    if (!isspace(UCH(buffer[n])))
+	    {
+		break;
+	    }
+	}
+	while (n > 0)
+	{
+	    if (!IS_ALNUM(UCH(buffer[n - 1])))
+		break;
+	    --n;
+	}
+	name = n;
+    }
     p->name = strdup(buffer + name);
     NO_SPACE(p->name);
     buffer[name] = '\0';
@@ -1240,7 +1396,7 @@ copy_param(int k)
 	    type2 = i + 1;
 	}
 
-	while (i > 0 && (isalnum(UCH(parms[i])) || UCH(parms[i]) == '_'))
+	while (i > 0 && IS_ALNUM(UCH(parms[i])))
 	    i--;
 
 	if (!isspace(UCH(parms[i])) && parms[i] != '*')
@@ -1280,9 +1436,8 @@ get_literal(void)
     char *s;
     bucket *bp;
     struct ainfo a;
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line);
+
+    begin_ainfo(a, 0);
 
     quote = *cptr++;
     cinc = 0;
@@ -1375,7 +1530,7 @@ get_literal(void)
 	}
 	cachec(c);
     }
-    FREE(a.a_line);
+    end_ainfo(a);
 
     n = cinc;
     s = TMALLOC(char, n);
@@ -1742,6 +1897,82 @@ declare_argtypes(bucket *bp)
 }
 #endif
 
+static int
+scan_blanks(void)
+{
+    int c;
+
+    do
+    {
+	c = next_inline();
+	if (c == '\n')
+	{
+	    ++cptr;
+	    return 0;
+	}
+	else if (c == ' ' || c == '\t')
+	    ++cptr;
+	else
+	    break;
+    }
+    while (c == ' ' || c == '\t');
+
+    return 1;
+}
+
+static int
+scan_ident(void)
+{
+    int c;
+
+    cinc = 0;
+    for (c = *cptr; IS_IDENT(c); c = *++cptr)
+	cachec(c);
+    cachec(NUL);
+
+    return cinc;
+}
+
+static void
+hack_defines(void)
+{
+    struct ainfo a;
+
+    if (!scan_blanks())
+	return;
+
+    begin_ainfo(a, 0);
+    if (!scan_ident())
+    {
+	end_ainfo(a);
+    }
+
+    if (!strcmp(cache, "api.pure"))
+    {
+	end_ainfo(a);
+	scan_blanks();
+	begin_ainfo(a, 0);
+	scan_ident();
+
+	if (!strcmp(cache, "false"))
+	    pure_parser = 0;
+	else if (!strcmp(cache, "true")
+		 || !strcmp(cache, "full")
+		 || *cache == 0)
+	    pure_parser = 1;
+	else
+	    unexpected_value(&a);
+	end_ainfo(a);
+    }
+    else
+    {
+	unexpected_value(&a);
+    }
+
+    while (next_inline() != '\n')
+	++cptr;
+}
+
 static void
 declare_types(void)
 {
@@ -1900,6 +2131,10 @@ read_declarations(void)
 	    tflag = 1;
 	    break;
 
+	case HACK_DEFINE:
+	    hack_defines();
+	    break;
+
 	case POSIX_YACC:
 	    /* noop for bison compatibility. byacc is already designed to be posix
 	     * yacc compatible. */
@@ -1983,9 +2218,7 @@ copy_args(int *alen)
     char c, quote = 0;
     struct ainfo a;
 
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line - 1);
+    begin_ainfo(a, 1);
 
     while ((c = *cptr++) != R_PAREN || depth || quote)
     {
@@ -2029,7 +2262,7 @@ copy_args(int *alen)
     }
     if (alen)
 	*alen = len;
-    FREE(a.a_line);
+    end_ainfo(a);
     return msdone(s);
 }
 
@@ -2681,9 +2914,7 @@ copy_action(void)
     Value_t *offsets = NULL, maxoffset;
     bucket **rhs;
 
-    a.a_lineno = lineno;
-    a.a_line = dup_line();
-    a.a_cptr = a.a_line + (cptr - line);
+    begin_ainfo(a, 0);
 
     if (last_was_action)
 	insert_empty_rule();
@@ -2877,10 +3108,8 @@ copy_action(void)
     {
 	if (!locations)
 	{
-	    int l_lineno = lineno;
-	    char *l_line = dup_line();
-	    char *l_cptr = l_line + (cptr - line);
-	    syntax_error(l_lineno, l_line, l_cptr);
+	    dislocations_warning();
+	    locations = 1;
 	}
 	if (cptr[1] == '$')
 	{
@@ -2949,7 +3178,7 @@ copy_action(void)
 		goto loop;
 	    }
 	    end_case(f);
-	    FREE(a.a_line);
+	    end_ainfo(a);
 	    if (maxoffset > 0)
 		FREE(offsets);
 	    return;
@@ -2969,7 +3198,7 @@ copy_action(void)
 	if (depth > 0)
 	    goto loop;
 	end_case(f);
-	free(a.a_line);
+	end_ainfo(a);
 	if (maxoffset > 0)
 	    FREE(offsets);
 	return;
@@ -3011,7 +3240,7 @@ copy_action(void)
 	}
 #endif
 	end_case(f);
-	free(a.a_line);
+	end_ainfo(a);
 	if (maxoffset > 0)
 	    FREE(offsets);
 	return;
@@ -3057,9 +3286,7 @@ get_code(struct ainfo *a, const char *loc)
     else
 	syntax_error(lineno, line, cptr);
 
-    a->a_lineno = lineno;
-    a->a_line = dup_line();
-    a->a_cptr = a->a_line + (cptr - line);
+    begin_ainfo((*a), 0);
 
     depth = 0;
   loop:
@@ -3097,10 +3324,8 @@ get_code(struct ainfo *a, const char *loc)
     {
 	if (!locations)
 	{
-	    int l_lineno = lineno;
-	    char *l_line = dup_line();
-	    char *l_cptr = l_line + (cptr - line);
-	    syntax_error(l_lineno, l_line, l_cptr);
+	    dislocations_warning();
+	    locations = 1;
 	}
 	msprintf(code_mstr, "%s", loc);
 	cptr += 2;
@@ -3165,7 +3390,7 @@ copy_initial_action(void)
     struct ainfo a;
 
     initial_action = get_code(&a, "yyloc");
-    free(a.a_line);
+    end_ainfo(a);
 }
 
 static void
@@ -3247,7 +3472,7 @@ copy_destructor(void)
 	else
 	    break;
     }
-    free(a.a_line);
+    end_ainfo(a);
     free(code_text);
 }
 
diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
index 36765d09ec09..f2057aa37997 100644
--- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
+++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
@@ -147,7 +147,7 @@ INTERVAL vreg[26];
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 29 "btyacc_calc1.y"
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
index 9cf4e75ba38a..114d213cd962 100644
--- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
+++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h
@@ -11,7 +11,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.c b/contrib/byacc/test/btyacc/btyacc_demo.tab.c
index 73b7a1073127..04557cd2d356 100644
--- a/contrib/byacc/test/btyacc/btyacc_demo.tab.c
+++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.c
@@ -152,7 +152,7 @@ typedef struct Decl {
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 36 "btyacc_demo.y"
-typedef union {
+typedef union YYSTYPE {
     Scope	*scope;
     Expr	*expr;
     Expr_List	*elist;
diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.h b/contrib/byacc/test/btyacc/btyacc_demo.tab.h
index 5c2b96cf3310..082f5cdbfa96 100644
--- a/contrib/byacc/test/btyacc/btyacc_demo.tab.h
+++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.h
@@ -20,7 +20,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union {
+typedef union YYSTYPE {
     Scope	*scope;
     Expr	*expr;
     Expr_List	*elist;
diff --git a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
index 21b0bc21fe86..fd25e13b0019 100644
--- a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
+++ b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
index 8f0dd0975fe2..1c7ac86fc24f 100644
--- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
+++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
@@ -148,7 +148,7 @@ extern symbol *mksymbol(type t, class c, name id);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 50 "btyacc_destroy2.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
index 6f8c2b029b4d..5f59abdea129 100644
--- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
+++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
index dc93094e6116..c0f897891d4e 100644
--- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
+++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
@@ -148,7 +148,7 @@ extern symbol *mksymbol(type t, class c, name id);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 53 "btyacc_destroy3.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
index 1ef7d6b370f0..5a84568a6c04 100644
--- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
+++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/calc1.tab.c b/contrib/byacc/test/btyacc/calc1.tab.c
index cc40060143b9..54d7014a4b27 100644
--- a/contrib/byacc/test/btyacc/calc1.tab.c
+++ b/contrib/byacc/test/btyacc/calc1.tab.c
@@ -150,7 +150,7 @@ INTERVAL vreg[26];
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 31 "calc1.y"
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/btyacc/calc1.tab.h b/contrib/byacc/test/btyacc/calc1.tab.h
index 1802350b0d2a..0162b2107474 100644
--- a/contrib/byacc/test/btyacc/calc1.tab.h
+++ b/contrib/byacc/test/btyacc/calc1.tab.h
@@ -11,7 +11,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.c b/contrib/byacc/test/btyacc/err_inherit3.tab.c
index 2a2bde418a5d..072d23b59cbb 100644
--- a/contrib/byacc/test/btyacc/err_inherit3.tab.c
+++ b/contrib/byacc/test/btyacc/err_inherit3.tab.c
@@ -143,7 +143,7 @@ extern symbol *mksymbol(type t, class c, name id);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 39 "err_inherit3.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.h b/contrib/byacc/test/btyacc/err_inherit3.tab.h
index 5fa781de315b..1018167b685a 100644
--- a/contrib/byacc/test/btyacc/err_inherit3.tab.h
+++ b/contrib/byacc/test/btyacc/err_inherit3.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.c b/contrib/byacc/test/btyacc/err_inherit4.tab.c
index 71a460d6c606..4d84c3abf220 100644
--- a/contrib/byacc/test/btyacc/err_inherit4.tab.c
+++ b/contrib/byacc/test/btyacc/err_inherit4.tab.c
@@ -151,7 +151,7 @@ extern symbol *mksymbol(type t, class c, name id);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 41 "err_inherit4.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.h b/contrib/byacc/test/btyacc/err_inherit4.tab.h
index 657f87f078fa..b8c5c281761e 100644
--- a/contrib/byacc/test/btyacc/err_inherit4.tab.h
+++ b/contrib/byacc/test/btyacc/err_inherit4.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.c b/contrib/byacc/test/btyacc/expr.oxout.tab.c
index 9c16860461f0..f83485d97710 100644
--- a/contrib/byacc/test/btyacc/expr.oxout.tab.c
+++ b/contrib/byacc/test/btyacc/expr.oxout.tab.c
@@ -137,7 +137,7 @@ extern void yyerror(const char *);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 31 "expr.oxout.y"
-typedef union {
+typedef union YYSTYPE {
 struct yyyOxAttrbs {
 struct yyyStackItem *yyyOxStackItem;
 } yyyOxAttrbs;
diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.h b/contrib/byacc/test/btyacc/expr.oxout.tab.h
index eb8596306bdc..cafc41cae56e 100644
--- a/contrib/byacc/test/btyacc/expr.oxout.tab.h
+++ b/contrib/byacc/test/btyacc/expr.oxout.tab.h
@@ -9,7 +9,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union {
+typedef union YYSTYPE {
 struct yyyOxAttrbs {
 struct yyyStackItem *yyyOxStackItem;
 } yyyOxAttrbs;
diff --git a/contrib/byacc/test/btyacc/inherit1.tab.c b/contrib/byacc/test/btyacc/inherit1.tab.c
index b8e7c5a7935b..60af07cb10f1 100644
--- a/contrib/byacc/test/btyacc/inherit1.tab.c
+++ b/contrib/byacc/test/btyacc/inherit1.tab.c
@@ -145,7 +145,7 @@ extern void YYERROR_DECL();
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 32 "inherit1.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/inherit1.tab.h b/contrib/byacc/test/btyacc/inherit1.tab.h
index 3b8aa3d2a914..41b0e2937d3d 100644
--- a/contrib/byacc/test/btyacc/inherit1.tab.h
+++ b/contrib/byacc/test/btyacc/inherit1.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/inherit2.tab.c b/contrib/byacc/test/btyacc/inherit2.tab.c
index db6fd30b0a24..8fb8e39cf2bc 100644
--- a/contrib/byacc/test/btyacc/inherit2.tab.c
+++ b/contrib/byacc/test/btyacc/inherit2.tab.c
@@ -143,7 +143,7 @@ extern symbol *mksymbol(type t, class c, name id);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 39 "inherit2.y"
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/inherit2.tab.h b/contrib/byacc/test/btyacc/inherit2.tab.h
index efaf4555d6dd..333dab588b3a 100644
--- a/contrib/byacc/test/btyacc/inherit2.tab.h
+++ b/contrib/byacc/test/btyacc/inherit2.tab.h
@@ -12,7 +12,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
     class	cval;
     type	tval;
diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.c b/contrib/byacc/test/btyacc/ok_syntax1.tab.c
index 6d94e6d2f5c8..c5af0ab4bc2d 100644
--- a/contrib/byacc/test/btyacc/ok_syntax1.tab.c
+++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.c
@@ -137,12 +137,12 @@ static void YYERROR_DECL();
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 43 "ok_syntax1.y"
-typedef union
+union CalcData 
 {
     char *	cval;
     int		ival;
     double	dval;
-} YYSTYPE;
+}; typedef union CalcData YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
 #line 148 "ok_syntax1.tab.c"
 
diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.h b/contrib/byacc/test/btyacc/ok_syntax1.tab.h
index 44b8dc3e95d3..bb0a20f19136 100644
--- a/contrib/byacc/test/btyacc/ok_syntax1.tab.h
+++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.h
@@ -23,12 +23,12 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+union CalcData 
 {
     char *	cval;
     int		ival;
     double	dval;
-} YYSTYPE;
+}; typedef union CalcData YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
 
 #endif /* _ok_syntax1__defines_h_ */
diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
index 2d35aade2579..381102f7207f 100644
--- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
+++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
@@ -151,7 +151,7 @@ INTERVAL vreg[26];
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 32 "varsyntax_calc1.y"
-typedef union
+typedef union YYSTYPE
 {
 	int ival;	/* dreg & vreg array index values*/
 	double dval;	/* floating point values*/
diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
index 49e269cdb8a4..5c28ca8ef131 100644
--- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
+++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h
@@ -11,7 +11,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
 	int ival;	/* dreg & vreg array index values*/
 	double dval;	/* floating point values*/
diff --git a/contrib/byacc/test/expr.oxout.h b/contrib/byacc/test/expr.oxout.h
new file mode 100644
index 000000000000..9317098abb2e
--- /dev/null
+++ b/contrib/byacc/test/expr.oxout.h
@@ -0,0 +1,90 @@
+/* testing only */
+
+typedef int yyyWAT;
+typedef int yyyWST;
+typedef int yyyFT;
+
+typedef struct yyyLexemes {
+    	char * lexeme;
+} yyyLexemes;
+
+typedef struct yyyAttribs {
+    	yyyLexemes yyyAttrb1;
+} yyyAttribs;
+
+typedef struct yyyParent {
+	struct yyyGNT *	noderef;
+	struct yyyStackItem * stackref;
+} yyyParent;
+
+typedef struct yyyGNT {
+	int *	refCountList;
+	int	refCountListLen;
+	struct yyyParent parent;
+	int	parentIsStack;
+	int	prodNum;
+	int	whichSym;
+	struct yyyGNT ** cL;
+	int	cLlen;
+	yyyAttribs yyyAttrbs;
+} yyyGNT;
+
+typedef int yyyRCT;
+
+typedef struct yyyStackItem {
+	int		wa;
+	int		whichSym;
+	yyyGNT *	node;
+	long		solvedSAlist;
+} yyySIT;
+
+#define yyyRSitem yyySIT
+
+yyyRSitem *yyyRSTop;
+yyyRSitem *yyyAfterRS;
+yyyRSitem *yyyRS; 
+
+#undef yyparse
+#undef yylex
+#undef yyerror
+#undef yychar
+#undef yyval
+#undef yylval
+#undef yydebug
+#undef yynerrs
+#undef yyerrflag
+#undef yylhs
+#undef yylen
+#undef yydefred
+#undef yystos
+#undef yydgoto
+#undef yysindex
+#undef yyrindex
+#undef yygindex
+#undef yytable
+#undef yycheck
+#undef yyname
+#undef yyrule
+#undef yycindex
+#undef yyctable
+
+struct {
+    int test_yycheck  [256];
+    int test_yydefred [256];
+    int test_yydgoto  [256];
+    int test_yygindex [256];
+    int test_yylen    [256];
+    int test_yylhs    [256];
+    int test_yyrindex [256];
+    int test_yysindex [256];
+    int test_yytable  [256];
+#define yycheck  test_expr.test_yycheck
+#define yydefred test_expr.test_yydefred
+#define yydgoto  test_expr.test_yydgoto
+#define yygindex test_expr.test_yygindex
+#define yylen    test_expr.test_yylen
+#define yylhs    test_expr.test_yylhs
+#define yyrindex test_expr.test_yyrindex
+#define yysindex test_expr.test_yysindex
+#define yytable  test_expr.test_yytable
+} test_expr;
diff --git a/contrib/byacc/test/ok_syntax1.y b/contrib/byacc/test/ok_syntax1.y
index a22f231ef60a..455a55aeb70b 100644
--- a/contrib/byacc/test/ok_syntax1.y
+++ b/contrib/byacc/test/ok_syntax1.y
@@ -40,7 +40,7 @@ static void YYERROR_DECL();
 %token TAB  '\t'
 %token VT   '\v'
 
-%union
+%union CalcData
 {
     char *	cval;
     int		ival;
diff --git a/contrib/byacc/test/yacc/calc1.tab.c b/contrib/byacc/test/yacc/calc1.tab.c
index c8c7b6cff9be..b78999115ee5 100644
--- a/contrib/byacc/test/yacc/calc1.tab.c
+++ b/contrib/byacc/test/yacc/calc1.tab.c
@@ -130,7 +130,7 @@ INTERVAL vreg[26];
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 31 "calc1.y"
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/yacc/calc1.tab.h b/contrib/byacc/test/yacc/calc1.tab.h
index c0633e37dfa8..dd493d013c26 100644
--- a/contrib/byacc/test/yacc/calc1.tab.h
+++ b/contrib/byacc/test/yacc/calc1.tab.h
@@ -8,7 +8,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
 	int ival;
 	double dval;
diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.c b/contrib/byacc/test/yacc/expr.oxout.tab.c
index 56e3b59d6f44..1e2ad2cab7bd 100644
--- a/contrib/byacc/test/yacc/expr.oxout.tab.c
+++ b/contrib/byacc/test/yacc/expr.oxout.tab.c
@@ -117,7 +117,7 @@ extern void yyerror(const char *);
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 31 "expr.oxout.y"
-typedef union {
+typedef union YYSTYPE {
 struct yyyOxAttrbs {
 struct yyyStackItem *yyyOxStackItem;
 } yyyOxAttrbs;
diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.h b/contrib/byacc/test/yacc/expr.oxout.tab.h
index 1084ea4abf79..03527bb036a4 100644
--- a/contrib/byacc/test/yacc/expr.oxout.tab.h
+++ b/contrib/byacc/test/yacc/expr.oxout.tab.h
@@ -6,7 +6,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union {
+typedef union YYSTYPE {
 struct yyyOxAttrbs {
 struct yyyStackItem *yyyOxStackItem;
 } yyyOxAttrbs;
diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.c b/contrib/byacc/test/yacc/ok_syntax1.tab.c
index f035bed50053..9165d3f5df08 100644
--- a/contrib/byacc/test/yacc/ok_syntax1.tab.c
+++ b/contrib/byacc/test/yacc/ok_syntax1.tab.c
@@ -117,12 +117,12 @@ static void YYERROR_DECL();
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 43 "ok_syntax1.y"
-typedef union
+union CalcData 
 {
     char *	cval;
     int		ival;
     double	dval;
-} YYSTYPE;
+}; typedef union CalcData YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
 #line 128 "ok_syntax1.tab.c"
 
diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.h b/contrib/byacc/test/yacc/ok_syntax1.tab.h
index 892b211c8a71..da8e5052277f 100644
--- a/contrib/byacc/test/yacc/ok_syntax1.tab.h
+++ b/contrib/byacc/test/yacc/ok_syntax1.tab.h
@@ -20,10 +20,10 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+union CalcData 
 {
     char *	cval;
     int		ival;
     double	dval;
-} YYSTYPE;
+}; typedef union CalcData YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
index 5ac5c9c07b78..6c7f2f8b12fe 100644
--- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
+++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
@@ -131,7 +131,7 @@ INTERVAL vreg[26];
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #line 32 "varsyntax_calc1.y"
-typedef union
+typedef union YYSTYPE
 {
 	int ival;	/* dreg & vreg array index values*/
 	double dval;	/* floating point values*/
diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
index fd07f2cc3d41..50369b226429 100644
--- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
+++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h
@@ -8,7 +8,7 @@
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
-typedef union
+typedef union YYSTYPE
 {
 	int ival;	/* dreg & vreg array index values*/
 	double dval;	/* floating point values*/
diff --git a/contrib/byacc/yacc.1 b/contrib/byacc/yacc.1
index afed39ed8712..30974ad24609 100644
--- a/contrib/byacc/yacc.1
+++ b/contrib/byacc/yacc.1
@@ -1,14 +1,21 @@
-.\" $Id: yacc.1,v 1.42 2022/11/06 17:07:16 tom Exp $
+.\" $Id: yacc.1,v 1.43 2024/01/10 00:30:34 tom Exp $
 .\"
-.\" .TH YACC 1 "July\ 15,\ 1990"
-.\" .UC 6
+.TH YACC 1 2024-01-09 "Berkeley Yacc" "User Commands"
+.
 .ds N Yacc
 .ds n yacc
+.
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
+.
 .de Ex
 .RS +7
 .PP
 .nf
-.ft CW
+.ft \*(CW
 ..
 .de Ee
 .fi
@@ -16,20 +23,27 @@
 .RE
 ..
 .\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds AQ \(aq
-.el       .ds AQ '
-.ie \n(.g .ds `` \(lq
-.el       .ds `` ``
-.ie \n(.g .ds '' \(rq
-.el       .ds '' ''
+.ie \n(.g \{\
+.ds `` \(lq
+.ds '' \(rq
+.ds '  \(aq
+.\}
+.el \{\
+.ie t .ds `` ``
+.el   .ds `` ""
+.ie t .ds '' ''
+.el   .ds '' ""
+.ie t .ds '  \(aq
+.el   .ds '  '
+.\}",
 .\" Bulleted paragraph
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH YACC 1 "November 6, 2022" "Berkeley Yacc" "User Commands"
 .SH NAME
-\*N \- an LALR(1) parser generator
+\*N \-
+an LALR(1) parser generator
 .SH SYNOPSIS
 .B \*n [ \-BdghilLPrtvVy ] [ \-b
 .I file_prefix
@@ -208,6 +222,13 @@ However, \fB\*n\fP accepts a single \*(``\-\*('' to read the grammar
 from the standard input.
 A double \*(``\-\-\*('' marker denotes the end of options.
 A single \fIfilename\fP parameter is expected after a \*(``\-\-\*('' marker.
+.
+.SH DIAGNOSTICS
+If there are rules that are never reduced, the number of such rules is
+reported on standard error.
+If there are any LALR(1) conflicts, the number of conflicts is reported
+on standard error.
+
 .SH EXTENSIONS
 .B \*N
 provides some extensions for
@@ -357,6 +378,7 @@ However,
 .B \*n
 does not predefine \*(``$end\*('', \*(``$error\*(''
 or \*(``$undefined\*('' in this array.
+.
 .SH PORTABILITY
 According to Robert Corbett,
 .Ex
@@ -420,8 +442,9 @@ Bison puts the additional parameters \fIfirst\fP for
 \fByyparse\fP and \fByyerror\fP but \fIlast\fP for destructors.
 \fBYacc\fP matches this behavior.
 .
-.SH DIAGNOSTICS
-If there are rules that are never reduced, the number of such rules is
-reported on standard error.
-If there are any LALR(1) conflicts, the number of conflicts is reported
-on standard error.
+.SH SEE ALSO
+\fBbison\fP(1),
+\fBbtyacc\fP(1),
+\fBlex\fP(1),
+\fBflex\fP(1),
+\fByacc\fP(1)