diff -Nru cproto-4.7u/aclocal.m4 cproto-4.7v/aclocal.m4
--- cproto-4.7u/aclocal.m4	2022-10-16 19:01:06.000000000 +0000
+++ cproto-4.7v/aclocal.m4	2023-02-23 00:30:06.000000000 +0000
@@ -1,8 +1,8 @@
-dnl $Id: aclocal.m4,v 4.39 2022/10/16 19:01:06 tom Exp $
+dnl $Id: aclocal.m4,v 4.43 2023/02/23 00:30:06 tom Exp $
 dnl
 dnl Macros for cproto configure script
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1994-2021,2022 Thomas E. Dickey
+dnl Copyright 1994-2022,2023 Thomas E. Dickey
 dnl
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -212,7 +212,7 @@
 ])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],
 [
@@ -226,8 +226,7 @@
 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); }
 	],
@@ -251,7 +250,7 @@
 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
@@ -292,7 +291,7 @@
 	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
@@ -350,7 +349,7 @@
 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
@@ -372,7 +371,7 @@
 	AC_TRY_COMPILE([],[
 #ifdef __clang__
 #else
-make an error
+#error __clang__ is not defined
 #endif
 ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
 ],[])
@@ -603,6 +602,7 @@
 	AC_CHECKING([for $CC __attribute__ directives])
 cat > "conftest.$ac_ext" <<EOF
 #line __oline__ "${as_me:-configure}"
+#include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -816,6 +816,32 @@
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
+dnl ----------------
+dnl Check for getopt's variables which are commonly defined in stdlib.h,
+dnl unistd.h or (nonstandard) in getopt.h
+AC_DEFUN([CF_GETOPT_HEADER],
+[
+AC_HAVE_HEADERS(unistd.h getopt.h)
+AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+cf_cv_getopt_header=none
+for cf_header in stdio.h stdlib.h unistd.h getopt.h
+do
+AC_TRY_COMPILE([
+#include <$cf_header>],
+[int x = optind; char *y = optarg; (void)x; (void)y],
+[cf_cv_getopt_header=$cf_header
+ break])
+done
+])
+if test "$cf_cv_getopt_header" != none ; then
+	AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
+fi
+if test "$cf_cv_getopt_header" = getopt.h ; then
+	AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
@@ -927,33 +953,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
-dnl ----------------
-dnl Check for getopt's variables which are commonly defined in stdlib.h,
-dnl unistd.h or (nonstandard) in getopt.h
-AC_DEFUN([CF_GETOPT_HEADER],
-[
-AC_HAVE_HEADERS(unistd.h getopt.h)
-AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
-cf_cv_getopt_header=none
-for cf_header in stdio.h stdlib.h unistd.h getopt.h
-do
-AC_TRY_COMPILE([
-#include <$cf_header>],
-[int x = optind; char *y = optarg; (void)x; (void)y],
-[cf_cv_getopt_header=$cf_header
- break])
-done
-])
-if test "$cf_cv_getopt_header" != none ; then
-	AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
-fi
-if test "$cf_cv_getopt_header" = getopt.h ; then
-	AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59
+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
@@ -979,7 +979,7 @@
 		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"
@@ -1123,7 +1123,7 @@
 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: 11 updated: 2021/01/01 13:31:04
+dnl CF_MKSTEMP version: 12 updated: 2023/01/05 17:53:11
 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).
@@ -1134,14 +1134,8 @@
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
 rm -rf ./conftest*
 AC_TRY_RUN([
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
+$ac_includes_default
+
 int main(void)
 {
 	char *tmpl = "conftestXXXXXX";
@@ -1309,7 +1303,7 @@
 fi
 ])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
@@ -1340,7 +1334,7 @@
 	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
@@ -1359,7 +1353,7 @@
 	 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
@@ -1370,7 +1364,7 @@
 	 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"
@@ -1432,6 +1426,20 @@
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PROG_GPERF version: 1 updated: 2023/02/22 19:29:02
+dnl -------------
+dnl Check if gpref is available, for generating symbol lookup functions.
+AC_DEFUN([CF_PROG_GPERF],[
+AC_PATH_PROG(GPERF_PATH,gperf,no)
+if test "x$GPERF_PATH" = xno
+then
+	GPERF_NOTE="#"
+else
+	GPERF_NOTE=
+fi
+AC_SUBST(GPERF_NOTE)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
 dnl -------------
 dnl Check if groff is available, for cases (such as html output) where nroff
@@ -1791,7 +1799,7 @@
 	[USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 62 updated: 2022/10/02 19:55:56
+dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25
 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,
@@ -1814,9 +1822,6 @@
 (aix[[4-7]]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(msys)
-	cf_XOPEN_SOURCE=600
-	;;
 (darwin[[0-8]].*)
 	cf_xopen_source="-D_APPLE_C_SOURCE"
 	;;
@@ -1842,7 +1847,7 @@
 	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)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -1894,10 +1899,12 @@
 	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	# Some of these niche implementations use copy/paste, double-check...
-	CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
-	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"])
+	if test "$cf_cv_xopen_source" != no ; then
+		CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+		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"])
+	fi
 	;;
 esac
 
@@ -1912,7 +1919,7 @@
 	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])
@@ -1921,7 +1928,7 @@
 	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])
@@ -1999,22 +2006,20 @@
 rm -f y.tab.c
 ])dnl
 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 -Nru cproto-4.7u/CHANGES cproto-4.7v/CHANGES
--- cproto-4.7u/CHANGES	2022-10-16 23:30:41.000000000 +0000
+++ cproto-4.7v/CHANGES	2023-02-28 11:36:49.000000000 +0000
@@ -1,4 +1,9 @@
--- $Id: CHANGES,v 4.70 2022/10/16 23:30:41 tom Exp $
+-- $Id: CHANGES,v 4.75 2023/02/28 11:36:49 tom Exp $
+
+2023/02/28 (4.7v)
+- add c99 keywords for types and qualifiers.
+- use gperf for lookup of known types/qualifiers in type_of_name()
+- improve configure script checks, reducing warnings
 
 2022/10/16 (4.7u)
 - change test-scripts to use grep rather than grep.
diff -Nru cproto-4.7u/configure cproto-4.7v/configure
--- cproto-4.7u/configure	2022-10-16 19:01:37.000000000 +0000
+++ cproto-4.7v/configure	2023-02-23 00:30:52.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
-# From configure.in Revision: 4.26 .
+# From configure.in Revision: 4.28 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20221009.
+# Generated by Autoconf 2.52.20230114.
 #
-# Copyright 2003-2021,2022	Thomas E. Dickey
+# Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -108,6 +108,42 @@
 : "${ac_max_here_lines=38}"
 
 ac_unique_file="cproto.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -725,7 +761,7 @@
 if "$ac_init_version"; then
   cat <<\EOF
 
-Copyright 2003-2021,2022	Thomas E. Dickey
+Copyright 2003-2022,2023	Thomas E. Dickey
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -739,7 +775,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20221009.  Invocation command line was
+generated by GNU Autoconf 2.52.20230114.  Invocation command line was
 
   $ $0 $@
 
@@ -863,7 +899,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:866: loading site script $ac_site_file" >&5
+    { echo "$as_me:902: 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"
@@ -874,7 +910,7 @@
   # 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:877: loading cache $cache_file" >&5
+    { echo "$as_me:913: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -882,7 +918,7 @@
     esac
   fi
 else
-  { echo "$as_me:885: creating cache $cache_file" >&5
+  { echo "$as_me:921: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -898,21 +934,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:901: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:937: 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:905: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:941: 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:911: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:947: 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:913:   former value:  $ac_old_val" >&5
+        { echo "$as_me:949:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:915:   current value: $ac_new_val" >&5
+        { echo "$as_me:951:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -931,9 +967,9 @@
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:934: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:970: 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:936: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:972: 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
@@ -962,10 +998,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:965: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1001: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:968: \$? = $ac_status" >&5
+  echo "$as_me:1004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -993,7 +1029,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:996: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1032: 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
@@ -1003,11 +1039,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1006: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1042: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1010: checking build system type" >&5
+echo "$as_me:1046: 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
@@ -1016,16 +1052,16 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1019: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1055: 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:1023: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1059: 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:1028: result: $ac_cv_build" >&5
+echo "$as_me:1064: 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/'`
@@ -1033,7 +1069,7 @@
 build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1036: checking host system type" >&5
+	echo "$as_me:1072: 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
@@ -1042,12 +1078,12 @@
 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:1045: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1081: 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:1050: result: $ac_cv_host" >&5
+echo "$as_me:1086: 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/'`
@@ -1073,13 +1109,13 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1076: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1112: 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:1080: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1116: 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:1082: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1118: 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
@@ -1095,7 +1131,7 @@
 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:1098: checking for $ac_word" >&5
+echo "$as_me:1134: 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
@@ -1110,7 +1146,7 @@
   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:1113: found $ac_dir/$ac_word" >&5
+echo "$as_me:1149: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1118,10 +1154,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1121: result: $CC" >&5
+  echo "$as_me:1157: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1124: result: no" >&5
+  echo "$as_me:1160: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1130,7 +1166,7 @@
   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:1133: checking for $ac_word" >&5
+echo "$as_me:1169: 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
@@ -1145,7 +1181,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1148: found $ac_dir/$ac_word" >&5
+echo "$as_me:1184: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1153,10 +1189,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1156: result: $ac_ct_CC" >&5
+  echo "$as_me:1192: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1159: result: no" >&5
+  echo "$as_me:1195: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1169,7 +1205,7 @@
   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:1172: checking for $ac_word" >&5
+echo "$as_me:1208: 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
@@ -1184,7 +1220,7 @@
   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:1187: found $ac_dir/$ac_word" >&5
+echo "$as_me:1223: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1192,10 +1228,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1195: result: $CC" >&5
+  echo "$as_me:1231: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1198: result: no" >&5
+  echo "$as_me:1234: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1204,7 +1240,7 @@
   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:1207: checking for $ac_word" >&5
+echo "$as_me:1243: 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
@@ -1219,7 +1255,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1222: found $ac_dir/$ac_word" >&5
+echo "$as_me:1258: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1227,10 +1263,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1230: result: $ac_ct_CC" >&5
+  echo "$as_me:1266: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1233: result: no" >&5
+  echo "$as_me:1269: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1243,7 +1279,7 @@
 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:1246: checking for $ac_word" >&5
+echo "$as_me:1282: 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
@@ -1263,7 +1299,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1266: found $ac_dir/$ac_word" >&5
+echo "$as_me:1302: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1285,10 +1321,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1288: result: $CC" >&5
+  echo "$as_me:1324: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1291: result: no" >&5
+  echo "$as_me:1327: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1299,7 +1335,7 @@
   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:1302: checking for $ac_word" >&5
+echo "$as_me:1338: 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
@@ -1314,7 +1350,7 @@
   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:1317: found $ac_dir/$ac_word" >&5
+echo "$as_me:1353: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1322,10 +1358,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1325: result: $CC" >&5
+  echo "$as_me:1361: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1328: result: no" >&5
+  echo "$as_me:1364: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1338,7 +1374,7 @@
 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:1341: checking for $ac_word" >&5
+echo "$as_me:1377: 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
@@ -1353,7 +1389,7 @@
   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:1356: found $ac_dir/$ac_word" >&5
+echo "$as_me:1392: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1361,10 +1397,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1364: result: $ac_ct_CC" >&5
+  echo "$as_me:1400: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1367: result: no" >&5
+  echo "$as_me:1403: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1376,32 +1412,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1379: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1415: 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:1384:" \
+echo "$as_me:1420:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1387: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1423: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1390: \$? = $ac_status" >&5
+  echo "$as_me:1426: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1392: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1428: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1395: \$? = $ac_status" >&5
+  echo "$as_me:1431: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1397: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1433: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1400: \$? = $ac_status" >&5
+  echo "$as_me:1436: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1404 "configure"
+#line 1440 "configure"
 #include "confdefs.h"
 
 int
@@ -1417,13 +1453,13 @@
 # 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:1420: checking for C compiler default output" >&5
+echo "$as_me:1456: 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:1423: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1459: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1426: \$? = $ac_status" >&5
+  echo "$as_me:1462: \$? = $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
@@ -1446,34 +1482,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1449: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1485: 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:1455: result: $ac_file" >&5
+echo "$as_me:1491: 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:1460: checking whether the C compiler works" >&5
+echo "$as_me:1496: 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:1466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1469: \$? = $ac_status" >&5
+  echo "$as_me:1505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1476: error: cannot run C compiled programs.
+	{ { echo "$as_me:1512: 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;}
@@ -1481,24 +1517,24 @@
     fi
   fi
 fi
-echo "$as_me:1484: result: yes" >&5
+echo "$as_me:1520: 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:1491: checking whether we are cross compiling" >&5
+echo "$as_me:1527: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1493: result: $cross_compiling" >&5
+echo "$as_me:1529: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1496: checking for executable suffix" >&5
+echo "$as_me:1532: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1501: \$? = $ac_status" >&5
+  echo "$as_me:1537: \$? = $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
@@ -1514,25 +1550,25 @@
   esac
 done
 else
-  { { echo "$as_me:1517: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1553: 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:1523: result: $ac_cv_exeext" >&5
+echo "$as_me:1559: 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:1529: checking for object suffix" >&5
+echo "$as_me:1565: 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 1535 "configure"
+#line 1571 "configure"
 #include "confdefs.h"
 
 int
@@ -1544,10 +1580,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1550: \$? = $ac_status" >&5
+  echo "$as_me:1586: \$? = $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
@@ -1559,24 +1595,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1562: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1598: 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:1569: result: $ac_cv_objext" >&5
+echo "$as_me:1605: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1573: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1609: 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 1579 "configure"
+#line 1615 "configure"
 #include "confdefs.h"
 
 int
@@ -1591,16 +1627,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1597: \$? = $ac_status" >&5
+  echo "$as_me:1633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1603: \$? = $ac_status" >&5
+  echo "$as_me:1639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1612,19 +1648,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1615: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1651: 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:1621: checking whether $CC accepts -g" >&5
+echo "$as_me:1657: 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 1627 "configure"
+#line 1663 "configure"
 #include "confdefs.h"
 
 int
@@ -1636,16 +1672,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1642: \$? = $ac_status" >&5
+  echo "$as_me:1678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1648: \$? = $ac_status" >&5
+  echo "$as_me:1684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1655,7 +1691,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1658: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1694: 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
@@ -1682,16 +1718,16 @@
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1688: \$? = $ac_status" >&5
+  echo "$as_me:1724: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1694: \$? = $ac_status" >&5
+  echo "$as_me:1730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1703,7 +1739,7 @@
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1706 "configure"
+#line 1742 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1716,16 +1752,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1722: \$? = $ac_status" >&5
+  echo "$as_me:1758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1728: \$? = $ac_status" >&5
+  echo "$as_me:1764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1735,7 +1771,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1738 "configure"
+#line 1774 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1747,16 +1783,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1753: \$? = $ac_status" >&5
+  echo "$as_me:1789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1759: \$? = $ac_status" >&5
+  echo "$as_me:1795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1786,11 +1822,11 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1789: checking version of $CC" >&5
+	echo "$as_me:1825: 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.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1793: result: $GCC_VERSION" >&5
+	echo "$as_me:1829: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1799,12 +1835,12 @@
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1802: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1838: 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 1807 "configure"
+#line 1843 "configure"
 #include "confdefs.h"
 
 int
@@ -1813,7 +1849,7 @@
 
 #ifdef __INTEL_COMPILER
 #else
-make an error
+#error __INTEL_COMPILER is not defined
 #endif
 
   ;
@@ -1821,16 +1857,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1827: \$? = $ac_status" >&5
+  echo "$as_me:1863: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1833: \$? = $ac_status" >&5
+  echo "$as_me:1869: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -1841,7 +1877,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:1844: result: $INTEL_COMPILER" >&5
+		echo "$as_me:1880: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -1850,11 +1886,11 @@
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:1853: checking if this is really Clang C compiler" >&5
+	echo "$as_me:1889: 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 1857 "configure"
+#line 1893 "configure"
 #include "confdefs.h"
 
 int
@@ -1863,7 +1899,7 @@
 
 #ifdef __clang__
 #else
-make an error
+#error __clang__ is not defined
 #endif
 
   ;
@@ -1871,16 +1907,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1877: \$? = $ac_status" >&5
+  echo "$as_me:1913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1883: \$? = $ac_status" >&5
+  echo "$as_me:1919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -1890,7 +1926,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:1893: result: $CLANG_COMPILER" >&5
+	echo "$as_me:1929: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -1899,30 +1935,30 @@
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:1902: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:1938: 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:1909: checking version of $CC" >&5
+	echo "$as_me:1945: 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:1913: result: $CLANG_VERSION" >&5
+	echo "$as_me:1949: 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:1920: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:1956: 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 1925 "configure"
+#line 1961 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -1936,16 +1972,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:1939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1942: \$? = $ac_status" >&5
+  echo "$as_me:1978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:1945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1948: \$? = $ac_status" >&5
+  echo "$as_me:1984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -1956,13 +1992,13 @@
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:1959: result: $cf_clang_optok" >&5
+		echo "$as_me:1995: 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}:1965: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2001: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -1971,7 +2007,7 @@
 	done
 fi
 
-echo "$as_me:1974: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2010: 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
@@ -1979,7 +2015,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1982 "configure"
+#line 2018 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -1988,9 +2024,7 @@
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
+static char *e (char **p, int i)
 {
   return p[i];
 }
@@ -2028,16 +2062,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2034: \$? = $ac_status" >&5
+  echo "$as_me:2068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2040: \$? = $ac_status" >&5
+  echo "$as_me:2074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2054,10 +2088,10 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2057: result: none needed" >&5
+    echo "$as_me:2091: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2060: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2094: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2065,13 +2099,13 @@
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2068: checking \$CFLAGS variable" >&5
+echo "$as_me:2102: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2072: result: broken" >&5
+	echo "$as_me:2106: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2074: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2108: 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=
@@ -2179,22 +2213,22 @@
 	done
 	;;
 (*)
-	echo "$as_me:2182: result: ok" >&5
+	echo "$as_me:2216: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2187: checking \$CC variable" >&5
+echo "$as_me:2221: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2191: result: broken" >&5
+	echo "$as_me:2225: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2193: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2227: 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
@@ -2307,19 +2341,19 @@
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2310: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2344: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2314: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2348: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2318: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2352: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2322: result: ok" >&5
+	echo "$as_me:2356: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2328,7 +2362,7 @@
 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:2331: checking for $ac_word" >&5
+echo "$as_me:2365: 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
@@ -2343,7 +2377,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2346: found $ac_dir/$ac_word" >&5
+echo "$as_me:2380: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2351,10 +2385,10 @@
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2354: result: $GREP" >&5
+  echo "$as_me:2388: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2357: result: no" >&5
+  echo "$as_me:2391: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2362,7 +2396,7 @@
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2365: checking for egrep" >&5
+echo "$as_me:2399: 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
@@ -2374,7 +2408,7 @@
 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:2377: checking for $ac_word" >&5
+echo "$as_me:2411: 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
@@ -2391,7 +2425,7 @@
   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:2394: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2428: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2402,10 +2436,10 @@
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2405: result: $EGREP" >&5
+  echo "$as_me:2439: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2408: result: no" >&5
+  echo "$as_me:2442: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2413,12 +2447,12 @@
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2416: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2450: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2421: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2455: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2428,7 +2462,7 @@
 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:2431: checking how to run the C preprocessor" >&5
+echo "$as_me:2465: 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
@@ -2449,18 +2483,18 @@
   # 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 2452 "configure"
+#line 2486 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2457: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2491: \"$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:2463: \$? = $ac_status" >&5
+  echo "$as_me:2497: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2483,17 +2517,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2486 "configure"
+#line 2520 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2490: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2524: \"$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:2496: \$? = $ac_status" >&5
+  echo "$as_me:2530: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2530,7 +2564,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2533: result: $CPP" >&5
+echo "$as_me:2567: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2540,18 +2574,18 @@
   # 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 2543 "configure"
+#line 2577 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2548: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2582: \"$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:2554: \$? = $ac_status" >&5
+  echo "$as_me:2588: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2574,17 +2608,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2577 "configure"
+#line 2611 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2615: \"$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:2587: \$? = $ac_status" >&5
+  echo "$as_me:2621: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2612,7 +2646,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2615: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2649: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2624,7 +2658,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:2627: checking if preprocessor ($CPP) has -C comment-option" >&5
+echo "$as_me:2661: checking if preprocessor ($CPP) has -C comment-option" >&5
 echo $ECHO_N "checking if preprocessor ($CPP) has -C comment-option... $ECHO_C" >&6
 if test "${cf_cv_cpp_does_comments+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2644,7 +2678,7 @@
 fi
 
 fi
-echo "$as_me:2647: result: $cf_cv_cpp_does_comments" >&5
+echo "$as_me:2681: result: $cf_cv_cpp_does_comments" >&5
 echo "${ECHO_T}$cf_cv_cpp_does_comments" >&6
 test "$cf_cv_cpp_does_comments" = yes && cat >>confdefs.h <<\EOF
 #define CPP_DOES_COMMENTS 1
@@ -2654,7 +2688,7 @@
 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:2657: checking for $ac_word" >&5
+echo "$as_me:2691: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2669,7 +2703,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:2672: found $ac_dir/$ac_word" >&5
+echo "$as_me:2706: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2677,10 +2711,10 @@
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:2680: result: $LEX" >&5
+  echo "$as_me:2714: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:2683: result: no" >&5
+  echo "$as_me:2717: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2690,7 +2724,7 @@
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:2693: checking for yywrap in -lfl" >&5
+  echo "$as_me:2727: checking for yywrap in -lfl" >&5
 echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
 if test "${ac_cv_lib_fl_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2698,7 +2732,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2701 "configure"
+#line 2735 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2717,16 +2751,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2723: \$? = $ac_status" >&5
+  echo "$as_me:2757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2729: \$? = $ac_status" >&5
+  echo "$as_me:2763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_fl_yywrap=yes
 else
@@ -2737,12 +2771,12 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2740: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:2774: result: $ac_cv_lib_fl_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
 if test "$ac_cv_lib_fl_yywrap" = yes; then
   LEXLIB="-lfl"
 else
-  echo "$as_me:2745: checking for yywrap in -ll" >&5
+  echo "$as_me:2779: checking for yywrap in -ll" >&5
 echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
 if test "${ac_cv_lib_l_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2750,7 +2784,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2753 "configure"
+#line 2787 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2769,16 +2803,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2775: \$? = $ac_status" >&5
+  echo "$as_me:2809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2781: \$? = $ac_status" >&5
+  echo "$as_me:2815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_l_yywrap=yes
 else
@@ -2789,7 +2823,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2792: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:2826: result: $ac_cv_lib_l_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
 if test "$ac_cv_lib_l_yywrap" = yes; then
   LEXLIB="-ll"
@@ -2800,7 +2834,7 @@
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:2803: checking lex output file root" >&5
+  echo "$as_me:2837: checking lex output file root" >&5
 echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_root+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2814,16 +2848,16 @@
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:2817: error: cannot find output from $LEX; giving up" >&5
+  { { echo "$as_me:2851: error: cannot find output from $LEX; giving up" >&5
 echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-echo "$as_me:2822: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:2856: result: $ac_cv_prog_lex_root" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:2826: checking whether yytext is a pointer" >&5
+echo "$as_me:2860: checking whether yytext is a pointer" >&5
 echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2839,16 +2873,16 @@
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2845: \$? = $ac_status" >&5
+  echo "$as_me:2879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2851: \$? = $ac_status" >&5
+  echo "$as_me:2885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -2860,7 +2894,7 @@
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:2863: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:2897: result: $ac_cv_prog_lex_yytext_pointer" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
@@ -2871,7 +2905,7 @@
 fi
 
 fi
-echo "$as_me:2874: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2908: 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
@@ -2891,11 +2925,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2894: result: yes" >&5
+  echo "$as_me:2928: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2898: result: no" >&5
+  echo "$as_me:2932: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2904,7 +2938,7 @@
 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:2907: checking for $ac_word" >&5
+echo "$as_me:2941: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2919,7 +2953,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:2922: found $ac_dir/$ac_word" >&5
+echo "$as_me:2956: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2927,10 +2961,10 @@
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2930: result: $YACC" >&5
+  echo "$as_me:2964: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2933: result: no" >&5
+  echo "$as_me:2967: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2950,7 +2984,7 @@
 # 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:2953: checking for a BSD compatible install" >&5
+echo "$as_me:2987: 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
@@ -2999,7 +3033,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3002: result: $INSTALL" >&5
+echo "$as_me:3036: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3010,7 +3044,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:3013: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3047: 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
@@ -3037,7 +3071,7 @@
 fi
 
 fi
-echo "$as_me:3040: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3074: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3048,7 +3082,7 @@
 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:3051: checking for $ac_word" >&5
+echo "$as_me:3085: 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
@@ -3063,7 +3097,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3066: found $ac_dir/$ac_word" >&5
+echo "$as_me:3100: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3071,10 +3105,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3074: result: $CTAGS" >&5
+  echo "$as_me:3108: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3077: result: no" >&5
+  echo "$as_me:3111: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3085,7 +3119,7 @@
 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:3088: checking for $ac_word" >&5
+echo "$as_me:3122: 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
@@ -3100,7 +3134,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3103: found $ac_dir/$ac_word" >&5
+echo "$as_me:3137: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3108,10 +3142,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3111: result: $ETAGS" >&5
+  echo "$as_me:3145: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3114: result: no" >&5
+  echo "$as_me:3148: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3120,7 +3154,7 @@
 
 # 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:3123: checking for $ac_word" >&5
+echo "$as_me:3157: 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
@@ -3135,7 +3169,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3138: found $ac_dir/$ac_word" >&5
+echo "$as_me:3172: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3144,17 +3178,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3147: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3181: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3150: result: no" >&5
+  echo "$as_me:3184: 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:3157: checking for $ac_word" >&5
+echo "$as_me:3191: 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
@@ -3169,7 +3203,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3172: found $ac_dir/$ac_word" >&5
+echo "$as_me:3206: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3178,10 +3212,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3181: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3215: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3184: result: no" >&5
+  echo "$as_me:3218: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3205,7 +3239,7 @@
 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:3208: checking for $ac_word" >&5
+echo "$as_me:3242: 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
@@ -3220,7 +3254,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3223: found $ac_dir/$ac_word" >&5
+echo "$as_me:3257: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3228,10 +3262,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3231: result: $LINT" >&5
+  echo "$as_me:3265: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3234: result: no" >&5
+  echo "$as_me:3268: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3244,9 +3278,54 @@
 	;;
 esac
 
+# Extract the first word of "gperf", so it can be a program name with args.
+set dummy gperf; ac_word=$2
+echo "$as_me:3283: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GPERF_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GPERF_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GPERF_PATH="$GPERF_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_GPERF_PATH="$ac_dir/$ac_word"
+   echo "$as_me:3300: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_GPERF_PATH" && ac_cv_path_GPERF_PATH="no"
+  ;;
+esac
+fi
+GPERF_PATH=$ac_cv_path_GPERF_PATH
+
+if test -n "$GPERF_PATH"; then
+  echo "$as_me:3312: result: $GPERF_PATH" >&5
+echo "${ECHO_T}$GPERF_PATH" >&6
+else
+  echo "$as_me:3315: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "x$GPERF_PATH" = xno
+then
+	GPERF_NOTE="#"
+else
+	GPERF_NOTE=
+fi
+
 	case "x$LEX" in
 	(x|x:|xno|xnone)
-		{ { echo "$as_me:3249: error: LEX: no suitable program was found" >&5
+		{ { echo "$as_me:3328: error: LEX: no suitable program was found" >&5
 echo "$as_me: error: LEX: no suitable program was found" >&2;}
    { (exit 1); exit 1; }; }
 		;;
@@ -3257,7 +3336,7 @@
 
 	case "x$YACC" in
 	(x|x:|xno|xnone)
-		{ { echo "$as_me:3260: error: YACC: no suitable program was found" >&5
+		{ { echo "$as_me:3339: error: YACC: no suitable program was found" >&5
 echo "$as_me: error: YACC: no suitable program was found" >&2;}
    { (exit 1); exit 1; }; }
 		;;
@@ -3266,14 +3345,14 @@
 		;;
 	esac
 
-echo "$as_me:3269: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:3348: 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 3276 "configure"
+#line 3355 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3292,16 +3371,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3298: \$? = $ac_status" >&5
+  echo "$as_me:3377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3304: \$? = $ac_status" >&5
+  echo "$as_me:3383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -3312,7 +3391,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3315: result: $cf_cv_posix_visible" >&5
+echo "$as_me:3394: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -3325,9 +3404,6 @@
 (aix[4-7]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(msys)
-	cf_XOPEN_SOURCE=600
-	;;
 (darwin[0-8].*)
 	cf_xopen_source="-D_APPLE_C_SOURCE"
 	;;
@@ -3353,18 +3429,18 @@
 	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)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:3360: checking if this is the GNU C library" >&5
+echo "$as_me:3436: checking if this is the GNU C library" >&5
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3367 "configure"
+#line 3443 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3383,16 +3459,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3389: \$? = $ac_status" >&5
+  echo "$as_me:3465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3395: \$? = $ac_status" >&5
+  echo "$as_me:3471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -3403,7 +3479,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3406: result: $cf_cv_gnu_library" >&5
+echo "$as_me:3482: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -3411,7 +3487,7 @@
 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
 	# was changed to help a little.  newlib incorporated the change about 4
 	# years later.
-	echo "$as_me:3414: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:3490: checking if _DEFAULT_SOURCE can be used as a basis" >&5
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3423,7 +3499,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3426 "configure"
+#line 3502 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3442,16 +3518,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3448: \$? = $ac_status" >&5
+  echo "$as_me:3524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3454: \$? = $ac_status" >&5
+  echo "$as_me:3530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -3463,12 +3539,12 @@
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:3466: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:3542: result: $cf_cv_gnu_library_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
 	if test "x$cf_cv_gnu_library_219" = xyes; then
 		cf_save="$CPPFLAGS"
-		echo "$as_me:3471: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:3547: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3573,7 +3649,7 @@
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3576 "configure"
+#line 3652 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -3593,16 +3669,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3599: \$? = $ac_status" >&5
+  echo "$as_me:3675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3605: \$? = $ac_status" >&5
+  echo "$as_me:3681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -3613,7 +3689,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3616: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:3692: result: $cf_cv_gnu_dftsrc_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
 	else
@@ -3622,14 +3698,14 @@
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:3625: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:3701: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3632 "configure"
+#line 3708 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3644,16 +3720,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3650: \$? = $ac_status" >&5
+  echo "$as_me:3726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3656: \$? = $ac_status" >&5
+  echo "$as_me:3732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3760,7 +3836,7 @@
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3763 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3775,16 +3851,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3781: \$? = $ac_status" >&5
+  echo "$as_me:3857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3787: \$? = $ac_status" >&5
+  echo "$as_me:3863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3799,12 +3875,12 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3802: result: $cf_cv_gnu_source" >&5
+echo "$as_me:3878: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 		if test "$cf_cv_gnu_source" = yes
 		then
-		echo "$as_me:3807: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:3883: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3814,7 +3890,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3817 "configure"
+#line 3893 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3829,16 +3905,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3835: \$? = $ac_status" >&5
+  echo "$as_me:3911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3841: \$? = $ac_status" >&5
+  echo "$as_me:3917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -3849,7 +3925,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3852: result: $cf_cv_default_source" >&5
+echo "$as_me:3928: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -3886,16 +3962,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3889: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3965: 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}:3895: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3971: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3898 "configure"
+#line 3974 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3903,23 +3979,23 @@
 {
 
 #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:3913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3916: \$? = $ac_status" >&5
+  echo "$as_me:3992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3922: \$? = $ac_status" >&5
+  echo "$as_me:3998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3940,7 +4016,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3943 "configure"
+#line 4019 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3948,23 +4024,23 @@
 {
 
 #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:3958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3961: \$? = $ac_status" >&5
+  echo "$as_me:4037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3967: \$? = $ac_status" >&5
+  echo "$as_me:4043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3975,7 +4051,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:3978: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4054: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -3983,10 +4059,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:3986: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4062: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3989 "configure"
+#line 4065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3994,23 +4070,23 @@
 {
 
 #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:4004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4007: \$? = $ac_status" >&5
+  echo "$as_me:4083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4013: \$? = $ac_status" >&5
+  echo "$as_me:4089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4026,7 +4102,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4029: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4105: 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
@@ -4143,7 +4219,7 @@
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:4146: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:4222: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -4175,26 +4251,24 @@
 	;;
 (*)
 
-echo "$as_me:4178: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4254: 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 4185 "configure"
+#line 4261 "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
 
   ;
@@ -4202,16 +4276,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4208: \$? = $ac_status" >&5
+  echo "$as_me:4282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4214: \$? = $ac_status" >&5
+  echo "$as_me:4288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4223,19 +4297,17 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4226 "configure"
+#line 4300 "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
 
   ;
@@ -4243,16 +4315,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4249: \$? = $ac_status" >&5
+  echo "$as_me:4321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4255: \$? = $ac_status" >&5
+  echo "$as_me:4327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4267,7 +4339,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4270: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4342: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4427,16 +4499,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4430: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4502: 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}:4436: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4508: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4439 "configure"
+#line 4511 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4444,23 +4516,23 @@
 {
 
 #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:4454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4457: \$? = $ac_status" >&5
+  echo "$as_me:4529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4463: \$? = $ac_status" >&5
+  echo "$as_me:4535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4481,7 +4553,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4484 "configure"
+#line 4556 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4489,23 +4561,23 @@
 {
 
 #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:4499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4502: \$? = $ac_status" >&5
+  echo "$as_me:4574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4508: \$? = $ac_status" >&5
+  echo "$as_me:4580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4516,7 +4588,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4519: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4591: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4524,10 +4596,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4527: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4599: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4530 "configure"
+#line 4602 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4535,23 +4607,23 @@
 {
 
 #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:4545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4617: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4548: \$? = $ac_status" >&5
+  echo "$as_me:4620: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4554: \$? = $ac_status" >&5
+  echo "$as_me:4626: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4567,7 +4639,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4570: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4642: 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
@@ -4677,24 +4749,23 @@
 fi # cf_cv_posix_visible
 
 	# Some of these niche implementations use copy/paste, double-check...
-	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 inteferes" 1>&6
 
-echo "${as_me:-configure}:4682: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:4755: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
 
-	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4685 "configure"
+		cat >"conftest.$ac_ext" <<_ACEOF
+#line 4758 "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
 
   ;
@@ -4702,27 +4773,28 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4708: \$? = $ac_status" >&5
+  echo "$as_me:4779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4714: \$? = $ac_status" >&5
+  echo "$as_me:4785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ echo "$as_me:4721: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:4792: 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"
+			CPPFLAGS="$cf_save_xopen_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+	fi
 	;;
 esac
 
@@ -4740,7 +4812,7 @@
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:4743: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:4815: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -4752,7 +4824,7 @@
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:4755: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:4827: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -4840,7 +4912,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:4843: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4915: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -4850,7 +4922,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:4853: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4925: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -4860,7 +4932,7 @@
 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}:4863: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4935: 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"
@@ -4872,10 +4944,10 @@
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:4875: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:4947: 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 4878 "configure"
+#line 4950 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4883,23 +4955,23 @@
 {
 
 #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:4893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4896: \$? = $ac_status" >&5
+  echo "$as_me:4968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4902: \$? = $ac_status" >&5
+  echo "$as_me:4974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -4908,12 +4980,12 @@
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:4911: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:4983: 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 4916 "configure"
+#line 4988 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4921,23 +4993,23 @@
 {
 
 #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:4931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4934: \$? = $ac_status" >&5
+  echo "$as_me:5006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4940: \$? = $ac_status" >&5
+  echo "$as_me:5012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -4948,31 +5020,29 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:4951: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:5023: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:4956: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5028: 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 4963 "configure"
+#line 5035 "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
 
   ;
@@ -4980,16 +5050,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4986: \$? = $ac_status" >&5
+  echo "$as_me:5056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4992: \$? = $ac_status" >&5
+  echo "$as_me:5062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5001,19 +5071,17 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5004 "configure"
+#line 5074 "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
 
   ;
@@ -5021,16 +5089,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5027: \$? = $ac_status" >&5
+  echo "$as_me:5095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5033: \$? = $ac_status" >&5
+  echo "$as_me:5101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -5045,7 +5113,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5048: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5116: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -5192,7 +5260,7 @@
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:5195: checking for fgrep" >&5
+echo "$as_me:5263: 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
@@ -5204,7 +5272,7 @@
 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:5207: checking for $ac_word" >&5
+echo "$as_me:5275: 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
@@ -5221,7 +5289,7 @@
   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:5224: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5292: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5232,10 +5300,10 @@
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:5235: result: $FGREP" >&5
+  echo "$as_me:5303: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:5238: result: no" >&5
+  echo "$as_me:5306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5243,16 +5311,16 @@
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5246: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5314: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:5251: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:5319: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:5255: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5323: 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.
@@ -5269,21 +5337,20 @@
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5272: result: $enable_stdnoreturn" >&5
+echo "$as_me:5340: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:5276: checking for C11 _Noreturn feature" >&5
+echo "$as_me:5344: 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 5282 "configure"
+#line 5350 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+$ac_includes_default
 #include <stdnoreturn.h>
 static _Noreturn void giveup(void) { exit(0); }
 
@@ -5296,16 +5363,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5302: \$? = $ac_status" >&5
+  echo "$as_me:5369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5308: \$? = $ac_status" >&5
+  echo "$as_me:5375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5316,7 +5383,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5319: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5386: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5372,16 +5439,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5375: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5442: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5380: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5447: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5384: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5451: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5420,16 +5487,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5423: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5490: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5428: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5495: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5432: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5499: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5468,23 +5535,23 @@
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5471: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5538: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5476: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5543: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5480: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5547: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:5487: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5554: 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.
@@ -5501,7 +5568,7 @@
 	enable_warnings=no
 
 fi;
-echo "$as_me:5504: result: $enable_warnings" >&5
+echo "$as_me:5571: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -5524,10 +5591,11 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:5527: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:5594: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 5530 "${as_me:-configure}"
+#line 5597 "${as_me:-configure}"
+#include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -5576,12 +5644,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:5579: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5582: \$? = $ac_status" >&5
+  echo "$as_me:5650: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5584: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:5652: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -5642,7 +5710,7 @@
 
 if test "x$have_x" = xyes; then echo "skipping X-const check"; fi
 cat > "conftest.$ac_ext" <<EOF
-#line 5645 "${as_me:-configure}"
+#line 5713 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -5658,7 +5726,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:5661: checking for $CC warning options..." >&5
+	{ echo "$as_me:5729: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -5674,12 +5742,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5677: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5680: \$? = $ac_status" >&5
+  echo "$as_me:5748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5682: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5750: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -5687,7 +5755,7 @@
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:5690: checking for $CC warning options..." >&5
+	{ echo "$as_me:5758: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -5710,12 +5778,12 @@
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5713: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5781: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5716: \$? = $ac_status" >&5
+  echo "$as_me:5784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5718: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5786: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -5723,7 +5791,7 @@
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5726: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5794: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5733,7 +5801,7 @@
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5736: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5804: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5750,7 +5818,7 @@
 
 fi
 
-echo "$as_me:5753: checking if you want to see long compiling messages" >&5
+echo "$as_me:5821: 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.
@@ -5784,10 +5852,10 @@
 	ECHO_CC=''
 
 fi;
-echo "$as_me:5787: result: $enableval" >&5
+echo "$as_me:5855: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:5790: checking if you want to enable lint-library (llib) support" >&5
+echo "$as_me:5858: checking if you want to enable lint-library (llib) support" >&5
 echo $ECHO_N "checking if you want to enable lint-library (llib) support... $ECHO_C" >&6
 
 # Check whether --enable-llib or --disable-llib was given.
@@ -5798,7 +5866,7 @@
   cf_enable_llib=yes
 fi;
 
-echo "$as_me:5801: result: $cf_enable_llib" >&5
+echo "$as_me:5869: result: $cf_enable_llib" >&5
 echo "${ECHO_T}$cf_enable_llib" >&6;
 if test "$cf_enable_llib" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -5809,13 +5877,13 @@
 
 ###	extra things that we'll substitute in the makefile
 
-echo "$as_me:5812: checking for an ANSI C-conforming const" >&5
+echo "$as_me:5880: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5818 "configure"
+#line 5886 "configure"
 #include "confdefs.h"
 
 int
@@ -5873,16 +5941,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5879: \$? = $ac_status" >&5
+  echo "$as_me:5947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5885: \$? = $ac_status" >&5
+  echo "$as_me:5953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
@@ -5892,7 +5960,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5895: result: $ac_cv_c_const" >&5
+echo "$as_me:5963: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -5902,13 +5970,13 @@
 
 fi
 
-echo "$as_me:5905: checking for ANSI C header files" >&5
+echo "$as_me:5973: 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 5911 "configure"
+#line 5979 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5916,13 +5984,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5919: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5987: \"$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:5925: \$? = $ac_status" >&5
+  echo "$as_me:5993: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5944,7 +6012,7 @@
 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 5947 "configure"
+#line 6015 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5962,7 +6030,7 @@
 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 5965 "configure"
+#line 6033 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5983,7 +6051,7 @@
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5986 "configure"
+#line 6054 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6009,15 +6077,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6015: \$? = $ac_status" >&5
+  echo "$as_me:6083: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6020: \$? = $ac_status" >&5
+  echo "$as_me:6088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -6030,7 +6098,7 @@
 fi
 fi
 fi
-echo "$as_me:6033: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6101: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6040,45 +6108,44 @@
 
 fi
 
-for ac_header in stdlib.h unistd.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6046: checking for $ac_header" >&5
+echo "$as_me:6117: 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 6052 "configure"
+#line 6123 "configure"
 #include "confdefs.h"
+$ac_includes_default
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6056: \"$ac_cpp "conftest.$ac_ext"\"") >&5
-  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6129: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  $EGREP -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:6062: \$? = $ac_status" >&5
-  (exit "$ac_status"); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  echo "$as_me:6132: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6138: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
-  cat "conftest.$ac_ext" >&5
-  eval "$as_ac_Header=no"
+cat "conftest.$ac_ext" >&5
+eval "$as_ac_Header=no"
 fi
-rm -f conftest.err "conftest.$ac_ext"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6081: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6148: 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
@@ -6088,74 +6155,69 @@
 fi
 done
 
-for ac_header in string.h memory.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6094: 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 "$as_me:6158: 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 6100 "configure"
+#line 6164 "configure"
 #include "confdefs.h"
-#include <$ac_header>
+$ac_includes_default
+int
+main (void)
+{
+#ifndef exit
+  char *p = (char *) exit; (void) p;
+#endif
+
+  ;
+  return 0;
+}
 _ACEOF
-if { (eval echo "$as_me:6104: \"$ac_cpp "conftest.$ac_ext"\"") >&5
-  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  $EGREP -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:6110: \$? = $ac_status" >&5
-  (exit "$ac_status"); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
+  echo "$as_me:6182: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6185: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6188: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_have_decl_exit=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat "conftest.$ac_ext" >&5
-  eval "$as_ac_Header=no"
-fi
-rm -f conftest.err "conftest.$ac_ext"
+cat "conftest.$ac_ext" >&5
+ac_cv_have_decl_exit=no
 fi
-echo "$as_me:6129: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
-echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
-if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-done
+echo "$as_me:6198: result: $ac_cv_have_decl_exit" >&5
+echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6142: checking for $ac_header" >&5
+echo "$as_me:6204: 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 6148 "configure"
+#line 6210 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6152: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6214: \"$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:6158: \$? = $ac_status" >&5
+  echo "$as_me:6220: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6174,7 +6236,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6177: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6239: 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
@@ -6184,7 +6246,7 @@
 fi
 done
 
-echo "$as_me:6187: checking for header declaring getopt variables" >&5
+echo "$as_me:6249: 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
@@ -6194,7 +6256,7 @@
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6197 "configure"
+#line 6259 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6207,16 +6269,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6213: \$? = $ac_status" >&5
+  echo "$as_me:6275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6219: \$? = $ac_status" >&5
+  echo "$as_me:6281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
@@ -6228,7 +6290,7 @@
 done
 
 fi
-echo "$as_me:6231: result: $cf_cv_getopt_header" >&5
+echo "$as_me:6293: result: $cf_cv_getopt_header" >&5
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
@@ -6248,13 +6310,13 @@
 for ac_func in getopt popen strstr tmpfile link unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6251: checking for $ac_func" >&5
+echo "$as_me:6313: 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 6257 "configure"
+#line 6319 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6285,16 +6347,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6291: \$? = $ac_status" >&5
+  echo "$as_me:6353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6297: \$? = $ac_status" >&5
+  echo "$as_me:6359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6304,7 +6366,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6307: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:6369: 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
@@ -6333,23 +6395,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6336: checking for $ac_header" >&5
+echo "$as_me:6398: 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 6342 "configure"
+#line 6404 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6408: \"$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:6352: \$? = $ac_status" >&5
+  echo "$as_me:6414: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6368,7 +6430,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6371: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6433: 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
@@ -6378,7 +6440,7 @@
 fi
 done
 
-echo "$as_me:6381: checking for working mkstemp" >&5
+echo "$as_me:6443: 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
@@ -6389,17 +6451,11 @@
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6392 "configure"
+#line 6454 "configure"
 #include "confdefs.h"
 
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
+$ac_includes_default
+
 int main(void)
 {
 	char *tmpl = "conftestXXXXXX";
@@ -6430,15 +6486,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6436: \$? = $ac_status" >&5
+  echo "$as_me:6492: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6441: \$? = $ac_status" >&5
+  echo "$as_me:6497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -6453,16 +6509,16 @@
 fi
 
 fi
-echo "$as_me:6456: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:6512: 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:6459: checking for mkstemp" >&5
+	echo "$as_me:6515: 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 6465 "configure"
+#line 6521 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6493,16 +6549,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6499: \$? = $ac_status" >&5
+  echo "$as_me:6555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6505: \$? = $ac_status" >&5
+  echo "$as_me:6561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -6512,7 +6568,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6515: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:6571: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -6524,14 +6580,14 @@
 
 fi
 
-echo "$as_me:6527: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "$as_me:6583: checking for size_t in <sys/types.h> or <stdio.h>" >&5
 echo $ECHO_N "checking for size_t in <sys/types.h> or <stdio.h>... $ECHO_C" >&6
 if test "${cf_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6534 "configure"
+#line 6590 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6549,16 +6605,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6555: \$? = $ac_status" >&5
+  echo "$as_me:6611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6561: \$? = $ac_status" >&5
+  echo "$as_me:6617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_size_t=yes
 else
@@ -6570,7 +6626,7 @@
 
 fi
 
-echo "$as_me:6573: result: $cf_cv_type_size_t" >&5
+echo "$as_me:6629: result: $cf_cv_type_size_t" >&5
 echo "${ECHO_T}$cf_cv_type_size_t" >&6
 test "$cf_cv_type_size_t" = no &&
 cat >>confdefs.h <<\EOF
@@ -6597,7 +6653,7 @@
 %%
 EOF
 
-echo "$as_me:6600: checking if $CPP can handle only .c files" >&5
+echo "$as_me:6656: checking if $CPP can handle only .c files" >&5
 echo $ECHO_N "checking if $CPP can handle only .c files... $ECHO_C" >&6
 $CPP yacctest.y >yacctest.out 2>/dev/null
 if test ! -s yacctest.out
@@ -6606,10 +6662,10 @@
 #define CPP_DOES_ONLY_C_FILES 1
 EOF
 
-	echo "$as_me:6609: result: yes" >&5
+	echo "$as_me:6665: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:6612: result: no" >&5
+	echo "$as_me:6668: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6618,13 +6674,13 @@
 td_incl='#include "y.tab.c"'
 for COND in BISON_HAS_YYTNAME YACC_HAS_YYTOKS YACC_HAS_YYTOKS_2 YACC_HAS_YYNAME
 do
-echo "$as_me:6621: checking for error-reporting with $COND" >&5
+echo "$as_me:6677: checking for error-reporting with $COND" >&5
 echo $ECHO_N "checking for error-reporting with $COND... $ECHO_C" >&6
 if eval "test \"\${ac_cv_$COND+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6627 "configure"
+#line 6683 "configure"
 #include "confdefs.h"
 
 #define $COND 1
@@ -6639,16 +6695,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:6701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6651: \$? = $ac_status" >&5
+  echo "$as_me:6707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval 'ac_cv_'$COND'=yes'
 else
@@ -6660,7 +6716,7 @@
 fi
 
 eval 'td_result=$ac_cv_'$COND
-echo "$as_me:6663: result: $td_result" >&5
+echo "$as_me:6719: result: $td_result" >&5
 echo "${ECHO_T}$td_result" >&6
 if test $td_result = yes; then
 	cat >>confdefs.h <<EOF
@@ -6672,13 +6728,13 @@
 done
 rm -f y.tab.c
 
-echo "$as_me:6675: checking for conflicting prototype for popen" >&5
+echo "$as_me:6731: checking for conflicting prototype for popen" >&5
 echo $ECHO_N "checking for conflicting prototype for popen... $ECHO_C" >&6
 if test "${ac_cv_td_popen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6681 "configure"
+#line 6737 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6699,16 +6755,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6705: \$? = $ac_status" >&5
+  echo "$as_me:6761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6711: \$? = $ac_status" >&5
+  echo "$as_me:6767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_td_popen=no
 else
@@ -6719,7 +6775,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:6722: result: $ac_cv_td_popen" >&5
+echo "$as_me:6778: result: $ac_cv_td_popen" >&5
 echo "${ECHO_T}$ac_cv_td_popen" >&6
 if test $ac_cv_td_popen = yes; then
 
@@ -6735,13 +6791,13 @@
 if test "${with_trace+set}" = set; then
   withval="$with_trace"
 
-	echo "$as_me:6738: checking whether time.h and sys/time.h may both be included" >&5
+	echo "$as_me:6794: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6744 "configure"
+#line 6800 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -6757,16 +6813,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6763: \$? = $ac_status" >&5
+  echo "$as_me:6819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6769: \$? = $ac_status" >&5
+  echo "$as_me:6825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -6776,7 +6832,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:6779: result: $ac_cv_header_time" >&5
+echo "$as_me:6835: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -6789,13 +6845,13 @@
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6792: checking for $ac_func" >&5
+echo "$as_me:6848: 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 6798 "configure"
+#line 6854 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6826,16 +6882,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6832: \$? = $ac_status" >&5
+  echo "$as_me:6888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6838: \$? = $ac_status" >&5
+  echo "$as_me:6894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6845,7 +6901,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6848: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:6904: 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
@@ -6862,7 +6918,7 @@
 	EXTRA_OBJS="$EXTRA_OBJS trace.o dump.o"
 fi;
 
-echo "$as_me:6865: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6921: 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.
@@ -6884,7 +6940,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:6887: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6943: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6998,23 +7054,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:7001: checking for dmalloc.h" >&5
+	echo "$as_me:7057: 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 7007 "configure"
+#line 7063 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7067: \"$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:7017: \$? = $ac_status" >&5
+  echo "$as_me:7073: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7033,11 +7089,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7036: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:7092: 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:7040: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:7096: 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
@@ -7045,7 +7101,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7048 "configure"
+#line 7104 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7064,16 +7120,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7070: \$? = $ac_status" >&5
+  echo "$as_me:7126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7076: \$? = $ac_status" >&5
+  echo "$as_me:7132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -7084,7 +7140,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7087: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:7143: 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
@@ -7099,7 +7155,7 @@
 
 fi
 
-echo "$as_me:7102: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:7158: 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.
@@ -7121,7 +7177,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:7124: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:7180: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -7235,23 +7291,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:7238: checking for dbmalloc.h" >&5
+	echo "$as_me:7294: 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 7244 "configure"
+#line 7300 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7248: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7304: \"$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:7254: \$? = $ac_status" >&5
+  echo "$as_me:7310: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7270,11 +7326,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7273: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:7329: 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:7277: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:7333: 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
@@ -7282,7 +7338,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7285 "configure"
+#line 7341 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7301,16 +7357,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7307: \$? = $ac_status" >&5
+  echo "$as_me:7363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7313: \$? = $ac_status" >&5
+  echo "$as_me:7369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -7321,7 +7377,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7324: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:7380: 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
@@ -7336,7 +7392,7 @@
 
 fi
 
-echo "$as_me:7339: checking if you want to use valgrind for testing" >&5
+echo "$as_me:7395: 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.
@@ -7358,7 +7414,7 @@
 else
   with_valgrind=
 fi;
-echo "$as_me:7361: result: ${with_valgrind:-no}" >&5
+echo "$as_me:7417: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -7471,7 +7527,7 @@
 	;;
 esac
 
-echo "$as_me:7474: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:7530: 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.
@@ -7482,7 +7538,7 @@
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:7485: result: $with_no_leaks" >&5
+echo "$as_me:7541: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -7499,7 +7555,7 @@
 
 # Extract the first word of "groff", so it can be a program name with args.
 set dummy groff; ac_word=$2
-echo "$as_me:7502: checking for $ac_word" >&5
+echo "$as_me:7558: 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
@@ -7516,7 +7572,7 @@
   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:7519: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7575: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7528,10 +7584,10 @@
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:7531: result: $GROFF_PATH" >&5
+  echo "$as_me:7587: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:7534: result: no" >&5
+  echo "$as_me:7590: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7539,7 +7595,7 @@
 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:7542: checking for $ac_word" >&5
+echo "$as_me:7598: 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
@@ -7556,7 +7612,7 @@
   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:7559: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7615: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7567,10 +7623,10 @@
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:7570: result: $NROFF_PATH" >&5
+  echo "$as_me:7626: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:7573: result: no" >&5
+  echo "$as_me:7629: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7580,7 +7636,7 @@
 
 # Extract the first word of "tbl", so it can be a program name with args.
 set dummy tbl; ac_word=$2
-echo "$as_me:7583: checking for $ac_word" >&5
+echo "$as_me:7639: 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
@@ -7597,7 +7653,7 @@
   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:7600: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7656: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7609,10 +7665,10 @@
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:7612: result: $TBL_PATH" >&5
+  echo "$as_me:7668: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:7615: result: no" >&5
+  echo "$as_me:7671: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7632,7 +7688,7 @@
 (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:7635: checking for $ac_word" >&5
+echo "$as_me:7691: 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
@@ -7649,7 +7705,7 @@
   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:7652: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7708: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7661,16 +7717,16 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:7664: result: $cf_man2html" >&5
+  echo "$as_me:7720: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:7667: result: no" >&5
+  echo "$as_me:7723: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:7673: checking for the modified Earl Hood script" >&5
+		echo "$as_me:7729: 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
@@ -7679,7 +7735,7 @@
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:7682: result: $cf_man2html_ok" >&5
+		echo "$as_me:7738: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -7688,7 +7744,7 @@
 	esac
 esac
 
-echo "$as_me:7691: checking for program to convert manpage to html" >&5
+echo "$as_me:7747: 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.
@@ -7703,11 +7759,11 @@
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:7706: result: man2html" >&5
+	echo "$as_me:7762: 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:7710: checking for $ac_word" >&5
+echo "$as_me:7766: 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
@@ -7724,7 +7780,7 @@
   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:7727: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7783: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7736,10 +7792,10 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:7739: result: $cf_man2html" >&5
+  echo "$as_me:7795: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:7742: result: no" >&5
+  echo "$as_me:7798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7747,11 +7803,11 @@
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:7750: result: $cf_man2html" >&5
+	echo "$as_me:7806: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:7754: result: $cf_man2html" >&5
+	echo "$as_me:7810: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -7792,12 +7848,12 @@
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:7795: checking if nroff is really groff" >&5
+		echo "$as_me:7851: 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:7800: result: $cf_check_groff" >&5
+		echo "$as_me:7856: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -7828,14 +7884,14 @@
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7831: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:7887: 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:7838: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:7894: 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
@@ -7853,10 +7909,10 @@
 	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:7856: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:7912: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:7859: checking for pagesize to use" >&5
+	echo "$as_me:7915: 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
@@ -7881,7 +7937,7 @@
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:7884: result: $cf_man2html_page" >&5
+	echo "$as_me:7940: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -7987,7 +8043,7 @@
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:7990: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:8046: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -8123,10 +8179,10 @@
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20221009,
+configured by $0, generated by GNU Autoconf 2.52.20230114,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright 2003-2021,2022	Thomas E. Dickey
+Copyright 2003-2022,2023	Thomas E. Dickey
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -8168,7 +8224,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:8171: error: ambiguous option: $1
+    { { echo "$as_me:8227: 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;}
@@ -8187,7 +8243,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:8190: error: unrecognized option: $1
+  -*) { { echo "$as_me:8246: 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;}
@@ -8206,7 +8262,7 @@
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20221009, executed with
+This file was extended by $as_me 2.52.20230114, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -8225,7 +8281,7 @@
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
-  *) { { echo "$as_me:8228: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:8284: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -8346,6 +8402,8 @@
 s,@LINT@,$LINT,;t t
 s,@LINT_OPTS@,$LINT_OPTS,;t t
 s,@LINT_LIBS@,$LINT_LIBS,;t t
+s,@GPERF_PATH@,$GPERF_PATH,;t t
+s,@GPERF_NOTE@,$GPERF_NOTE,;t t
 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
 s,@FGREP@,$FGREP,;t t
 s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t
@@ -8497,7 +8555,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:8500: creating $ac_file" >&5
+    { echo "$as_me:8558: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -8515,7 +8573,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:8518: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:8576: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -8528,7 +8586,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:8531: error: cannot find input file: $f" >&5
+           { { echo "$as_me:8589: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -8544,7 +8602,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:8547: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:8605: 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;}
@@ -8553,7 +8611,7 @@
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:8556: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:8614: 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;}
@@ -8598,7 +8656,7 @@
             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:8601: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:8659: 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;}
@@ -8609,7 +8667,7 @@
     $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:8612: WARNING: Some variables may not be substituted:
+      { echo "$as_me:8670: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -8658,7 +8716,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:8661: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:8719: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -8669,7 +8727,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:8672: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:8730: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -8682,7 +8740,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:8685: error: cannot find input file: $f" >&5
+           { { echo "$as_me:8743: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -8740,7 +8798,7 @@
   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:8743: $ac_file is unchanged" >&5
+      { echo "$as_me:8801: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff -Nru cproto-4.7u/configure.in cproto-4.7v/configure.in
--- cproto-4.7u/configure.in	2022-10-16 16:24:52.000000000 +0000
+++ cproto-4.7v/configure.in	2023-02-22 22:10:28.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Process this file with 'autoconf' to produce a 'configure' script
-dnl $Id: configure.in,v 4.26 2022/10/16 16:24:52 tom Exp $
-AC_REVISION($Revision: 4.26 $)
+dnl $Id: configure.in,v 4.28 2023/02/22 22:10:28 tom Exp $
+AC_REVISION($Revision: 4.28 $)
 AC_PREREQ(2.52.20200802)
 AC_INIT(cproto.c)
 AC_CONFIG_HEADER(config.h:config_h.in)
@@ -20,11 +20,13 @@
 AC_PROG_INSTALL
 CF_MAKE_TAGS
 CF_PROG_LINT
+CF_PROG_GPERF
 
 CF_NEED_PROG(LEX)
 CF_NEED_PROG(YACC)
 
 CF_XOPEN_SOURCE
+
 CF_WITHOUT_X
 
 CF_ENABLE_WARNINGS
@@ -45,9 +47,7 @@
 AC_SUBST(EXTRA_OBJS)
 
 AC_CONST
-AC_STDC_HEADERS
-AC_HAVE_HEADERS(stdlib.h unistd.h)
-AC_HAVE_HEADERS(string.h memory.h)
+AC_CHECK_DECL(exit)
 CF_GETOPT_HEADER
 
 AC_HAVE_FUNCS(getopt popen strstr tmpfile link unlink)
diff -Nru cproto-4.7u/cproto.1 cproto-4.7v/cproto.1
--- cproto-4.7u/cproto.1	2022-10-13 00:19:23.000000000 +0000
+++ cproto-4.7v/cproto.1	2023-02-05 14:52:41.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: cproto.1,v 4.15 2022/10/13 00:19:23 tom Exp $
+.\" $Id: cproto.1,v 4.16 2023/02/05 14:52:41 tom Exp $
 .\"
 .de Ex
 .RS +7
@@ -15,7 +15,7 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.TH CPROTO 1 "2022-10-12" "Version 4.7u" "USER COMMANDS"
+.TH CPROTO 1 "2023-02-05" "Version 4.7v" "USER COMMANDS"
 .
 .SH NAME
 cproto \- generate C function prototypes and convert function definitions
diff -Nru cproto-4.7u/cproto.c cproto-4.7v/cproto.c
--- cproto-4.7u/cproto.c	2022-10-16 20:14:26.000000000 +0000
+++ cproto-4.7v/cproto.c	2023-02-05 14:52:41.000000000 +0000
@@ -1,8 +1,8 @@
-/* $Id: cproto.c,v 4.56 2022/10/16 20:14:26 tom Exp $
+/* $Id: cproto.c,v 4.57 2023/02/05 14:52:41 tom Exp $
  *
  * C function prototype generator and function definition converter
  */
-#define VERSION "4.7u"
+#define VERSION "4.7v"
 
 #include <cproto.h>
 
diff -Nru cproto-4.7u/cproto.h cproto-4.7v/cproto.h
--- cproto-4.7u/cproto.h	2021-01-10 16:18:30.000000000 +0000
+++ cproto-4.7v/cproto.h	2023-02-24 22:19:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: cproto.h,v 4.21 2021/01/10 16:18:30 tom Exp $
+/* $Id: cproto.h,v 4.23 2023/02/24 22:19:36 tom Exp $
  *
  * Declarations for C function prototype generator
  */
@@ -111,19 +111,22 @@
     char *comment;		/* comment at start of parameter list */
 } ParameterList;
 
+#define uBIT(n)		(1U<<(n))
+
 /* Declaration specifier flags */
-#define DS_NONE 	0	/* default */
-#define DS_EXTERN	1	/* contains "extern" specifier */
-#define DS_STATIC	2	/* contains "static" specifier */
-#define DS_CHAR 	4	/* contains "char" type specifier */
-#define DS_SHORT	8	/* contains "short" type specifier */
-#define DS_FLOAT	16	/* contains "float" type specifier */
-#define DS_INLINE	32	/* contains "inline" specifier */
-#define DS_JUNK 	64	/* we're not interested in this declaration */
+#define DS_NONE 	0U	/* default */
+#define DS_EXTERN	uBIT(1)	/* contains "extern" specifier */
+#define DS_STATIC	uBIT(2)	/* contains "static" specifier */
+#define DS_CHAR 	uBIT(3)	/* contains "char" type specifier */
+#define DS_SHORT	uBIT(4)	/* contains "short" type specifier */
+#define DS_FLOAT	uBIT(5)	/* contains "float" type specifier */
+#define DS_INLINE	uBIT(6)	/* contains "inline" specifier */
+#define DS_JUNK 	uBIT(7)	/* we're not interested in this declaration */
+#define DS_UNREAL 	uBIT(8)	/* contains imaginary specifier */
 
 /* This structure stores information about a declaration specifier. */
 typedef struct decl_spec {
-    unsigned short flags;	/* flags defined above */
+    unsigned flags;		/* DS_xxx flags defined above */
     char *text;			/* source text */
     long begin;			/* offset in temporary file */
 } DeclSpec;
diff -Nru cproto-4.7u/debian/changelog cproto-4.7v/debian/changelog
--- cproto-4.7u/debian/changelog	2022-10-17 00:45:23.000000000 +0000
+++ cproto-4.7v/debian/changelog	2023-03-04 02:48:25.000000000 +0000
@@ -1,3 +1,11 @@
+cproto (4.7v-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump standards version to 4.6.2.0 (no packaging changes).
+  * Add lintian override for source-contains-autogenerated-gperf-data.
+
+ -- Kenneth J. Pronovici <pronovic@debian.org>  Sat, 04 Mar 2023 02:48:25 +0000
+
 cproto (4.7u-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cproto-4.7u/debian/control cproto-4.7v/debian/control
--- cproto-4.7u/debian/control	2022-10-17 00:45:23.000000000 +0000
+++ cproto-4.7v/debian/control	2023-03-04 02:48:25.000000000 +0000
@@ -5,7 +5,7 @@
 Homepage: https://invisible-island.net/cproto/cproto.html
 Build-Depends: debhelper-compat (= 13), bison, flex
 Rules-Requires-Root: no
-Standards-Version: 4.6.1.0
+Standards-Version: 4.6.2.0
 Vcs-Browser: https://salsa.debian.org/debian/cproto
 Vcs-Git: https://salsa.debian.org/debian/cproto.git
 
diff -Nru cproto-4.7u/debian/copyright cproto-4.7v/debian/copyright
--- cproto-4.7u/debian/copyright	2022-10-17 00:45:23.000000000 +0000
+++ cproto-4.7v/debian/copyright	2023-03-04 02:48:25.000000000 +0000
@@ -11,7 +11,7 @@
 
 Files: debian/*
 Copyright: 2000 Carsten Leonhardt <leo@debian.org>
-           2003-2005, 2008-2022 Kenneth J. Pronovici <pronovic@debian.org>
+           2003-2005, 2008-2023 Kenneth J. Pronovici <pronovic@debian.org>
 License: public-domain
  Copying and distribution of these files, with or without modification, is
  permitted in any medium without royalty provided the copyright notice and
diff -Nru cproto-4.7u/debian/source/lintian-overrides cproto-4.7v/debian/source/lintian-overrides
--- cproto-4.7u/debian/source/lintian-overrides	2022-10-17 00:45:23.000000000 +0000
+++ cproto-4.7v/debian/source/lintian-overrides	2023-03-04 02:48:25.000000000 +0000
@@ -3,3 +3,6 @@
 
 # The home page in debian/control is the only useful link for this upstream
 cproto source: upstream-metadata-file-is-missing
+
+# This is for lookup of known types/qualifiers in type_of_name()
+cproto source: source-contains-autogenerated-gperf-data [keywords.c]
diff -Nru cproto-4.7u/grammar.y cproto-4.7v/grammar.y
--- cproto-4.7u/grammar.y	2022-10-15 00:05:45.000000000 +0000
+++ cproto-4.7v/grammar.y	2023-02-28 12:47:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: grammar.y,v 4.28 2022/10/15 00:05:45 tom Exp $
+/* $Id: grammar.y,v 4.34 2023/02/28 12:47:29 tom Exp $
  *
  * yacc grammar for C function prototype generator
  * This was derived from the grammar in Appendix A of
@@ -7,7 +7,7 @@
 
 %token <text> '(' '*' '&'
 	/* identifiers that are not reserved words */
-	T_IDENTIFIER T_TYPEDEF_NAME T_DEFINE_NAME
+	STD_TYPENAME T_IDENTIFIER T_TYPEDEF_NAME T_DEFINE_NAME
 
 	/* storage class */
 	T_AUTO T_EXTERN T_REGISTER T_STATIC T_TYPEDEF
@@ -23,9 +23,12 @@
 	T_ENUM T_STRUCT T_UNION
 	/* C9X new types */
 	T_Bool T_Complex T_Imaginary
-	/* nonstandard "gcc" types */
+	/* c99 types */
 	T_LONG_DOUBLE
 
+	/* va_list from <stdarg.h> */
+	T_VA_LIST
+
 	/* type qualifiers */
 	T_TYPE_QUALIFIER
 
@@ -241,7 +244,7 @@
 	}
 	| any_typedef decl_specifiers
 	{
-	    cur_decl_spec_flags = $2.flags;
+	    cur_decl_spec_flags = (int) $2.flags;
 	    free_decl_spec(&$2);
 	}
 	  opt_declarator_list ';'
@@ -275,7 +278,7 @@
 	     * flags so it does not get promoted.
 	     */
 	    if (strcmp($1->text, $1->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
+		flags &= (int) ~(DS_CHAR | DS_SHORT | DS_FLOAT);
 	    new_symbol(typedef_names, $1->name, NULL, flags);
 	    free_declarator($1);
 	}
@@ -284,7 +287,7 @@
 	    int flags = cur_decl_spec_flags;
 
 	    if (strcmp($3->text, $3->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
+		flags &= (int) ~(DS_CHAR | DS_SHORT | DS_FLOAT);
 	    new_symbol(typedef_names, $3->name, NULL, flags);
 	    free_declarator($3);
 	}
@@ -446,6 +449,10 @@
 	{
 	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
 	}
+	| T_VA_LIST
+	{
+	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
+	}
 	| T_VOID
 	{
 	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
@@ -456,11 +463,11 @@
 	}
 	| T_Complex
 	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
+	    new_decl_spec(&$$, $1.text, $1.begin, DS_UNREAL);
 	}
 	| T_Imaginary
 	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
+	    new_decl_spec(&$$, $1.text, $1.begin, DS_UNREAL);
 	}
 	| T_TYPEDEF_NAME
 	{
@@ -873,6 +880,7 @@
 
 %%
 
+#include "keywords.c"
 
 #if defined(HAVE_CONFIG_H)
 # include "lex.yy.c"
diff -Nru cproto-4.7u/install-sh cproto-4.7v/install-sh
--- cproto-4.7u/install-sh	2003-11-29 21:30:21.000000000 +0000
+++ cproto-4.7v/install-sh	2020-11-30 16:41:23.000000000 +0000
@@ -1,7 +1,8 @@
-#! /bin/sh
-#
+#!/bin/sh
 # install - install a program, script, or datafile
-#
+
+scriptversion=2020-11-14.01; # UTC
+
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
@@ -34,261 +35,507 @@
 # 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
+# '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.
+# from scratch.
 
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
 
-# set DOITPROG to echo to test this script
+src=
+dst=
+dir_arg=
+dst_arg=
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+copy_on_change=false
+is_target_a_directory=possibly
 
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
 
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
 
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
+  -c            (ignored)
+  -C            install only if different (preserve data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
+  -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
 
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
+If -S is not specified, no backups are attempted.
 
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
 
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
 
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+    -C) copy_on_change=true;;
 
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
+    -d) dir_arg=true;;
 
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
 
-	pathcomp=$pathcomp/
-done
-fi
+    --help) echo "$usage"; exit $?;;
 
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
-# If we're going to rename the final executable, determine the name now.
+    -o) chowncmd="$chownprog $2"
+        shift;;
 
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
+    -p) cpprog="$cpprog -p";;
 
-# don't allow the sed command to completely eliminate the filename
+    -s) stripcmd=$stripprog;;
 
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
+    -S) backupsuffix="$2"
+        shift;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
 
-# Make a couple of temp file names in the proper directory.
+    --version) echo "$0 $scriptversion"; exit $?;;
 
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
+    --) shift
+        break;;
 
-# Trap to clean up temp files at exit.
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
+    *)  break;;
+  esac
+  shift
+done
 
-# Move or copy the file name to the temp name
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
 
-	$doit $instcmd "$src" "$dsttmp" &&
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
 
-# and set any options; do chmod last to preserve setuid bits
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
 
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
 
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
 
-{
-	if [ -f "$dstdir/$dstfile" ]
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
 	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	else
-		:
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	trap '' 0;;
+    esac
 
-fi &&
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
+  fi
+done
 
-{
-	(exit 0); exit
-}
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru cproto-4.7u/keywords.c cproto-4.7v/keywords.c
--- cproto-4.7u/keywords.c	1970-01-01 00:00:00.000000000 +0000
+++ cproto-4.7v/keywords.c	2023-02-28 13:11:01.000000000 +0000
@@ -0,0 +1,255 @@
+/* *INDENT-OFF* */
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -C -c -p -t -T -g -j1 -o -H hash_keyword -N find_keyword keywords.gperf  */
+/* Computed positions: -k'1,5,7' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
+#endif
+
+#line 1 "keywords.gperf"
+
+struct KEYWORDS {
+    const char *name;
+    int value;
+};
+
+#define TOTAL_KEYWORDS 62
+#define MIN_WORD_LENGTH 3
+#define MAX_WORD_LENGTH 13
+#define MIN_HASH_VALUE 4
+#define MAX_HASH_VALUE 75
+/* maximum key range = 72, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash_keyword (register const char *str, register size_t len)
+{
+  static const unsigned char asso_values[] =
+    {
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 42,
+      52, 34, 57, 76, 36, 76, 48, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76,  0, 76,  4, 76, 36,
+      37, 11, 19, 15, 76,  1, 76, 13,  7,  2,
+       3, 25, 10, 76, 10, 16,  0,  9, 33, 13,
+      12, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+      76, 76, 76, 76, 76, 76
+    };
+  register unsigned int hval = (unsigned)len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[6]];
+      /*FALLTHROUGH*/
+      case 6:
+      case 5:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      case 4:
+      case 3:
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+static const struct KEYWORDS *
+find_keyword (register const char *str, register size_t len)
+{
+  static const struct KEYWORDS wordlist[] =
+    {
+      {"", 0}, {"", 0}, {"", 0}, {"", 0},
+#line 38 "keywords.gperf"
+      {"int",		T_INT,},
+      {"", 0},
+#line 54 "keywords.gperf"
+      {"time_t",		STD_TYPENAME,	/* c99 */},
+#line 42 "keywords.gperf"
+      {"int8_t",		STD_TYPENAME,	/* c99 */},
+#line 27 "keywords.gperf"
+      {"auto",		T_AUTO,},
+#line 44 "keywords.gperf"
+      {"intptr_t",	STD_TYPENAME,	/* c99 */},
+#line 37 "keywords.gperf"
+      {"inline", 	T_INLINE,},
+#line 45 "keywords.gperf"
+      {"long",		T_LONG,},
+#line 9 "keywords.gperf"
+      {"_Bool",		T_Bool,},
+#line 43 "keywords.gperf"
+      {"intmax_t",	STD_TYPENAME,	/* c99 */},
+#line 18 "keywords.gperf"
+      {"__attribute__", 	T_ATTRIBUTE,},
+#line 32 "keywords.gperf"
+      {"enum",		T_ENUM,},
+#line 19 "keywords.gperf"
+      {"__extension__", 	T_EXTENSION,},
+#line 62 "keywords.gperf"
+      {"union",		T_UNION,},
+#line 22 "keywords.gperf"
+      {"__inline", 	T_INLINE,},
+#line 70 "keywords.gperf"
+      {"wint_t",		STD_TYPENAME,	/* c99 */},
+#line 23 "keywords.gperf"
+      {"__inline__", 	T_INLINE,},
+#line 48 "keywords.gperf"
+      {"short",		T_SHORT,},
+#line 51 "keywords.gperf"
+      {"size_t",		T_LONG,},
+#line 52 "keywords.gperf"
+      {"static", 	T_STATIC,},
+#line 34 "keywords.gperf"
+      {"float",		T_FLOAT,},
+#line 36 "keywords.gperf"
+      {"fpos_t",		STD_TYPENAME,	/* c99 */},
+#line 35 "keywords.gperf"
+      {"float_t",	STD_TYPENAME,	/* c99 */},
+#line 33 "keywords.gperf"
+      {"extern", 	T_EXTERN,},
+#line 17 "keywords.gperf"
+      {"_Imaginary",	T_Imaginary,},
+#line 10 "keywords.gperf"
+      {"_Complex",	T_Complex,},
+#line 67 "keywords.gperf"
+      {"wchar_t",	STD_TYPENAME,	/* c99 */},
+#line 69 "keywords.gperf"
+      {"wctype_t",	STD_TYPENAME,	/* c99 */},
+#line 60 "keywords.gperf"
+      {"uintmax_t",	STD_TYPENAME,	/* c99 */},
+#line 50 "keywords.gperf"
+      {"signed", 	T_SIGNED,},
+#line 25 "keywords.gperf"
+      {"__signed", 	T_SIGNED,},
+#line 20 "keywords.gperf"
+      {"__float128", 	STD_TYPENAME,},
+#line 26 "keywords.gperf"
+      {"__signed__", 	T_SIGNED,},
+#line 66 "keywords.gperf"
+      {"void",		T_VOID,},
+#line 61 "keywords.gperf"
+      {"uintptr_t",	STD_TYPENAME,	/* c99 */},
+#line 46 "keywords.gperf"
+      {"ptrdiff_t",	STD_TYPENAME,	/* c99 */},
+#line 28 "keywords.gperf"
+      {"char",		T_CHAR,},
+#line 65 "keywords.gperf"
+      {"va_list",	T_VA_LIST,},
+#line 68 "keywords.gperf"
+      {"wctrans_t",	STD_TYPENAME,	/* c99 */},
+#line 63 "keywords.gperf"
+      {"unsigned",	T_UNSIGNED,},
+#line 39 "keywords.gperf"
+      {"int16_t",	STD_TYPENAME,	/* c99 */},
+#line 47 "keywords.gperf"
+      {"register",	T_REGISTER,},
+#line 13 "keywords.gperf"
+      {"_Float32",	STD_TYPENAME,	/* c99 */},
+#line 14 "keywords.gperf"
+      {"_Float32x",	STD_TYPENAME,	/* c99 */},
+#line 15 "keywords.gperf"
+      {"_Float64",	STD_TYPENAME,	/* c99 */},
+#line 16 "keywords.gperf"
+      {"_Float64x",	STD_TYPENAME,	/* c99 */},
+#line 30 "keywords.gperf"
+      {"double", 	T_DOUBLE,},
+#line 57 "keywords.gperf"
+      {"uint32_t",	STD_TYPENAME,	/* c99 */},
+#line 31 "keywords.gperf"
+      {"double_t",	STD_TYPENAME,	/* c99 */},
+#line 58 "keywords.gperf"
+      {"uint64_t",	STD_TYPENAME,	/* c99 */},
+#line 12 "keywords.gperf"
+      {"_Float16",	STD_TYPENAME,	/* c99 */},
+#line 11 "keywords.gperf"
+      {"_Float128",	STD_TYPENAME,	/* c99 */},
+#line 29 "keywords.gperf"
+      {"clock_t",	STD_TYPENAME,	/* c99 */},
+#line 49 "keywords.gperf"
+      {"sig_atomic_t",	STD_TYPENAME,	/* c99 */},
+#line 53 "keywords.gperf"
+      {"struct", 	T_STRUCT,},
+#line 56 "keywords.gperf"
+      {"uint16_t",	STD_TYPENAME,	/* c99 */},
+#line 40 "keywords.gperf"
+      {"int32_t",	STD_TYPENAME,	/* c99 */},
+#line 24 "keywords.gperf"
+      {"__int32_t",	STD_TYPENAME,	/* gcc */},
+#line 21 "keywords.gperf"
+      {"__ibm128", 	STD_TYPENAME,},
+#line 55 "keywords.gperf"
+      {"typedef",	T_TYPEDEF,},
+#line 59 "keywords.gperf"
+      {"uint8_t",	STD_TYPENAME,	/* c99 */},
+#line 41 "keywords.gperf"
+      {"int64_t",	STD_TYPENAME,	/* c99 */},
+      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+#line 64 "keywords.gperf"
+      {"va_dcl",		T_VA_DCL,}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = hash_keyword (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+/* *INDENT-ON* */
diff -Nru cproto-4.7u/keywords.gperf cproto-4.7v/keywords.gperf
--- cproto-4.7u/keywords.gperf	1970-01-01 00:00:00.000000000 +0000
+++ cproto-4.7v/keywords.gperf	2023-02-28 12:20:55.000000000 +0000
@@ -0,0 +1,70 @@
+%{
+struct KEYWORDS {
+    const char *name;
+    int value;
+};
+%}
+struct KEYWORDS;
+%%
+_Bool,		T_Bool,
+_Complex,	T_Complex,
+_Float128,	STD_TYPENAME,	/* c99 */
+_Float16,	STD_TYPENAME,	/* c99 */
+_Float32,	STD_TYPENAME,	/* c99 */
+_Float32x,	STD_TYPENAME,	/* c99 */
+_Float64,	STD_TYPENAME,	/* c99 */
+_Float64x,	STD_TYPENAME,	/* c99 */
+_Imaginary,	T_Imaginary,
+__attribute__, 	T_ATTRIBUTE,
+__extension__, 	T_EXTENSION,
+__float128, 	STD_TYPENAME,
+__ibm128, 	STD_TYPENAME,
+__inline, 	T_INLINE,
+__inline__, 	T_INLINE,
+__int32_t,	STD_TYPENAME,	/* gcc */
+__signed, 	T_SIGNED,
+__signed__, 	T_SIGNED,
+auto,		T_AUTO,
+char,		T_CHAR,
+clock_t,	STD_TYPENAME,	/* c99 */
+double, 	T_DOUBLE,
+double_t,	STD_TYPENAME,	/* c99 */
+enum,		T_ENUM,
+extern, 	T_EXTERN,
+float,		T_FLOAT,
+float_t,	STD_TYPENAME,	/* c99 */
+fpos_t,		STD_TYPENAME,	/* c99 */
+inline, 	T_INLINE,
+int,		T_INT,
+int16_t,	STD_TYPENAME,	/* c99 */
+int32_t,	STD_TYPENAME,	/* c99 */
+int64_t,	STD_TYPENAME,	/* c99 */
+int8_t,		STD_TYPENAME,	/* c99 */
+intmax_t,	STD_TYPENAME,	/* c99 */
+intptr_t,	STD_TYPENAME,	/* c99 */
+long,		T_LONG,
+ptrdiff_t,	STD_TYPENAME,	/* c99 */
+register,	T_REGISTER,
+short,		T_SHORT,
+sig_atomic_t,	STD_TYPENAME,	/* c99 */
+signed, 	T_SIGNED,
+size_t,		T_LONG,
+static, 	T_STATIC,
+struct, 	T_STRUCT,
+time_t,		STD_TYPENAME,	/* c99 */
+typedef,	T_TYPEDEF,
+uint16_t,	STD_TYPENAME,	/* c99 */
+uint32_t,	STD_TYPENAME,	/* c99 */
+uint64_t,	STD_TYPENAME,	/* c99 */
+uint8_t,	STD_TYPENAME,	/* c99 */
+uintmax_t,	STD_TYPENAME,	/* c99 */
+uintptr_t,	STD_TYPENAME,	/* c99 */
+union,		T_UNION,
+unsigned,	T_UNSIGNED,
+va_dcl,		T_VA_DCL,
+va_list,	T_VA_LIST,
+void,		T_VOID,
+wchar_t,	STD_TYPENAME,	/* c99 */
+wctrans_t,	STD_TYPENAME,	/* c99 */
+wctype_t,	STD_TYPENAME,	/* c99 */
+wint_t,		STD_TYPENAME,	/* c99 */
diff -Nru cproto-4.7u/lex.l cproto-4.7v/lex.l
--- cproto-4.7u/lex.l	2021-03-04 00:43:22.000000000 +0000
+++ cproto-4.7v/lex.l	2023-02-28 13:03:46.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 
-/* $Id: lex.l,v 4.29 2021/03/04 00:43:22 tom Exp $
+/* $Id: lex.l,v 4.33 2023/02/28 13:03:46 tom Exp $
  *
  * Lexical analyzer for C function prototype generator
  *
@@ -31,7 +31,7 @@
 #define	result(nn)	count(); if (!brackets && unnested()) return(nn)
 
 #define	is_IDENTIFIER	    save_text_offset();\
-			    return type_of_name(yytext);
+			    return type_of_name(yytext, yyleng);
 
 #if !OPT_LINTLIBRARY
 #define gcc_attribute   absorb_special	/* otherwise, we don't care */
@@ -67,7 +67,7 @@
 static IncludeStack *inc_stack;	/* stack of included files */
 static SymbolTable *included_files;	/* files already included */
 
-static int type_of_name(char *name);
+static int type_of_name(char *name, int length);
 static void startCpp(int level);
 static void finishCpp(void);
 #if !OPT_LINTLIBRARY
@@ -240,7 +240,7 @@
 <INITIAL>{ID}		{
 			    int code;
 			    save_text_offset();
-			    switch (code = type_of_name(yytext)) {
+			    switch (code = type_of_name(yytext, yyleng)) {
 			    case T_ATTRIBUTE:
 				gcc_attribute();
 				break;
@@ -394,68 +394,23 @@
 }
 #endif
 
-/* Decode the current token according to the type-of-name
+/* Decode the current token according to the type-of-name.  Tokens which are
+ * not used in function prototypes (such as "goto") are not handled here.
  */
 static int
-type_of_name(char *name)
+type_of_name(char *name, int length)
 {
-    /* *INDENT-OFF* */
-    static const struct {
-	const char *name;
-	int code;
-    } table[] = {
-	{ "auto",		T_AUTO },
-	{ "extern", 		T_EXTERN },
-	{ "register",		T_REGISTER },
-	{ "static", 		T_STATIC },
-	{ "typedef",		T_TYPEDEF },
-	{ "inline", 		T_INLINE },
-
-	{ "_Bool",		T_Bool },
-	{ "_Complex",		T_Complex },
-	{ "_Imaginary",		T_Imaginary },
-
-	{ "char",		T_CHAR },
-	{ "double", 		T_DOUBLE },
-	{ "float",		T_FLOAT },
-	{ "int",		T_INT },
-	{ "void",		T_VOID },
-	{ "long",		T_LONG },
-	{ "short",		T_SHORT },
-	{ "signed", 		T_SIGNED },
-	{ "unsigned",		T_UNSIGNED },
-
-	{ "enum",		T_ENUM },
-	{ "struct", 		T_STRUCT },
-	{ "union",		T_UNION },
-	{ "va_dcl",		T_VA_DCL },
-
-	{ "__signed", 		T_SIGNED },
-	{ "__signed__", 	T_SIGNED },
-	{ "__inline", 		T_INLINE },
-	{ "__inline__", 	T_INLINE },
-	{ "__extension__", 	T_EXTENSION },
-	{ "__attribute__", 	T_ATTRIBUTE },
-
-	{ "__ibm128", 		T_LONG_DOUBLE },
-	{ "__float128", 	T_LONG_DOUBLE },
-	{ "_Float128", 		T_LONG_DOUBLE },
-#ifdef vms
-	{ "globalvalue",	T_EXTERN },
-	{ "globalref",		T_EXTERN },
-	{ "globaldef",		T_EXTERN },
-#endif
-    };
-    /* *INDENT-ON* */
     int result = T_IDENTIFIER;
-    unsigned n;
-    for (n = 0; n < sizeof(table) / sizeof(table[0]); ++n) {
-	if (!strcmp(table[n].name, name)) {
-	    result = table[n].code;
-	    break;
-	}
+    const struct KEYWORDS *found = find_keyword(name, (size_t) length);
+    if (found) {
+	result = found->value;
     }
     switch (result) {
+    case STD_TYPENAME:
+	if (find_symbol(typedef_names, name) == NULL)
+	    new_symbol(typedef_names, name, NULL, DS_NONE);
+	result = T_TYPEDEF_NAME;
+	break;
     case T_IDENTIFIER:
 	if (find_symbol(type_qualifiers, name) != NULL)
 	    result = T_TYPE_QUALIFIER;
@@ -463,6 +418,12 @@
 	    result = T_TYPEDEF_NAME;
 	else if (find_symbol(define_names, name) != NULL)
 	    result = T_DEFINE_NAME;
+#ifdef vms
+	else if (!strcmp(name, "globalvalue") ||
+		 !strcmp(name, "globalref") ||
+		 !strcmp(name, "globaldef"))
+	    result = T_EXTERN;
+#endif
 	break;
     }
     return result;
diff -Nru cproto-4.7u/Makefile.in cproto-4.7v/Makefile.in
--- cproto-4.7u/Makefile.in	2022-10-13 00:19:23.000000000 +0000
+++ cproto-4.7v/Makefile.in	2023-02-28 13:10:49.000000000 +0000
@@ -1,9 +1,9 @@
-# $Id: Makefile.in,v 4.38 2022/10/13 00:19:23 tom Exp $
+# $Id: Makefile.in,v 4.46 2023/02/28 13:10:49 tom Exp $
 #
 # UNIX template-makefile for C prototype generator
 
 THIS = cproto
-RELEASE = 4_7u
+RELEASE = 4_7v
 
 #### Start of system configuration section. ####
 
@@ -119,6 +119,17 @@
 y.tab.c : grammar.y
 	$(YACC) $(srcdir)/grammar.y
 
+@GPERF_NOTE@# tested with gperf 3.1
+@GPERF_NOTE@keywords.c: keywords.gperf
+@GPERF_NOTE@	@-rm -f $@
+@GPERF_NOTE@	echo "/* *INDENT-OFF* */" >$@
+@GPERF_NOTE@	gperf -C -c -p -t -T -g -j1 -o -H hash_keyword -N find_keyword keywords.gperf |\
+@GPERF_NOTE@	sed \
+@GPERF_NOTE@		-e '/^const struct/,/^find_keyword/s,^const,static const,' \
+@GPERF_NOTE@		-e 's/{""}/{"", 0}/g' \
+@GPERF_NOTE@		-e 's/hval = len/hval = (unsigned)len/' >>$@
+@GPERF_NOTE@	echo "/* *INDENT-ON* */" >>$@
+
 lex.yy.c : lex.l
 	$(LEX) $(srcdir)/lex.l
 
@@ -142,6 +153,9 @@
 check_errors:	$(PROG)
 	cd $(srcdir)/testing && $(MAKE) $@ TEST_REF="$(TEST_REF)" SHELL="$(SHELL)"
 
+check_types:	$(PROG)
+	cd $(srcdir)/testing && $(MAKE) $@ TEST_REF="$(TEST_REF)" SHELL="$(SHELL)"
+
 default.h: $(C_FILES) lex.yy.c
 	./$(PROG) -e -v -m -M ARGS -d $(DEFINES) $(C_FILES) grammar.y >$@
 
@@ -173,4 +187,4 @@
 semantic$o : cproto.h config.h system.h semantic.h
 strkey$o   : cproto.h config.h system.h 
 symbol$o   : cproto.h config.h system.h symbol.h
-y.tab$o	   : cproto.h config.h system.h symbol.h semantic.h lex.yy.c yyerror.c
+y.tab$o	   : cproto.h config.h system.h symbol.h semantic.h lex.yy.c keywords.c yyerror.c
diff -Nru cproto-4.7u/MANIFEST cproto-4.7v/MANIFEST
--- cproto-4.7u/MANIFEST	2022-10-13 00:19:46.000000000 +0000
+++ cproto-4.7v/MANIFEST	2023-03-01 01:47:27.000000000 +0000
@@ -1,8 +1,9 @@
-MANIFEST for cproto, version v4_7u
+MANIFEST for cproto, version v4_7v
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 AUTHORS                         authors
 CHANGES                         summary of changes made to CPROTO
+LICENSE                         license-PD
 Makefile.in                     top-level makefile template
 README                          overview of the CPROTO program
 aclocal.m4                      autoconf macros
@@ -18,6 +19,8 @@
 dump.h                          interface of dump.c
 grammar.y                       yacc grammar for CPROTO
 install-sh                      install-script
+keywords.c                      generated from keywords.gperf
+keywords.gperf                  gperf input for keywords.c
 lex.l                           lex rules for CPROTO
 lintlibs.c                      functions used for lint-library formatting
 semantic.c                      functions to support yacc grammar (formatting and translation)
@@ -62,6 +65,9 @@
 porting/popen.c                 fake popen/pclose
 testing                         subdirectory
 testing/README                  description of files in CPROTO/TESTING
+testing/alltypes.in             test-input for alltypes.sh
+testing/alltypes.ref            test-reference for alltypes.sh
+testing/alltypes.sh             test-script for keywords.gperf
 testing/apollo.c                template for apollo lint-library
 testing/case01.ref              test case reference: no options
 testing/case02.ref              test case reference: -f0
diff -Nru cproto-4.7u/package/cproto.spec cproto-4.7v/package/cproto.spec
--- cproto-4.7u/package/cproto.spec	2022-10-13 00:19:23.000000000 +0000
+++ cproto-4.7v/package/cproto.spec	2023-02-05 14:52:41.000000000 +0000
@@ -1,7 +1,7 @@
 Summary:  cproto - generate C function prototypes and convert function definitions
 %define AppProgram cproto
-%define AppVersion 4.7u
-# $Id: cproto.spec,v 1.15 2022/10/13 00:19:23 tom Exp $
+%define AppVersion 4.7v
+# $Id: cproto.spec,v 1.16 2023/02/05 14:52:41 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff -Nru cproto-4.7u/package/debian/changelog cproto-4.7v/package/debian/changelog
--- cproto-4.7u/package/debian/changelog	2022-10-13 00:19:23.000000000 +0000
+++ cproto-4.7v/package/debian/changelog	2023-02-05 14:52:41.000000000 +0000
@@ -1,3 +1,9 @@
+cproto (4.7v) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Feb 2023 09:52:41 -0500
+
 cproto (4.7u) unstable; urgency=low
 
   * maintenance updates
diff -Nru cproto-4.7u/package/debian/copyright cproto-4.7v/package/debian/copyright
--- cproto-4.7u/package/debian/copyright	2022-10-15 12:17:39.000000000 +0000
+++ cproto-4.7v/package/debian/copyright	2023-02-05 14:52:41.000000000 +0000
@@ -11,7 +11,7 @@
 
 Files: aclocal.m4
 Licence: other-BSD
-Copyright:  1994-2021,2022 by Thomas E. Dickey
+Copyright:  1994-2022,2023 by Thomas E. Dickey
     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
@@ -72,7 +72,7 @@
     shared with many OS's install programs.
 
 Files: debian/*
-Copyright:  2010-2021,2022 Thomas E. Dickey
+Copyright:  2010-2022,2023 Thomas E. Dickey
 Licence: other-BSD
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
diff -Nru cproto-4.7u/semantic.c cproto-4.7v/semantic.c
--- cproto-4.7u/semantic.c	2022-10-16 21:16:34.000000000 +0000
+++ cproto-4.7v/semantic.c	2023-02-28 12:48:20.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: semantic.c,v 4.30 2022/10/16 21:16:34 tom Exp $
+/* $Id: semantic.c,v 4.32 2023/02/28 12:48:20 tom Exp $
  *
  * Semantic actions executed by the parser of the
  * C function prototype generator.
@@ -46,7 +46,7 @@
 		TRACE(("updated flags:%s\n", flagsDeclSpec(decl_spec->flags)));
 	    }
 	} else {
-	    new_symbol(function_names, declarator->name, NULL, decl_spec->flags);
+	    new_symbol(function_names, declarator->name, NULL, (int) decl_spec->flags);
 	}
     }
 }
@@ -359,11 +359,14 @@
 	    put_error();
 	    fprintf(stderr, "declared argument \"%s\" is missing\n", d->name);
 	} else {
+#define isPromotable(why) \
+		((decl_spec->flags & (why)) != 0 && \
+		 (decl_spec->flags & (why)) == decl_spec->flags)
 	    decl_spec_text = decl_spec->text;
 	    if (promote_param && strcmp(d->text, d->name) == 0) {
-		if (decl_spec->flags & (DS_CHAR | DS_SHORT))
+		if (isPromotable(DS_CHAR | DS_SHORT))
 		    decl_spec_text = "int";
-		else if (decl_spec->flags & DS_FLOAT)
+		else if (isPromotable(DS_FLOAT))
 		    decl_spec_text = "double";
 	    }
 	    free(p->decl_spec.text);
@@ -812,7 +815,7 @@
     if (decl_list != NULL) {
 	for (d = decl_list->first;; d = d->next) {
 	    if (d->func_def != FUNC_NONE)
-		new_symbol(function_names, d->name, NULL, decl_spec->flags);
+		new_symbol(function_names, d->name, NULL, (int) decl_spec->flags);
 	    if (d == decl_list->last)
 		break;
 	}
diff -Nru cproto-4.7u/testing/alltypes.in cproto-4.7v/testing/alltypes.in
--- cproto-4.7u/testing/alltypes.in	1970-01-01 00:00:00.000000000 +0000
+++ cproto-4.7v/testing/alltypes.in	2023-02-28 11:54:40.000000000 +0000
@@ -0,0 +1,572 @@
+#include <complex.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <wchar.h>
+#include <wctype.h>
+
+_Bool fwd__Bool(
+_Bool a,
+_Bool b)
+{
+return bak__Bool(a, b);
+}
+
+_Bool bak__Bool(a, b)
+_Bool a;
+_Bool b;
+{
+return fwd__Bool(a, b);
+}
+
+float _Complex fwd__Complex(
+float _Complex a,
+float _Complex b)
+{
+return bak__Complex(a, b);
+}
+
+float _Complex bak__Complex(a, b)
+float _Complex a;
+float _Complex b;
+{
+return fwd__Complex(a, b);
+}
+
+_Float128 fwd__Float128(
+_Float128 a,
+_Float128 b)
+{
+return bak__Float128(a, b);
+}
+
+_Float128 bak__Float128(a, b)
+_Float128 a;
+_Float128 b;
+{
+return fwd__Float128(a, b);
+}
+
+__float128 fwd___float128(
+__float128 a,
+__float128 b)
+{
+return bak___float128(a, b);
+}
+
+__float128 bak___float128(a, b)
+__float128 a;
+__float128 b;
+{
+return fwd___float128(a, b);
+}
+
+__int32_t fwd___int32_t(
+__int32_t a,
+__int32_t b)
+{
+return bak___int32_t(a, b);
+}
+
+__int32_t bak___int32_t(a, b)
+__int32_t a;
+__int32_t b;
+{
+return fwd___int32_t(a, b);
+}
+
+__signed fwd___signed(
+__signed a,
+__signed b)
+{
+return bak___signed(a, b);
+}
+
+__signed bak___signed(a, b)
+__signed a;
+__signed b;
+{
+return fwd___signed(a, b);
+}
+
+__signed__ fwd___signed__(
+__signed__ a,
+__signed__ b)
+{
+return bak___signed__(a, b);
+}
+
+__signed__ bak___signed__(a, b)
+__signed__ a;
+__signed__ b;
+{
+return fwd___signed__(a, b);
+}
+
+char fwd_char(
+char a,
+char b)
+{
+return bak_char(a, b);
+}
+
+char bak_char(a, b)
+char a;
+char b;
+{
+return fwd_char(a, b);
+}
+
+clock_t fwd_clock_t(
+clock_t a,
+clock_t b)
+{
+return bak_clock_t(a, b);
+}
+
+clock_t bak_clock_t(a, b)
+clock_t a;
+clock_t b;
+{
+return fwd_clock_t(a, b);
+}
+
+double fwd_double(
+double a,
+double b)
+{
+return bak_double(a, b);
+}
+
+double bak_double(a, b)
+double a;
+double b;
+{
+return fwd_double(a, b);
+}
+
+double_t fwd_double_t(
+double_t a,
+double_t b)
+{
+return bak_double_t(a, b);
+}
+
+double_t bak_double_t(a, b)
+double_t a;
+double_t b;
+{
+return fwd_double_t(a, b);
+}
+
+float fwd_float(
+float a,
+float b)
+{
+return bak_float(a, b);
+}
+
+float bak_float(a, b)
+float a;
+float b;
+{
+return fwd_float(a, b);
+}
+
+float_t fwd_float_t(
+float_t a,
+float_t b)
+{
+return bak_float_t(a, b);
+}
+
+float_t bak_float_t(a, b)
+float_t a;
+float_t b;
+{
+return fwd_float_t(a, b);
+}
+
+fpos_t fwd_fpos_t(
+fpos_t a,
+fpos_t b)
+{
+return bak_fpos_t(a, b);
+}
+
+fpos_t bak_fpos_t(a, b)
+fpos_t a;
+fpos_t b;
+{
+return fwd_fpos_t(a, b);
+}
+
+int fwd_int(
+int a,
+int b)
+{
+return bak_int(a, b);
+}
+
+int bak_int(a, b)
+int a;
+int b;
+{
+return fwd_int(a, b);
+}
+
+int16_t fwd_int16_t(
+int16_t a,
+int16_t b)
+{
+return bak_int16_t(a, b);
+}
+
+int16_t bak_int16_t(a, b)
+int16_t a;
+int16_t b;
+{
+return fwd_int16_t(a, b);
+}
+
+int32_t fwd_int32_t(
+int32_t a,
+int32_t b)
+{
+return bak_int32_t(a, b);
+}
+
+int32_t bak_int32_t(a, b)
+int32_t a;
+int32_t b;
+{
+return fwd_int32_t(a, b);
+}
+
+int64_t fwd_int64_t(
+int64_t a,
+int64_t b)
+{
+return bak_int64_t(a, b);
+}
+
+int64_t bak_int64_t(a, b)
+int64_t a;
+int64_t b;
+{
+return fwd_int64_t(a, b);
+}
+
+int8_t fwd_int8_t(
+int8_t a,
+int8_t b)
+{
+return bak_int8_t(a, b);
+}
+
+int8_t bak_int8_t(a, b)
+int8_t a;
+int8_t b;
+{
+return fwd_int8_t(a, b);
+}
+
+intmax_t fwd_intmax_t(
+intmax_t a,
+intmax_t b)
+{
+return bak_intmax_t(a, b);
+}
+
+intmax_t bak_intmax_t(a, b)
+intmax_t a;
+intmax_t b;
+{
+return fwd_intmax_t(a, b);
+}
+
+intptr_t fwd_intptr_t(
+intptr_t a,
+intptr_t b)
+{
+return bak_intptr_t(a, b);
+}
+
+intptr_t bak_intptr_t(a, b)
+intptr_t a;
+intptr_t b;
+{
+return fwd_intptr_t(a, b);
+}
+
+long fwd_long(
+long a,
+long b)
+{
+return bak_long(a, b);
+}
+
+long bak_long(a, b)
+long a;
+long b;
+{
+return fwd_long(a, b);
+}
+
+ptrdiff_t fwd_ptrdiff_t(
+ptrdiff_t a,
+ptrdiff_t b)
+{
+return bak_ptrdiff_t(a, b);
+}
+
+ptrdiff_t bak_ptrdiff_t(a, b)
+ptrdiff_t a;
+ptrdiff_t b;
+{
+return fwd_ptrdiff_t(a, b);
+}
+
+short fwd_short(
+short a,
+short b)
+{
+return bak_short(a, b);
+}
+
+short bak_short(a, b)
+short a;
+short b;
+{
+return fwd_short(a, b);
+}
+
+sig_atomic_t fwd_sig_atomic_t(
+sig_atomic_t a,
+sig_atomic_t b)
+{
+return bak_sig_atomic_t(a, b);
+}
+
+sig_atomic_t bak_sig_atomic_t(a, b)
+sig_atomic_t a;
+sig_atomic_t b;
+{
+return fwd_sig_atomic_t(a, b);
+}
+
+signed fwd_signed(
+signed a,
+signed b)
+{
+return bak_signed(a, b);
+}
+
+signed bak_signed(a, b)
+signed a;
+signed b;
+{
+return fwd_signed(a, b);
+}
+
+size_t fwd_size_t(
+size_t a,
+size_t b)
+{
+return bak_size_t(a, b);
+}
+
+size_t bak_size_t(a, b)
+size_t a;
+size_t b;
+{
+return fwd_size_t(a, b);
+}
+
+time_t fwd_time_t(
+time_t a,
+time_t b)
+{
+return bak_time_t(a, b);
+}
+
+time_t bak_time_t(a, b)
+time_t a;
+time_t b;
+{
+return fwd_time_t(a, b);
+}
+
+uint16_t fwd_uint16_t(
+uint16_t a,
+uint16_t b)
+{
+return bak_uint16_t(a, b);
+}
+
+uint16_t bak_uint16_t(a, b)
+uint16_t a;
+uint16_t b;
+{
+return fwd_uint16_t(a, b);
+}
+
+uint32_t fwd_uint32_t(
+uint32_t a,
+uint32_t b)
+{
+return bak_uint32_t(a, b);
+}
+
+uint32_t bak_uint32_t(a, b)
+uint32_t a;
+uint32_t b;
+{
+return fwd_uint32_t(a, b);
+}
+
+uint64_t fwd_uint64_t(
+uint64_t a,
+uint64_t b)
+{
+return bak_uint64_t(a, b);
+}
+
+uint64_t bak_uint64_t(a, b)
+uint64_t a;
+uint64_t b;
+{
+return fwd_uint64_t(a, b);
+}
+
+uint8_t fwd_uint8_t(
+uint8_t a,
+uint8_t b)
+{
+return bak_uint8_t(a, b);
+}
+
+uint8_t bak_uint8_t(a, b)
+uint8_t a;
+uint8_t b;
+{
+return fwd_uint8_t(a, b);
+}
+
+uintmax_t fwd_uintmax_t(
+uintmax_t a,
+uintmax_t b)
+{
+return bak_uintmax_t(a, b);
+}
+
+uintmax_t bak_uintmax_t(a, b)
+uintmax_t a;
+uintmax_t b;
+{
+return fwd_uintmax_t(a, b);
+}
+
+uintptr_t fwd_uintptr_t(
+uintptr_t a,
+uintptr_t b)
+{
+return bak_uintptr_t(a, b);
+}
+
+uintptr_t bak_uintptr_t(a, b)
+uintptr_t a;
+uintptr_t b;
+{
+return fwd_uintptr_t(a, b);
+}
+
+unsigned fwd_unsigned(
+unsigned a,
+unsigned b)
+{
+return bak_unsigned(a, b);
+}
+
+unsigned bak_unsigned(a, b)
+unsigned a;
+unsigned b;
+{
+return fwd_unsigned(a, b);
+}
+
+va_list * fwd_va_list(
+va_list * a,
+va_list * b)
+{
+return bak_va_list(a, b);
+}
+
+va_list * bak_va_list(a, b)
+va_list * a;
+va_list * b;
+{
+return fwd_va_list(a, b);
+}
+
+wchar_t fwd_wchar_t(
+wchar_t a,
+wchar_t b)
+{
+return bak_wchar_t(a, b);
+}
+
+wchar_t bak_wchar_t(a, b)
+wchar_t a;
+wchar_t b;
+{
+return fwd_wchar_t(a, b);
+}
+
+wctrans_t fwd_wctrans_t(
+wctrans_t a,
+wctrans_t b)
+{
+return bak_wctrans_t(a, b);
+}
+
+wctrans_t bak_wctrans_t(a, b)
+wctrans_t a;
+wctrans_t b;
+{
+return fwd_wctrans_t(a, b);
+}
+
+wctype_t fwd_wctype_t(
+wctype_t a,
+wctype_t b)
+{
+return bak_wctype_t(a, b);
+}
+
+wctype_t bak_wctype_t(a, b)
+wctype_t a;
+wctype_t b;
+{
+return fwd_wctype_t(a, b);
+}
+
+wint_t fwd_wint_t(
+wint_t a,
+wint_t b)
+{
+return bak_wint_t(a, b);
+}
+
+wint_t bak_wint_t(a, b)
+wint_t a;
+wint_t b;
+{
+return fwd_wint_t(a, b);
+}
diff -Nru cproto-4.7u/testing/alltypes.ref cproto-4.7v/testing/alltypes.ref
--- cproto-4.7u/testing/alltypes.ref	1970-01-01 00:00:00.000000000 +0000
+++ cproto-4.7v/testing/alltypes.ref	2023-02-28 11:53:00.000000000 +0000
@@ -0,0 +1,93 @@
+#include <complex.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <wchar.h>
+#include <wctype.h>
+/* alltypes.c */
+_Bool fwd__Bool(_Bool a, _Bool b);
+_Bool bak__Bool(int a, int b);
+float _Complex fwd__Complex(float _Complex a, float _Complex b);
+float _Complex bak__Complex(float _Complex a, float _Complex b);
+_Float128 fwd__Float128(_Float128 a, _Float128 b);
+_Float128 bak__Float128(_Float128 a, _Float128 b);
+__float128 fwd___float128(__float128 a, __float128 b);
+__float128 bak___float128(__float128 a, __float128 b);
+__int32_t fwd___int32_t(__int32_t a, __int32_t b);
+__int32_t bak___int32_t(__int32_t a, __int32_t b);
+__signed fwd___signed(__signed a, __signed b);
+__signed bak___signed(__signed a, __signed b);
+__signed__ fwd___signed__(__signed__ a, __signed__ b);
+__signed__ bak___signed__(__signed__ a, __signed__ b);
+char fwd_char(char a, char b);
+char bak_char(int a, int b);
+clock_t fwd_clock_t(clock_t a, clock_t b);
+clock_t bak_clock_t(clock_t a, clock_t b);
+double fwd_double(double a, double b);
+double bak_double(double a, double b);
+double_t fwd_double_t(double_t a, double_t b);
+double_t bak_double_t(double_t a, double_t b);
+float fwd_float(float a, float b);
+float bak_float(double a, double b);
+float_t fwd_float_t(float_t a, float_t b);
+float_t bak_float_t(float_t a, float_t b);
+fpos_t fwd_fpos_t(fpos_t a, fpos_t b);
+fpos_t bak_fpos_t(fpos_t a, fpos_t b);
+int fwd_int(int a, int b);
+int bak_int(int a, int b);
+int16_t fwd_int16_t(int16_t a, int16_t b);
+int16_t bak_int16_t(int16_t a, int16_t b);
+int32_t fwd_int32_t(int32_t a, int32_t b);
+int32_t bak_int32_t(int32_t a, int32_t b);
+int64_t fwd_int64_t(int64_t a, int64_t b);
+int64_t bak_int64_t(int64_t a, int64_t b);
+int8_t fwd_int8_t(int8_t a, int8_t b);
+int8_t bak_int8_t(int8_t a, int8_t b);
+intmax_t fwd_intmax_t(intmax_t a, intmax_t b);
+intmax_t bak_intmax_t(intmax_t a, intmax_t b);
+intptr_t fwd_intptr_t(intptr_t a, intptr_t b);
+intptr_t bak_intptr_t(intptr_t a, intptr_t b);
+long fwd_long(long a, long b);
+long bak_long(long a, long b);
+ptrdiff_t fwd_ptrdiff_t(ptrdiff_t a, ptrdiff_t b);
+ptrdiff_t bak_ptrdiff_t(ptrdiff_t a, ptrdiff_t b);
+short fwd_short(short a, short b);
+short bak_short(int a, int b);
+sig_atomic_t fwd_sig_atomic_t(sig_atomic_t a, sig_atomic_t b);
+sig_atomic_t bak_sig_atomic_t(sig_atomic_t a, sig_atomic_t b);
+signed fwd_signed(signed a, signed b);
+signed bak_signed(signed a, signed b);
+size_t fwd_size_t(size_t a, size_t b);
+size_t bak_size_t(size_t a, size_t b);
+time_t fwd_time_t(time_t a, time_t b);
+time_t bak_time_t(time_t a, time_t b);
+uint16_t fwd_uint16_t(uint16_t a, uint16_t b);
+uint16_t bak_uint16_t(uint16_t a, uint16_t b);
+uint32_t fwd_uint32_t(uint32_t a, uint32_t b);
+uint32_t bak_uint32_t(uint32_t a, uint32_t b);
+uint64_t fwd_uint64_t(uint64_t a, uint64_t b);
+uint64_t bak_uint64_t(uint64_t a, uint64_t b);
+uint8_t fwd_uint8_t(uint8_t a, uint8_t b);
+uint8_t bak_uint8_t(uint8_t a, uint8_t b);
+uintmax_t fwd_uintmax_t(uintmax_t a, uintmax_t b);
+uintmax_t bak_uintmax_t(uintmax_t a, uintmax_t b);
+uintptr_t fwd_uintptr_t(uintptr_t a, uintptr_t b);
+uintptr_t bak_uintptr_t(uintptr_t a, uintptr_t b);
+unsigned fwd_unsigned(unsigned a, unsigned b);
+unsigned bak_unsigned(unsigned a, unsigned b);
+va_list *fwd_va_list(va_list *a, va_list *b);
+va_list *bak_va_list(va_list *a, va_list *b);
+wchar_t fwd_wchar_t(wchar_t a, wchar_t b);
+wchar_t bak_wchar_t(wchar_t a, wchar_t b);
+wctrans_t fwd_wctrans_t(wctrans_t a, wctrans_t b);
+wctrans_t bak_wctrans_t(wctrans_t a, wctrans_t b);
+wctype_t fwd_wctype_t(wctype_t a, wctype_t b);
+wctype_t bak_wctype_t(wctype_t a, wctype_t b);
+wint_t fwd_wint_t(wint_t a, wint_t b);
+wint_t bak_wint_t(wint_t a, wint_t b);
diff -Nru cproto-4.7u/testing/alltypes.sh cproto-4.7v/testing/alltypes.sh
--- cproto-4.7u/testing/alltypes.sh	1970-01-01 00:00:00.000000000 +0000
+++ cproto-4.7v/testing/alltypes.sh	2023-02-28 11:55:02.000000000 +0000
@@ -0,0 +1,125 @@
+#!/bin/sh
+# $Id: alltypes.sh,v 4.3 2023/02/28 11:55:02 tom Exp $
+
+: "${top_srcdir:=..}"
+
+PATH=..:$PATH
+
+update_file() {
+	if [ ! -f "$2" ]
+	then
+		echo "... missing $1"
+	elif [ ! -f "$1" ]
+	then
+		echo "... initial $1"
+		cp "$2" "$1"
+	elif cmp -s "$1" "$2"
+	then
+		echo "... same as $1"
+	else
+		echo "... changed $1"
+		diff -c "$2" "$1"
+		[ -w "$2" ] && cp "$2" "$1"
+	fi
+}
+
+mytemp=`mktemp -d`
+trap 'rm -rf "$mytemp"; exit 1' INT QUIT TERM HUP
+trap 'rm -rf "$mytemp"; exit 0' EXIT
+
+TYPES=$top_srcdir/keywords.gperf
+
+source=$mytemp/alltypes.c
+header=$mytemp/alltypes.h
+script=$mytemp/sedscript
+
+rm -f $source
+cat >$source <<EOF
+#include <complex.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <wchar.h>
+#include <wctype.h>
+EOF
+cat $source >$header
+
+cat >$script <<EOF
+/^#/d
+t
+/,/s%,%%g
+t data
+d
+b
+:data
+EOF
+sed -f $script $TYPES | while read typename lex_name comment
+do
+	forward="fwd_$typename"
+	backward="bak_$typename"
+	case $typename in
+	__ibm128)	continue ;;			# PowerPC only
+	_Complex)	typename="float $typename" ;;
+	_Imaginary)	typename="float $typename" ;;
+	va_list)	typename="$typename *" ;;	# an array...
+	esac
+
+	# skip reserved words which are not types
+	case $lex_name in
+	T_ATTRIBUTE)	continue ;;
+	T_AUTO)		continue ;;
+	T_ENUM)		continue ;;
+	T_EXTENSION)	continue ;;
+	T_EXTERN)	continue ;;
+	T_INLINE)	continue ;;
+	T_REGISTER)	continue ;;
+	T_STATIC)	continue ;;
+	T_STRUCT)	continue ;;
+	T_TYPEDEF)	continue ;;
+	T_UNION)	continue ;;
+	T_VA_DCL)	continue ;;
+	T_VOID)		continue ;;
+	T_Imaginary)	continue ;;	# not supported by gcc or clang
+	*)
+		;;
+	esac
+
+	# echo "$typename = $lex_name"
+	cat >>$source <<-EOF
+
+	$typename $forward(
+		$typename a,
+		$typename b)
+	{
+		return $backward(a, b);
+	}
+
+	$typename $backward(a, b)
+		$typename a;
+		$typename b;
+	{
+		return $forward(a, b);
+	}
+	EOF
+done
+
+rm -f alltypes.[co]
+update_file alltypes.in $source
+cat $header >alltypes.c
+cproto $source | sed -e "s,$mytemp/,," >>alltypes.c
+update_file alltypes.ref alltypes.c
+
+if make -f $top_srcdir/Makefile alltypes.o
+then
+	echo success
+else
+	echo failure
+fi
+
+rm -f alltypes.[co]
diff -Nru cproto-4.7u/testing/makefile cproto-4.7v/testing/makefile
--- cproto-4.7u/testing/makefile	2022-10-16 22:01:21.000000000 +0000
+++ cproto-4.7v/testing/makefile	2023-02-25 12:49:38.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: makefile,v 4.10 2022/10/16 22:01:21 tom Exp $
+# $Id: makefile,v 4.11 2023/02/25 12:49:38 tom Exp $
 # make-file for CPROTO test directory
 
 THIS	= cproto
@@ -49,3 +49,7 @@
 check_errors:	$(SOURCES)
 	date >>$@.out
 	$(SHELL) -c '(SHELL="$(SHELL)" TEST_REF="$(TEST_REF)" $(SHELL) ./run_test.sh $@ 2>&1)' |tee -a $@.out
+
+check_types:	$(SOURCES)
+	date >>$@.out
+	$(SHELL) -c '(SHELL="$(SHELL)" TEST_REF="$(TEST_REF)" $(SHELL) ./alltypes.sh $@ 2>&1)' |tee -a $@.out
diff -Nru cproto-4.7u/yyerror.c cproto-4.7v/yyerror.c
--- cproto-4.7u/yyerror.c	2018-05-23 22:18:44.000000000 +0000
+++ cproto-4.7v/yyerror.c	2023-02-28 01:13:22.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Id: yyerror.c,v 4.10 2018/05/23 22:18:44 tom Exp $
+/* $Id: yyerror.c,v 4.11 2023/02/28 01:13:22 tom Exp $
  *
  * This file is included into grammar.y to provide the 'yyerror()' function.
  * If the yacc/bison parser is one that we know how to backtrack, we'll augment
@@ -143,6 +143,7 @@
 
     if (count < 0) {
 	if (used != 0) {
+	    fflush(stdout);
 	    if (used > 1)
 		qsort((char *) vec, used, sizeof(vec[0]), compar);
 	    /* limit length of error message */