diff options
111 files changed, 877 insertions, 482 deletions
@@ -1,3 +1,99 @@ +2021-05-20 Thomas E. Dickey <dickey@invisible-island.net> + + * test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/calc_code_all.tab.c, test/btyacc/calc_code_default.tab.c, test/btyacc/calc_code_imports.tab.c, test/btyacc/calc_code_provides.tab.c, test/btyacc/calc_code_requires.tab.c, test/btyacc/calc_code_top.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c, test/btyacc/code_error.code.c, test/btyacc/code_error.tab.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/rename_debug.c, test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c, test/btyacc/varsyntax_calc1.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/calc_code_all.tab.c, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_imports.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/expr.oxout.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/rename_debug.c, test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c: + regen + + * mkpar.c, reader.c: change printf format to allow for long-YYINT + + * lalr.c, lr0.c: change type, fix gcc warnings + + * verbose.c: change type, fix gcc warnings + also change printf format, to allow for long YYINT + + * output.c: change type, fix gcc warnings + also change printf format, to allow for long-YYINT + + * package/debian/rules, package/byacc.spec: + change max-table-size to correspond with switch of YYINT from short to int + + * defs.h: + change default for MAXTABLE to INT_MAX, like the FreeBSD port. + that requires changing some types to eliminate type-mismatches. + + * configure: regen + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + +2021-05-01 Thomas E. Dickey <dickey@invisible-island.net> + + * aclocal.m4: resync with my-autoconf + +2021-04-30 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-04-30 (repaired) + From: Maciej W. Rozycki <macro@orcam.me.uk> + config.sub: Handle MIPS R3 and R5 ISA levels with CPU names + + Complement binutils commit ae52f4830604 ("Add MIPS r3 and r5 support.") + and recognize MIPS CPU patterns for the R3 and R5 ISA levels, used by + GAS to set defaults. + + * config.sub (mipsisa32r3, mipsisa32r3el, mipsisa32r5, mipsisa32r5el, + mipsisa64r3, mipsisa64r3el, mipsisa64r5, mipsisa64r5el): Recognize. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data: Add test cases. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-04-21 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2021-04-21 (repaired) + From: Vineet Gupta <Vineet.Gupta1@synopsys.com> + Recognize arc64 + + This paves way for setting up arc64 software ecosystem. + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (136 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (853 tests) + PASS: config.sub idempotency checks (790 tests) + PASS: config.sub canonicalise each config.guess testcase (136 tests) + + * config.guess (arc64:Linux:*:*): Recognize. + * config.sub (arc64): Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + * testsuite/config-guess.data: Add a test case for arc64. + * testsuite/config-sub.data (arc64, arc*-elf): Add test cases. + + Signed-off-by: Vineet Gupta <vgupta@synopsys.com> + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-04-16 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-04-16 (repaired) + From: Purple Rain <purplerain@secbsd.org> + config.guess: add SecBSD support + + * config.guess (*:SecBSD:*:*): Recognize. + * doc/config.guess.1: Regenerate. + * testsuite/config-guess.data: Add a test case. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + + * config.sub: 2021-04-16 (repaired) + From: Purple Rain <purplerain@secbsd.org> + config.sub: add SecBSD support + + * config.sub (secbsd*): Recognize. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data: Add x86_64-secbsd. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-03-28 Thomas E. Dickey <dickey@invisible-island.net> * reader.c: ignore bison's "%empty" extension @@ -34,23 +130,251 @@ * aclocal.m4: resync with my-autoconf (adds --enable-stdnoreturn option) +2021-03-10 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-03-10 (repaired) + From: Idan Horo <idan.horowitz@gmail.com> + config.sub: Add support for SerenityOS + + * config.sub (serenity*): Recognize. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data: Add i386-serenity. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-01-25 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-01-25 (repaired) + From: Kalamatee <kalamatee@gmail.com> + config.guess: update AROS system detection + + * config.guess: Recognize *:AROS:*:*. + * doc/config.guess.1: Regenerate. + * testsuite/config-guess.data: Add test cases. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-01-19 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-01-19 (repaired) + From: M. Levinson <mlevins@users.sourceforge.net> + config.guess: fix shell variable quoting bug + + * config.guess (*:NetBSD:*:*): Spell out the full sysctl command twice + instead of using a shell variable. + * doc/config.guess.1: Regenerate. + + Fixes: 827c77253b396c07306927b2a4b794a3251c48eb + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-01-09 Thomas E. Dickey <dickey@invisible-island.net> * package/debian/copyright, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump +2021-01-07 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-01-08 (repaired) + From: Peixing Xin <peixing.xin@windriver.com> + config.sub: recognize four-part configuration name for VxWorks + + For example: + + armv7m-wrs-vxworks-eabihf + armv7-wrs-vxworks-eabihf + i686-wrs-vxworks-simlinux + i686-wrs-vxworks-simwindows + powerpc-wrs-vxworks-spe + x86_64-wrs-vxworks-simlinux + x86_64-wrs-vxworks-simwindows + + * config.sub: Recognize four-part configuration name for VxWorks. + * doc/config.guess.1: Regenerate. + * testsuite/config-sub.data: Add test cases. + + Co-authored-by: John Ericson <git@JohnEricson.me> + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-01-06 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-01-07 (repaired) + From: Alan Modra <amodra@gmail.com> + config.sub: accept OS of eabi* and gnueabi* + + Commit 5e531d391852 broke powerpc-eabivle: + + $ ./config.sub powerpc-eabivle + Invalid configuration `powerpc-eabivle': OS `eabivle' not recognized + + Also powerpc-eabisim and probably some arm configurations. + + * config.sub: Accept OS of eabi* and gnueabi*. + * testsuite/config-sub.data: Add powerpc-eabisim and powerpc-eabivle. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-01-05 Thomas E. Dickey <dickey@invisible-island.net> * configure: regen * aclocal.m4: resync with my-autoconf +2021-01-01 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2021-01-01 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + Update copyright years + + * config.guess: Update copyright years. + * config.sub: Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + +2020-12-31 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2020-12-31 (repaired) + From: Kito Cheng <kito.cheng@sifive.com> + Recognize riscv32be and riscv64be + + Recently RISC-V community got patches big-endian support for binutils, + and we'd like to accept that, however before accepting that I think it + would be better to upstream config.sub and config.guess change here :) + + It's my check result on Ubuntu 18.04: + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (131 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (830 tests) + PASS: config.sub idempotency checks (767 tests) + PASS: config.sub canonicalise each config.guess testcase (131 tests) + + * config.guess (riscv32be:Linux:*:*, riscv64be:Linux:*:*): Recognize. + * config.sub (riscv32be, riscv64be): Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + * testsuite/config-guess.data: Add test cases for riscv32be, and riscv64be. + * testsuite/config-sub.data (riscv32be, riscv64be): Add test cases. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2020-12-03 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2020-12-22 (repaired) + From: Xiaotian Wu <wuxiaotian@loongson.cn> + Recognize loongarch32, loongarch64, and loongarchx32 + + * config.guess (loongarch32:Linux:*:*, loongarch64:Linux:*:*, + loongarchx32:Linux:*:*): Recognize. + * config.sub (loongarch32, loongarch64, loongarchx32): Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + * testsuite/config-guess.data: Add test cases for loongarch32, + loongarch64, and loongarchx32. + * testsuite/config-sub.data (loongarch32, loongarch64, loongarchx32): + Add test cases. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2020-12-01 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2020-12-02 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + config.sub: recognize thumbv7* + + * config.sub (thumbv7*): Recognize. + * testsuite/config-sub.data (thumbv7): New test. + + Reported-by: Karl Berry <karl@freefriends.org> + Link: https://lists.gnu.org/archive/html/config-patches/2020-12/msg00001.html + +2020-11-19 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2020-11-17 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + .gitattributes: specify a custom git merge driver for the ChangeLog file + + * config.guess, config.sub: 2020-11-19 (repaired) + From: Dmitry V. Levin <ldv@altlinux.org> + Update URLs of the latest version of config.guess and config.sub scripts + + Prefer cgit URLs over gitweb as the former are usually served faster: + $ time -f %e wget -q 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess' + 1.06 + $ time -f %e wget -q 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess' + 0.73 + + * config.guess: Prefer cgit URLs over gitweb. + (timestamp): Update. + * config.sub: Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + +2020-11-06 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2020-11-07 (repaired) + From: Ben Elliston <bje@gnu.org> + Update timestamps. + + * config.sub: 2020-10-13 (repaired) + From: Ben Elliston <bje@gnu.org> + * config.sub, config.guess: Replace backtick `..` substitutions + with POSIX $(..) command substitutions throughout. + * Makefile (shellcheck): Don't exclude message SC2006. + + * config.guess: 2020-10-22 (repaired) + From: Ben Elliston <bje@gnu.org> + * config.sub, config.guess: Replace backtick `..` substitutions + with POSIX $(..) command substitutions throughout. + * Makefile (shellcheck): Don't exclude message SC2006. + +2020-10-21 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2020-10-22 + From: Rin Okuyama <rin@netbsd.org> + * config.guess (*:NetBSD:*:*): Handle aarch64eb. + * testsuite/config-guess.data: Add test cases. + + Signed-off-by: Ben Elliston <bje@gnu.org> + +2020-10-14 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2020-10-13 + From: Ben Elliston <bje@gnu.org> + Fix whitespace problem in config.sub. + +2020-10-13 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2020-10-13 + From: Ben Elliston <bje@gnu.org> + * config.sub (i*86-pc-os2-emx): Recognise correctly. + * testsuite/config-sub.data: Add OS/2 tests to avoid regressions. + +2020-09-26 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2020-09-08 + From: Fabrice Fontaine <fontaine.fabrice@gmail.com> + * config.sub (uclinux-uclibc*): Fix detection. + * testsuite/config-sub.data: Add a test case to avoid regression. + + Signed-off-by: Ben Elliston <bje@gnu.org> + 2020-09-22 Thomas E. Dickey <dickey@invisible-island.net> * closure.c, warshall.c: fix undefined-behavior diagnosed with gcc -fsanitize=undefined (report by Alexander Richardson) +2020-09-20 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2020-09-19 + From: Bruno Haible <bruno@clisp.org> + * config.guess: Don't use 'ldd --version' to determine the presence of + musl libc, as this fails on Alpine Linux 3.10. + + Signed-off-by: Ben Elliston <bje@gnu.org> + 2020-09-10 Thomas E. Dickey <dickey@invisible-island.net> * LICENSE: RCS_BASE @@ -98,6 +422,15 @@ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump +2020-09-07 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2020-09-08 + From: Elad Lahav <e2lahav@gmail.com> + * config.sub: Fix regression in QNX recognition. + * testsuite/config-sub.data: Add some test cases. + + Signed-off-by: Ben Elliston <bje@gnu.org> + 2020-08-16 Thomas E. Dickey <dickey@invisible-island.net> * config.guess, config.sub: 2020-08-17 @@ -1,4 +1,4 @@ -MANIFEST for byacc-20210328, version t20210328 +MANIFEST for byacc-20210520, version t20210520 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 @@ -1 +1 @@ -20210328 +20210520 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.52 2021/03/28 15:37:23 tom Exp $ +dnl $Id: aclocal.m4,v 1.53 2021/05/01 21:49:36 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2020,2021 Thomas E. Dickey @@ -491,7 +491,7 @@ AC_SUBST(SHOW_CC) AC_SUBST(ECHO_CC) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_LEAKS version: 8 updated: 2021/01/05 20:05:09 +dnl CF_DISABLE_LEAKS version: 9 updated: 2021/04/03 16:41:50 dnl ---------------- dnl Combine no-leak checks with the libraries or tools that are used for the dnl checks. @@ -504,9 +504,9 @@ AC_REQUIRE([CF_WITH_VALGRIND]) AC_MSG_CHECKING(if you want to perform memory-leak testing) AC_ARG_ENABLE(leaks, [ --disable-leaks test: free permanent memory, analyze leaks], - [enable_leaks=no], + [enable_leaks=$enableval], [enable_leaks=yes]) -dnl TODO - drop with_no_leaks +dnl with_no_leaks is more readable... if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi AC_MSG_RESULT($with_no_leaks) @@ -1726,7 +1726,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59 +dnl CF_XOPEN_SOURCE version: 58 updated: 2021/05/01 17:49:36 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, @@ -1791,7 +1791,15 @@ case "$host_os" in (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[[4-9]]*) +(openbsd[[6-9]]*) + # 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. + AC_MSG_WARN(this system does not provide usable locale support) + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[[4-5]]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 diff --git a/config.guess b/config.guess index 9aff91c..ec94a10 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 2021 Thomas E. Dickey +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-08-17' +timestamp='2021-04-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +28,7 @@ timestamp='2020-08-17' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to <config-patches@gnu.org>. @@ -50,7 +51,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -133,14 +134,12 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,17 +148,29 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include <stdarg.h> + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac @@ -178,12 +189,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -251,6 +262,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-secbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" @@ -575,7 +590,7 @@ EOF exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; @@ -939,7 +954,7 @@ EOF if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; - arc:Linux:*:* | arceb:Linux:*:*) + arc:Linux:*:* | arceb:Linux:*:* | arc64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) @@ -985,6 +1000,9 @@ EOF k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; @@ -1073,7 +1091,7 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-"$LIBC" exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) @@ -1469,8 +1487,8 @@ EOF i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros + *:AROS:*:*) + echo "$UNAME_MACHINE"-unknown-aros exit ;; x86_64:VMkernel:*:*) echo "$UNAME_MACHINE"-unknown-esx @@ -1639,9 +1657,9 @@ This script (version $timestamp), has failed to recognize the operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub EOF year=`echo $timestamp | sed 's,-.*,,'` @@ -1,8 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 2021 Thomas E. Dickey +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-08-17' +timestamp='2021-04-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +34,7 @@ timestamp='2020-08-17' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -67,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1165,7 +1166,7 @@ case $cpu-$vendor in | alphapca5[67] | alpha64pca5[67] \ | am33_2.0 \ | amdgcn \ - | arc | arceb \ + | arc | arceb | arc64 \ | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ @@ -1185,6 +1186,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1203,9 +1205,13 @@ case $cpu-$vendor in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ @@ -1229,7 +1235,7 @@ case $cpu-$vendor in | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | pru \ | pyramid \ - | riscv | riscv32 | riscv64 \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ | rl78 | romp | rs6000 | rx \ | s390 | s390x \ | score \ @@ -1241,6 +1247,7 @@ case $cpu-$vendor in | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1288,6 +1295,10 @@ case $basic_os in kernel=linux os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` ;; + os2-emx) + kernel=os2 + os=`echo $basic_os | sed -e 's|os2-emx|emx|'` + ;; nto-qnx*) kernel=nto os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` @@ -1367,13 +1378,7 @@ case $os in os=psos ;; qnx*) - case $cpu in - x86 | i*86) - ;; - *) - os=nto-$os - ;; - esac + os=qnx ;; hiux*) os=hiuxwe2 @@ -1683,11 +1688,14 @@ fi # Now, validate our (potentially fixed-up) OS. case $os in - # Sometimes we do "kernel-abi", so those need to count as OSes. + # Sometimes we do "kernel-libc", so those need to count as OSes. musl* | newlib* | uclibc*) ;; - # Likewise for "kernel-libc" - eabi | eabihf | gnueabi | gnueabihf) + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) ;; # Now accept the basic system types. # The portable systems comes first. @@ -1704,12 +1712,12 @@ case $os in | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ | mirbsd* | netbsd* | dicos* | openedition* | ose* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ | udi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ | midipix* | mingw32* | mingw64* | mint* \ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ @@ -1722,7 +1730,7 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* ) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1741,6 +1749,8 @@ esac case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) ;; + uclinux-uclibc* ) + ;; -dietlibc* | -newlib* | -musl* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. @@ -1749,8 +1759,12 @@ case $kernel-$os in ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; nto-qnx*) ;; + os2-emx) + ;; *-eabi* | *-gnueabi*) ;; -*) @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20210105. +# Generated by Autoconf 2.52.20210509. # # Copyright 2003-2020,2021 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -782,7 +782,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20210105. Invocation command line was +generated by GNU Autoconf 2.52.20210509. Invocation command line was $ $0 $@ @@ -3654,7 +3654,16 @@ fi # cf_cv_posix_visible (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[4-9]*) +(openbsd[6-9]*) + # 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:3661: 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 + ;; +(openbsd[4-5]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -3681,14 +3690,14 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:3684: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3693: 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 3691 "configure" +#line 3700 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3707,16 +3716,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3719: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3713: \$? = $ac_status" >&5 + echo "$as_me:3722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3716: \"$ac_try\"") >&5 + { (eval echo "$as_me:3725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3719: \$? = $ac_status" >&5 + echo "$as_me:3728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3728,7 +3737,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 3731 "configure" +#line 3740 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3747,16 +3756,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3750: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3753: \$? = $ac_status" >&5 + echo "$as_me:3762: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3756: \"$ac_try\"") >&5 + { (eval echo "$as_me:3765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3759: \$? = $ac_status" >&5 + echo "$as_me:3768: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3771,7 +3780,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3774: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3783: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3901,16 +3910,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3904: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3913: 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}:3910: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3919: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3913 "configure" +#line 3922 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3925,16 +3934,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3928: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3931: \$? = $ac_status" >&5 + echo "$as_me:3940: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3934: \"$ac_try\"") >&5 + { (eval echo "$as_me:3943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3937: \$? = $ac_status" >&5 + echo "$as_me:3946: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -3955,7 +3964,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3958 "configure" +#line 3967 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3970,16 +3979,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3982: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3976: \$? = $ac_status" >&5 + echo "$as_me:3985: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3979: \"$ac_try\"") >&5 + { (eval echo "$as_me:3988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3982: \$? = $ac_status" >&5 + echo "$as_me:3991: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -3990,7 +3999,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:3993: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4002: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3998,10 +4007,10 @@ echo "${as_me:-configure}:3993: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4001: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4010: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4004 "configure" +#line 4013 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4016,16 +4025,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4019: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4022: \$? = $ac_status" >&5 + echo "$as_me:4031: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4025: \"$ac_try\"") >&5 + { (eval echo "$as_me:4034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4028: \$? = $ac_status" >&5 + echo "$as_me:4037: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4041,7 +4050,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4044: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4053: 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 @@ -4235,7 +4244,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:4238: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4247: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4245,7 +4254,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:4248: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4257: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4255,7 +4264,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:4258: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4267: 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" @@ -4265,10 +4274,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4268: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4277: 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 4271 "configure" +#line 4280 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4283,16 +4292,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4286: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4295: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4289: \$? = $ac_status" >&5 + echo "$as_me:4298: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4292: \"$ac_try\"") >&5 + { (eval echo "$as_me:4301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4295: \$? = $ac_status" >&5 + echo "$as_me:4304: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4301,12 +4310,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:4304: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4313: 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 4309 "configure" +#line 4318 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4321,16 +4330,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4324: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4333: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4327: \$? = $ac_status" >&5 + echo "$as_me:4336: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4330: \"$ac_try\"") >&5 + { (eval echo "$as_me:4339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4333: \$? = $ac_status" >&5 + echo "$as_me:4342: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4341,19 +4350,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:4344: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:4353: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4349: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4358: 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 4356 "configure" +#line 4365 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4372,16 +4381,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4375: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4384: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4378: \$? = $ac_status" >&5 + echo "$as_me:4387: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4381: \"$ac_try\"") >&5 + { (eval echo "$as_me:4390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4384: \$? = $ac_status" >&5 + echo "$as_me:4393: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4393,7 +4402,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4396 "configure" +#line 4405 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4412,16 +4421,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4415: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4424: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4418: \$? = $ac_status" >&5 + echo "$as_me:4427: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4421: \"$ac_try\"") >&5 + { (eval echo "$as_me:4430: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4424: \$? = $ac_status" >&5 + echo "$as_me:4433: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4436,7 +4445,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4439: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4448: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4559,7 +4568,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4562: checking for $ac_word" >&5 +echo "$as_me:4571: 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 @@ -4574,7 +4583,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:4577: found $ac_dir/$ac_word" >&5 +echo "$as_me:4586: found $ac_dir/$ac_word" >&5 break done @@ -4582,10 +4591,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:4585: result: $GREP" >&5 + echo "$as_me:4594: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:4588: result: no" >&5 + echo "$as_me:4597: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4593,7 +4602,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:4596: checking for egrep" >&5 +echo "$as_me:4605: 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 @@ -4605,7 +4614,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4608: checking for $ac_word" >&5 +echo "$as_me:4617: 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 @@ -4622,7 +4631,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:4625: found $ac_dir/$ac_word" >&5 + echo "$as_me:4634: found $ac_dir/$ac_word" >&5 break fi done @@ -4633,10 +4642,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:4636: result: $EGREP" >&5 + echo "$as_me:4645: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:4639: result: no" >&5 + echo "$as_me:4648: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4644,12 +4653,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4647: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4656: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:4652: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:4661: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -4659,7 +4668,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:4662: checking how to run the C preprocessor" >&5 +echo "$as_me:4671: 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 @@ -4680,18 +4689,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 4683 "configure" +#line 4692 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4688: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4697: \"$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:4694: \$? = $ac_status" >&5 + echo "$as_me:4703: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4714,17 +4723,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 4717 "configure" +#line 4726 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4721: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4730: \"$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:4727: \$? = $ac_status" >&5 + echo "$as_me:4736: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4761,7 +4770,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:4764: result: $CPP" >&5 +echo "$as_me:4773: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4771,18 +4780,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 4774 "configure" +#line 4783 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4779: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4788: \"$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:4785: \$? = $ac_status" >&5 + echo "$as_me:4794: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4805,17 +4814,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 4808 "configure" +#line 4817 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4812: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4821: \"$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:4818: \$? = $ac_status" >&5 + echo "$as_me:4827: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4843,7 +4852,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:4846: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:4855: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -4858,23 +4867,23 @@ ac_main_return="return" for ac_header in fcntl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4861: checking for $ac_header" >&5 +echo "$as_me:4870: 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 4867 "configure" +#line 4876 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4871: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4880: \"$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:4877: \$? = $ac_status" >&5 + echo "$as_me:4886: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4893,7 +4902,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4896: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:4905: 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 @@ -4908,23 +4917,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4911: checking for $ac_header" >&5 +echo "$as_me:4920: 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 4917 "configure" +#line 4926 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4921: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4930: \"$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:4927: \$? = $ac_status" >&5 + echo "$as_me:4936: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4943,7 +4952,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4946: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:4955: 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 @@ -4953,7 +4962,7 @@ EOF fi done -echo "$as_me:4956: checking for working mkstemp" >&5 +echo "$as_me:4965: 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 @@ -4964,7 +4973,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4967 "configure" +#line 4976 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5005,15 +5014,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5008: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5017: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5011: \$? = $ac_status" >&5 + echo "$as_me:5020: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5013: \"$ac_try\"") >&5 + { (eval echo "$as_me:5022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5016: \$? = $ac_status" >&5 + echo "$as_me:5025: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -5028,16 +5037,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:5031: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:5040: 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:5034: checking for mkstemp" >&5 + echo "$as_me:5043: 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 5040 "configure" +#line 5049 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5068,16 +5077,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5071: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5074: \$? = $ac_status" >&5 + echo "$as_me:5083: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5077: \"$ac_try\"") >&5 + { (eval echo "$as_me:5086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5080: \$? = $ac_status" >&5 + echo "$as_me:5089: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -5087,7 +5096,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5090: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:5099: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -5102,23 +5111,23 @@ fi for ac_header in unistd.h getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5105: checking for $ac_header" >&5 +echo "$as_me:5114: 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 5111 "configure" +#line 5120 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5115: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5124: \"$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:5121: \$? = $ac_status" >&5 + echo "$as_me:5130: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5137,7 +5146,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5140: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5149: 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 @@ -5147,7 +5156,7 @@ EOF fi done -echo "$as_me:5150: checking for header declaring getopt variables" >&5 +echo "$as_me:5159: 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 @@ -5157,7 +5166,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5160 "configure" +#line 5169 "configure" #include "confdefs.h" #include <$cf_header> @@ -5170,16 +5179,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5173: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5176: \$? = $ac_status" >&5 + echo "$as_me:5185: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5179: \"$ac_try\"") >&5 + { (eval echo "$as_me:5188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5182: \$? = $ac_status" >&5 + echo "$as_me:5191: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -5191,7 +5200,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5194: result: $cf_cv_getopt_header" >&5 +echo "$as_me:5203: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -5211,13 +5220,13 @@ fi for ac_func in getopt vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5214: checking for $ac_func" >&5 +echo "$as_me:5223: 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 5220 "configure" +#line 5229 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5248,16 +5257,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5251: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5254: \$? = $ac_status" >&5 + echo "$as_me:5263: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5257: \"$ac_try\"") >&5 + { (eval echo "$as_me:5266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5260: \$? = $ac_status" >&5 + echo "$as_me:5269: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -5267,7 +5276,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5270: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:5279: 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 @@ -5277,7 +5286,7 @@ EOF fi done -echo "$as_me:5280: checking for maximum table size" >&5 +echo "$as_me:5289: checking for maximum table size" >&5 echo $ECHO_N "checking for maximum table size... $ECHO_C" >&6 # Check whether --with-max-table-size or --without-max-table-size was given. @@ -5287,12 +5296,12 @@ if test "${with_max_table_size+set}" = set; then fi; if test -n "$with_max_table_size" then - echo "$as_me:5290: result: $with_max_table_size" >&5 + echo "$as_me:5299: result: $with_max_table_size" >&5 echo "${ECHO_T}$with_max_table_size" >&6 check=`expr "$with_max_table_size" + 0` if test "x$check" != "x$with_max_table_size" then - { { echo "$as_me:5295: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 + { { echo "$as_me:5304: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 echo "$as_me: error: invalid value for --with-max-table-size: $with_max_table_size" >&2;} { (exit 1); exit 1; }; } fi @@ -5302,11 +5311,11 @@ cat >>confdefs.h <<EOF EOF else - echo "$as_me:5305: result: default" >&5 + echo "$as_me:5314: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:5309: checking if backtracking extension is wanted" >&5 +echo "$as_me:5318: checking if backtracking extension is wanted" >&5 echo $ECHO_N "checking if backtracking extension is wanted... $ECHO_C" >&6 # Check whether --enable-btyacc or --disable-btyacc was given. @@ -5314,7 +5323,7 @@ if test "${enable_btyacc+set}" = set; then enableval="$enable_btyacc" fi; -echo "$as_me:5317: result: $enable_btyacc" >&5 +echo "$as_me:5326: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "yes"; then @@ -5327,7 +5336,7 @@ else SKELETON=yaccpar fi -echo "$as_me:5330: checking for fgrep" >&5 +echo "$as_me:5339: 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 @@ -5339,7 +5348,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5342: checking for $ac_word" >&5 +echo "$as_me:5351: 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 @@ -5356,7 +5365,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:5359: found $ac_dir/$ac_word" >&5 + echo "$as_me:5368: found $ac_dir/$ac_word" >&5 break fi done @@ -5367,10 +5376,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:5370: result: $FGREP" >&5 + echo "$as_me:5379: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:5373: result: no" >&5 + echo "$as_me:5382: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5378,16 +5387,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5381: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5390: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:5386: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:5395: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:5390: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:5399: 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. @@ -5404,17 +5413,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:5407: result: $enable_stdnoreturn" >&5 +echo "$as_me:5416: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:5411: checking for C11 _Noreturn feature" >&5 +echo "$as_me:5420: 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 5417 "configure" +#line 5426 "configure" #include "confdefs.h" #include <stdio.h> @@ -5431,16 +5440,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5437: \$? = $ac_status" >&5 + echo "$as_me:5446: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5440: \"$ac_try\"") >&5 + { (eval echo "$as_me:5449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5443: \$? = $ac_status" >&5 + echo "$as_me:5452: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -5451,7 +5460,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5454: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:5463: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -5481,7 +5490,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:5484: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5493: testing repairing CFLAGS: $CFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CFLAGS @@ -5504,11 +5513,11 @@ echo "${as_me:-configure}:5484: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:5507: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5516: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5511: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5520: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -5520,7 +5529,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5523: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5532: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CPPFLAGS @@ -5543,11 +5552,11 @@ echo "${as_me:-configure}:5523: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5546: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5555: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5550: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5559: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -5559,7 +5568,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5562: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5571: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $LDFLAGS @@ -5582,17 +5591,17 @@ echo "${as_me:-configure}:5562: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5585: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5594: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5589: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5598: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac fi -echo "$as_me:5595: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:5604: 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. @@ -5609,14 +5618,14 @@ else enable_warnings=no fi; -echo "$as_me:5612: result: $enable_warnings" >&5 +echo "$as_me:5621: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then if test "x$have_x" = xyes; then echo "skipping X-const check"; fi cat > "conftest.$ac_ext" <<EOF -#line 5619 "${as_me:-configure}" +#line 5628 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF if test "$INTEL_COMPILER" = yes @@ -5632,7 +5641,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:5635: checking for $CC warning options..." >&5 + { echo "$as_me:5644: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -5648,12 +5657,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5651: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5654: \$? = $ac_status" >&5 + echo "$as_me:5663: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5656: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5665: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -5661,7 +5670,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:5664: checking for $CC warning options..." >&5 + { echo "$as_me:5673: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -5684,12 +5693,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wwrite-strings do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5687: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5690: \$? = $ac_status" >&5 + echo "$as_me:5699: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5692: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5701: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -5697,7 +5706,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5700: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5709: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5707,7 +5716,7 @@ echo "${as_me:-configure}:5700: testing feature is broken in gcc $GCC_VERSION .. ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5710: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5740,10 +5749,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:5743: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:5752: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <<EOF -#line 5746 "${as_me:-configure}" +#line 5755 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -5792,12 +5801,12 @@ EOF ;; esac - if { (eval echo "$as_me:5795: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5798: \$? = $ac_status" >&5 + echo "$as_me:5807: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5800: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:5809: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -5858,7 +5867,7 @@ fi fi -echo "$as_me:5861: checking if you want to see long compiling messages" >&5 +echo "$as_me:5870: 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. @@ -5892,10 +5901,10 @@ else ECHO_CC='' fi; -echo "$as_me:5895: result: $enableval" >&5 +echo "$as_me:5904: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:5898: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:5907: 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. @@ -5912,7 +5921,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:5915: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:5924: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6026,23 +6035,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6029: checking for dmalloc.h" >&5 + echo "$as_me:6038: 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 6035 "configure" +#line 6044 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:6039: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6048: \"$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:6045: \$? = $ac_status" >&5 + echo "$as_me:6054: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6061,11 +6070,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6064: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6073: 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:6068: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6077: 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 @@ -6073,7 +6082,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6076 "configure" +#line 6085 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6092,16 +6101,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6095: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6098: \$? = $ac_status" >&5 + echo "$as_me:6107: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6101: \"$ac_try\"") >&5 + { (eval echo "$as_me:6110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6104: \$? = $ac_status" >&5 + echo "$as_me:6113: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6112,7 +6121,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6115: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6124: 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 @@ -6127,7 +6136,7 @@ fi fi -echo "$as_me:6130: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:6139: 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. @@ -6144,7 +6153,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:6147: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6156: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6258,23 +6267,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6261: checking for dbmalloc.h" >&5 + echo "$as_me:6270: 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 6267 "configure" +#line 6276 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:6271: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6280: \"$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:6277: \$? = $ac_status" >&5 + echo "$as_me:6286: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6293,11 +6302,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6296: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6305: 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:6300: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6309: 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 @@ -6305,7 +6314,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6308 "configure" +#line 6317 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6324,16 +6333,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6336: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6330: \$? = $ac_status" >&5 + echo "$as_me:6339: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6333: \"$ac_try\"") >&5 + { (eval echo "$as_me:6342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6336: \$? = $ac_status" >&5 + echo "$as_me:6345: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6344,7 +6353,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6347: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6356: 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 @@ -6359,7 +6368,7 @@ fi fi -echo "$as_me:6362: checking if you want to use valgrind for testing" >&5 +echo "$as_me:6371: 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. @@ -6376,7 +6385,7 @@ EOF else with_valgrind= fi; -echo "$as_me:6379: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6388: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -6489,18 +6498,18 @@ fi ;; esac -echo "$as_me:6492: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6501: 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. if test "${enable_leaks+set}" = set; then enableval="$enable_leaks" - enable_leaks=no + enable_leaks=$enableval else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:6503: result: $with_no_leaks" >&5 +echo "$as_me:6512: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -6517,7 +6526,7 @@ fi # Extract the first word of "groff", so it can be a program name with args. set dummy groff; ac_word=$2 -echo "$as_me:6520: checking for $ac_word" >&5 +echo "$as_me:6529: 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 @@ -6534,7 +6543,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:6537: found $ac_dir/$ac_word" >&5 + echo "$as_me:6546: found $ac_dir/$ac_word" >&5 break fi done @@ -6546,10 +6555,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6549: result: $GROFF_PATH" >&5 + echo "$as_me:6558: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6552: result: no" >&5 + echo "$as_me:6561: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6557,7 +6566,7 @@ for ac_prog in nroff mandoc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:6560: checking for $ac_word" >&5 +echo "$as_me:6569: 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 @@ -6574,7 +6583,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:6577: found $ac_dir/$ac_word" >&5 + echo "$as_me:6586: found $ac_dir/$ac_word" >&5 break fi done @@ -6585,10 +6594,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:6588: result: $NROFF_PATH" >&5 + echo "$as_me:6597: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:6591: result: no" >&5 + echo "$as_me:6600: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6598,7 +6607,7 @@ test -n "$NROFF_PATH" || NROFF_PATH="no" # Extract the first word of "tbl", so it can be a program name with args. set dummy tbl; ac_word=$2 -echo "$as_me:6601: checking for $ac_word" >&5 +echo "$as_me:6610: 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 @@ -6615,7 +6624,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TBL_PATH="$ac_dir/$ac_word" - echo "$as_me:6618: found $ac_dir/$ac_word" >&5 + echo "$as_me:6627: found $ac_dir/$ac_word" >&5 break fi done @@ -6627,10 +6636,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:6630: result: $TBL_PATH" >&5 + echo "$as_me:6639: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:6633: result: no" >&5 + echo "$as_me:6642: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6650,7 +6659,7 @@ case "x${with_man2html}" in (x|xyes) # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:6653: checking for $ac_word" >&5 +echo "$as_me:6662: 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 @@ -6667,7 +6676,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:6670: found $ac_dir/$ac_word" >&5 + echo "$as_me:6679: found $ac_dir/$ac_word" >&5 break fi done @@ -6679,16 +6688,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6682: result: $cf_man2html" >&5 + echo "$as_me:6691: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6685: result: no" >&5 + echo "$as_me:6694: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:6691: checking for the modified Earl Hood script" >&5 + echo "$as_me:6700: 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 @@ -6697,7 +6706,7 @@ echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 cf_man2html=no cf_man2html_ok=no fi - echo "$as_me:6700: result: $cf_man2html_ok" >&5 + echo "$as_me:6709: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6706,7 +6715,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6709: checking for program to convert manpage to html" >&5 +echo "$as_me:6718: 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. @@ -6721,11 +6730,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6724: result: man2html" >&5 + echo "$as_me:6733: 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:6728: checking for $ac_word" >&5 +echo "$as_me:6737: 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 @@ -6742,7 +6751,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:6745: found $ac_dir/$ac_word" >&5 + echo "$as_me:6754: found $ac_dir/$ac_word" >&5 break fi done @@ -6754,10 +6763,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6757: result: $cf_man2html" >&5 + echo "$as_me:6766: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6760: result: no" >&5 + echo "$as_me:6769: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6765,11 +6774,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6768: result: $cf_man2html" >&5 + echo "$as_me:6777: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6772: result: $cf_man2html" >&5 + echo "$as_me:6781: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6810,12 +6819,12 @@ else # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:6813: checking if nroff is really groff" >&5 + echo "$as_me:6822: 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:6818: result: $cf_check_groff" >&5 + echo "$as_me:6827: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -6846,14 +6855,14 @@ case ".$cf_man2html" in cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6849: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:6858: 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:6856: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:6865: 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 @@ -6871,10 +6880,10 @@ CF_EOF cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"` cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot" - echo "$as_me:6874: result: $cf_man2html_top_bot" >&5 + echo "$as_me:6883: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:6877: checking for pagesize to use" >&5 + echo "$as_me:6886: 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 @@ -6899,7 +6908,7 @@ CF_EOF test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:6902: result: $cf_man2html_page" >&5 + echo "$as_me:6911: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <<CF_EOF @@ -6918,13 +6927,13 @@ fi chmod 700 $MAN2HTML_TEMP -echo "$as_me:6921: checking for ANSI C header files" >&5 +echo "$as_me:6930: 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 6927 "configure" +#line 6936 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6932,13 +6941,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:6935: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6944: \"$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:6941: \$? = $ac_status" >&5 + echo "$as_me:6950: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6960,7 +6969,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6963 "configure" +#line 6972 "configure" #include "confdefs.h" #include <string.h> @@ -6978,7 +6987,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6981 "configure" +#line 6990 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6999,7 +7008,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 7002 "configure" +#line 7011 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -7025,15 +7034,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7028: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7037: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7031: \$? = $ac_status" >&5 + echo "$as_me:7040: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7033: \"$ac_try\"") >&5 + { (eval echo "$as_me:7042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7036: \$? = $ac_status" >&5 + echo "$as_me:7045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7046,7 +7055,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:7049: result: $ac_cv_header_stdc" >&5 +echo "$as_me:7058: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -7062,28 +7071,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7065: checking for $ac_header" >&5 +echo "$as_me:7074: 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 7071 "configure" +#line 7080 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7077: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7080: \$? = $ac_status" >&5 + echo "$as_me:7089: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7083: \"$ac_try\"") >&5 + { (eval echo "$as_me:7092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7086: \$? = $ac_status" >&5 + echo "$as_me:7095: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -7093,7 +7102,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7096: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7105: 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 @@ -7103,13 +7112,13 @@ EOF fi done -echo "$as_me:7106: checking for mode_t" >&5 +echo "$as_me:7115: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7112 "configure" +#line 7121 "configure" #include "confdefs.h" $ac_includes_default int @@ -7124,16 +7133,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7136: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7130: \$? = $ac_status" >&5 + echo "$as_me:7139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7133: \"$ac_try\"") >&5 + { (eval echo "$as_me:7142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7136: \$? = $ac_status" >&5 + echo "$as_me:7145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -7143,7 +7152,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7146: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:7155: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test "$ac_cv_type_mode_t" = yes; then : @@ -7236,7 +7245,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:7239: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7248: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -7367,7 +7376,7 @@ EOF cat >>"$CONFIG_STATUS" <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20210105, +configured by $0, generated by GNU Autoconf 2.52.20210509, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 2003-2020,2021 Thomas E. Dickey @@ -7412,7 +7421,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7415: error: ambiguous option: $1 + { { echo "$as_me:7424: 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;} @@ -7431,7 +7440,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7434: error: unrecognized option: $1 + -*) { { echo "$as_me:7443: 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;} @@ -7450,7 +7459,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20210105, executed with +This file was extended by $as_me 2.52.20210509, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -7468,7 +7477,7 @@ do # Handling of arguments. "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; - *) { { echo "$as_me:7471: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:7480: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7738,7 +7747,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7741: creating $ac_file" >&5 + { echo "$as_me:7750: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7756,7 +7765,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7759: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7768: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7769,7 +7778,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7772: error: cannot find input file: $f" >&5 + { { echo "$as_me:7781: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7785,7 +7794,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:7788: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:7797: 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;} @@ -7794,7 +7803,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:7797: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:7806: 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;} @@ -7831,7 +7840,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:7834: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:7843: 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;} @@ -7842,7 +7851,7 @@ $ac_seen" >&2;} ${EGREP-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:7845: WARNING: Some variables may not be substituted: + { echo "$as_me:7854: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -7891,7 +7900,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:7894: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:7903: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -7902,7 +7911,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7905: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7914: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7915,7 +7924,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7918: error: cannot find input file: $f" >&5 + { { echo "$as_me:7927: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8033,7 +8042,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:8036: $ac_file is unchanged" >&5 + { echo "$as_me:8045: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.68 2021/03/28 17:42:58 tom Exp $ */ +/* $Id: defs.h,v 1.69 2021/05/20 23:39:26 tom Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -48,7 +48,7 @@ #define MAXCHAR UCHAR_MAX #ifndef MAXTABLE -#define MAXTABLE 32500 +#define MAXTABLE INT_MAX #endif #if MAXTABLE <= SHRT_MAX #define YYINT short @@ -58,6 +58,10 @@ #define YYINT int #define MAXYYINT INT_MAX #define MINYYINT INT_MIN +#elif MAXTABLE <= LONG_MAX +#define YYINT long +#define MAXYYINT LONG_MAX +#define MINYYINT LONG_MIN #else #error "MAXTABLE is too large for this machine architecture!" #endif @@ -379,7 +383,7 @@ extern char *nullable; extern bucket *first_symbol; extern bucket *last_symbol; -extern int nstates; +extern Value_t nstates; extern core *first_state; extern shifts *first_shift; extern reductions *first_reduction; @@ -1,4 +1,4 @@ -/* $Id: lalr.c,v 1.13 2020/09/10 17:26:21 tom Exp $ */ +/* $Id: lalr.c,v 1.14 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -41,7 +41,7 @@ Value_t *to_state; static Value_t infinity; static int maxrhs; -static int ngotos; +static Value_t ngotos; static unsigned *F; static Value_t **includes; static shorts **lookback; @@ -1,4 +1,4 @@ -/* $Id: lr0.c,v 1.20 2020/09/10 17:30:37 tom Exp $ */ +/* $Id: lr0.c,v 1.21 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -16,7 +16,7 @@ static void save_shifts(void); static void set_derives(void); static void set_nullable(void); -int nstates; +Value_t nstates; core *first_state; shifts *first_shift; reductions *first_reduction; @@ -1,4 +1,4 @@ -/* $Id: mkpar.c,v 1.17 2020/09/10 17:37:33 tom Exp $ */ +/* $Id: mkpar.c,v 1.18 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -220,7 +220,7 @@ unused_rules(void) if (nunused == 1) fprintf(stderr, "%s: 1 rule never reduced\n", myname); else - fprintf(stderr, "%s: %d rules never reduced\n", myname, nunused); + fprintf(stderr, "%s: %ld rules never reduced\n", myname, (long)nunused); } } @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.94 2020/09/10 20:24:30 tom Exp $ */ +/* $Id: output.c,v 1.95 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -442,7 +442,7 @@ token_actions(void) Value_t csym = -1; Value_t cbase = 0; #endif - int max, min; + Value_t max, min; Value_t *actionrow, *r, *s; action *p; @@ -834,7 +834,7 @@ pack_vector(int vector) { int i, j, k, l; int t; - int loc; + Value_t loc; int ok; Value_t *from; Value_t *to; @@ -1051,7 +1051,7 @@ output_table(void) if (high >= MAXYYINT) { fprintf(stderr, "YYTABLESIZE: %ld\n", high); - fprintf(stderr, "Table is longer than %d elements.\n", MAXYYINT); + fprintf(stderr, "Table is longer than %ld elements.\n", (long)MAXYYINT); done(1); } @@ -1259,14 +1259,14 @@ output_defines(FILE * fp) } if (fp == code_file) ++outline; - fprintf(fp, " %d\n", symbol_value[i]); + fprintf(fp, " %ld\n", (long)symbol_value[i]); } } if (fp == code_file) ++outline; if (fp != defines_file || iflag) - fprintf(fp, "#define YYERRCODE %d\n", symbol_value[1]); + fprintf(fp, "#define YYERRCODE %ld\n", (long)symbol_value[1]); if (fp == defines_file) { @@ -1343,7 +1343,7 @@ output_debug(void) const char *s; ++outline; - fprintf(code_file, "#define YYFINAL %d\n", final_state); + fprintf(code_file, "#define YYFINAL %ld\n", (long)final_state); outline += output_yydebug(code_file); diff --git a/package/byacc.spec b/package/byacc.spec index 1a6c697..20ebe49 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,9 +1,9 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc %define AltProgram btyacc -%define AppVersion 20210328 +%define AppVersion 20210520 %define UseProgram yacc -# $Id: byacc.spec,v 1.53 2021/03/28 15:15:53 tom Exp $ +# $Id: byacc.spec,v 1.55 2021/05/20 23:47:46 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 @@ -68,7 +68,7 @@ CONFIGURE_TOP=%{my_srcdir} \ %configure %{CFG_OPTS} \ --enable-btyacc \ --program-prefix=bt \ - --with-max-table-size=18000 \ + --with-max-table-size=123456 \ --program-transform-name='s,\^,bt,' make popd diff --git a/package/debian/changelog b/package/debian/changelog index 4c5060c..510b3f9 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +byacc (20210520) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 20 May 2021 15:25:00 -0400 + byacc (20210328) unstable; urgency=low * maintenance updates diff --git a/package/debian/rules b/package/debian/rules index a9fb6b1..0ce508e 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# $Id: rules,v 1.4 2021/03/28 15:15:33 tom Exp $ +# $Id: rules,v 1.5 2021/05/20 23:48:03 tom Exp $ # # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -72,7 +72,7 @@ config-btyacc-stamp: mkdir -p $(BTYACC_TMP) cd $(BTYACC_TMP); $(configure) \ --enable-btyacc \ - --with-max-table-size=18000 \ + --with-max-table-size=123456 \ --program-transform-name='s,^,bt,' touch $@ diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index 34a4427..ade63a6 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,8 +1,8 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc -%define AppVersion 20210328 +%define AppVersion 20210520 %define UseProgram yacc -# $Id: mingw-byacc.spec,v 1.32 2021/03/28 15:14:10 tom Exp $ +# $Id: mingw-byacc.spec,v 1.33 2021/05/20 19:25:00 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index db35b3a..699637e 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $ # -DISTNAME= byacc-20210328 +DISTNAME= byacc-20210520 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.invisible-island.net/byacc/ @@ -1,4 +1,4 @@ -/* $Id: reader.c,v 1.87 2021/03/28 17:58:37 tom Exp $ */ +/* $Id: reader.c,v 1.88 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -2687,7 +2687,7 @@ copy_action(void) trialaction = (*cptr == L_BRAC); #endif - fprintf(f, "case %d:\n", nrules - 2); + fprintf(f, "case %ld:\n", (long)(nrules - 2)); #if defined(YYBTYACC) if (backtrack) { @@ -2759,10 +2759,12 @@ copy_action(void) else if (i > maxoffset) { dollar_warning(d_lineno, i); - fprintf(f, "yystack.l_mark[%d].%s", i - maxoffset, tag); + fprintf(f, "yystack.l_mark[%ld].%s", + (long)(i - maxoffset), tag); } else if (offsets) - fprintf(f, "yystack.l_mark[%d].%s", offsets[i], tag); + fprintf(f, "yystack.l_mark[%ld].%s", + (long)offsets[i], tag); FREE(d_line); goto loop; } @@ -2820,7 +2822,7 @@ copy_action(void) tag = rhs[offsets[i]]->tag; if (tag == 0) untyped_rhs(i, rhs[offsets[i]]->name); - fprintf(f, "yystack.l_mark[%d].%s", offsets[i], tag); + fprintf(f, "yystack.l_mark[%ld].%s", (long)offsets[i], tag); } else { @@ -2829,10 +2831,10 @@ copy_action(void) else if (i > maxoffset) { dollar_warning(lineno, i); - fprintf(f, "yystack.l_mark[%d]", i - maxoffset); + fprintf(f, "yystack.l_mark[%ld]", (long)(i - maxoffset)); } else if (offsets) - fprintf(f, "yystack.l_mark[%d]", offsets[i]); + fprintf(f, "yystack.l_mark[%ld]", (long)offsets[i]); } goto loop; } diff --git a/test/btyacc/btyacc_calc1.tab.c b/test/btyacc/btyacc_calc1.tab.c index 61be014..3f704f4 100644 --- a/test/btyacc/btyacc_calc1.tab.c +++ b/test/btyacc/btyacc_calc1.tab.c @@ -196,7 +196,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 0, 0, 0, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, diff --git a/test/btyacc/btyacc_demo.tab.c b/test/btyacc/btyacc_demo.tab.c index 2ad2468..4e98858 100644 --- a/test/btyacc/btyacc_demo.tab.c +++ b/test/btyacc/btyacc_demo.tab.c @@ -231,7 +231,7 @@ extern int YYPARSE_DECL(); #define ELSE 268 #define CLCL 269 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT demo_lhs[] = { -1, 15, 15, 15, 12, 18, 0, 4, 19, 4, 2, 20, 2, 10, 10, 13, 13, 11, 11, 11, 11, diff --git a/test/btyacc/btyacc_destroy1.tab.c b/test/btyacc/btyacc_destroy1.tab.c index 119d488..d423fe0 100644 --- a/test/btyacc/btyacc_destroy1.tab.c +++ b/test/btyacc/btyacc_destroy1.tab.c @@ -202,7 +202,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT destroy1_lhs[] = { -1, 0, 0, 2, 2, 3, 3, 4, 4, 1, }; diff --git a/test/btyacc/btyacc_destroy2.tab.c b/test/btyacc/btyacc_destroy2.tab.c index 7a6f29b..a49a6b0 100644 --- a/test/btyacc/btyacc_destroy2.tab.c +++ b/test/btyacc/btyacc_destroy2.tab.c @@ -202,7 +202,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT destroy2_lhs[] = { -1, 0, 0, 2, 2, 3, 3, 4, 4, 1, }; diff --git a/test/btyacc/btyacc_destroy3.tab.c b/test/btyacc/btyacc_destroy3.tab.c index 8d810b4..9e23ca9 100644 --- a/test/btyacc/btyacc_destroy3.tab.c +++ b/test/btyacc/btyacc_destroy3.tab.c @@ -202,7 +202,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT destroy3_lhs[] = { -1, 0, 0, 2, 2, 3, 3, 4, 4, 1, }; diff --git a/test/btyacc/calc.tab.c b/test/btyacc/calc.tab.c index f7cbed3..f6d35f7 100644 --- a/test/btyacc/calc.tab.c +++ b/test/btyacc/calc.tab.c @@ -170,7 +170,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc1.tab.c b/test/btyacc/calc1.tab.c index 16a719c..d155667 100644 --- a/test/btyacc/calc1.tab.c +++ b/test/btyacc/calc1.tab.c @@ -195,7 +195,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, diff --git a/test/btyacc/calc2.tab.c b/test/btyacc/calc2.tab.c index a3a5794..1d7ad9d 100644 --- a/test/btyacc/calc2.tab.c +++ b/test/btyacc/calc2.tab.c @@ -172,7 +172,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc3.tab.c b/test/btyacc/calc3.tab.c index 73df2f4..0ad86ef 100644 --- a/test/btyacc/calc3.tab.c +++ b/test/btyacc/calc3.tab.c @@ -177,7 +177,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_all.tab.c b/test/btyacc/calc_code_all.tab.c index 79b5f92..21a2ffd 100644 --- a/test/btyacc/calc_code_all.tab.c +++ b/test/btyacc/calc_code_all.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_all_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_default.tab.c b/test/btyacc/calc_code_default.tab.c index 88108e8..bda0455 100644 --- a/test/btyacc/calc_code_default.tab.c +++ b/test/btyacc/calc_code_default.tab.c @@ -170,7 +170,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_default_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_imports.tab.c b/test/btyacc/calc_code_imports.tab.c index 58f7fa4..9a34727 100644 --- a/test/btyacc/calc_code_imports.tab.c +++ b/test/btyacc/calc_code_imports.tab.c @@ -170,7 +170,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_imports_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_provides.tab.c b/test/btyacc/calc_code_provides.tab.c index 559ffb9..0b5eeee 100644 --- a/test/btyacc/calc_code_provides.tab.c +++ b/test/btyacc/calc_code_provides.tab.c @@ -170,7 +170,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_provides_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_requires.tab.c b/test/btyacc/calc_code_requires.tab.c index 1ad1103..4588cab 100644 --- a/test/btyacc/calc_code_requires.tab.c +++ b/test/btyacc/calc_code_requires.tab.c @@ -170,7 +170,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_requires_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/calc_code_top.tab.c b/test/btyacc/calc_code_top.tab.c index ac993dd..aa610dc 100644 --- a/test/btyacc/calc_code_top.tab.c +++ b/test/btyacc/calc_code_top.tab.c @@ -178,7 +178,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_top_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/code_calc.code.c b/test/btyacc/code_calc.code.c index 69c223e..52f068d 100644 --- a/test/btyacc/code_calc.code.c +++ b/test/btyacc/code_calc.code.c @@ -182,7 +182,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern const YYINT yylhs[]; extern const YYINT yylen[]; extern const YYINT yydefred[]; diff --git a/test/btyacc/code_calc.tab.c b/test/btyacc/code_calc.tab.c index 6486b83..c6c5048 100644 --- a/test/btyacc/code_calc.tab.c +++ b/test/btyacc/code_calc.tab.c @@ -1,7 +1,7 @@ #undef YYBTYACC #define YYBTYACC 0 #define YYDEBUGSTR YYPREFIX "debug" -typedef short YYINT; +typedef int YYINT; const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/code_error.code.c b/test/btyacc/code_error.code.c index cd27bb6..f48e6ff 100644 --- a/test/btyacc/code_error.code.c +++ b/test/btyacc/code_error.code.c @@ -172,7 +172,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern const YYINT yylhs[]; extern const YYINT yylen[]; extern const YYINT yydefred[]; diff --git a/test/btyacc/code_error.tab.c b/test/btyacc/code_error.tab.c index 88cff35..1037951 100644 --- a/test/btyacc/code_error.tab.c +++ b/test/btyacc/code_error.tab.c @@ -1,7 +1,7 @@ #undef YYBTYACC #define YYBTYACC 0 #define YYDEBUGSTR YYPREFIX "debug" -typedef short YYINT; +typedef int YYINT; const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/btyacc/defines1.calc.c b/test/btyacc/defines1.calc.c index f22d5e1..4f2d934 100644 --- a/test/btyacc/defines1.calc.c +++ b/test/btyacc/defines1.calc.c @@ -77,7 +77,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/defines2.calc.c b/test/btyacc/defines2.calc.c index f22d5e1..4f2d934 100644 --- a/test/btyacc/defines2.calc.c +++ b/test/btyacc/defines2.calc.c @@ -77,7 +77,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/defines3.calc.c b/test/btyacc/defines3.calc.c index 66ee333..2fd7e43 100644 --- a/test/btyacc/defines3.calc.c +++ b/test/btyacc/defines3.calc.c @@ -77,7 +77,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/empty.tab.c b/test/btyacc/empty.tab.c index 8544a10..d3def15 100644 --- a/test/btyacc/empty.tab.c +++ b/test/btyacc/empty.tab.c @@ -164,7 +164,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT empty_lhs[] = { -1, 0, }; diff --git a/test/btyacc/err_inherit3.tab.c b/test/btyacc/err_inherit3.tab.c index 539cf0b..ada2809 100644 --- a/test/btyacc/err_inherit3.tab.c +++ b/test/btyacc/err_inherit3.tab.c @@ -197,7 +197,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_inherit3_lhs[] = { -1, 5, 6, 0, 0, 3, 3, 4, 4, 7, 1, 1, 8, 2, diff --git a/test/btyacc/err_inherit4.tab.c b/test/btyacc/err_inherit4.tab.c index c70174d..705f6b1 100644 --- a/test/btyacc/err_inherit4.tab.c +++ b/test/btyacc/err_inherit4.tab.c @@ -219,7 +219,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_inherit4_lhs[] = { -1, 5, 6, 0, 0, 3, 3, 4, 4, 1, 1, 2, diff --git a/test/btyacc/err_syntax10.tab.c b/test/btyacc/err_syntax10.tab.c index b75222f..0150299 100644 --- a/test/btyacc/err_syntax10.tab.c +++ b/test/btyacc/err_syntax10.tab.c @@ -154,7 +154,7 @@ static void yyerror(const char *); extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax10_lhs[] = { -1, 0, }; diff --git a/test/btyacc/err_syntax11.tab.c b/test/btyacc/err_syntax11.tab.c index ae01b80..8d6443d 100644 --- a/test/btyacc/err_syntax11.tab.c +++ b/test/btyacc/err_syntax11.tab.c @@ -160,7 +160,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax11_lhs[] = { -1, 0, }; diff --git a/test/btyacc/err_syntax12.tab.c b/test/btyacc/err_syntax12.tab.c index 0ccb479..2c18b25 100644 --- a/test/btyacc/err_syntax12.tab.c +++ b/test/btyacc/err_syntax12.tab.c @@ -161,7 +161,7 @@ extern int YYPARSE_DECL(); #define text 456 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax12_lhs[] = { -1, 0, }; diff --git a/test/btyacc/err_syntax18.tab.c b/test/btyacc/err_syntax18.tab.c index 8244222..ee82f93 100644 --- a/test/btyacc/err_syntax18.tab.c +++ b/test/btyacc/err_syntax18.tab.c @@ -160,7 +160,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax18_lhs[] = { -1, 0, }; diff --git a/test/btyacc/err_syntax20.tab.c b/test/btyacc/err_syntax20.tab.c index 8351add..60528bb 100644 --- a/test/btyacc/err_syntax20.tab.c +++ b/test/btyacc/err_syntax20.tab.c @@ -155,7 +155,7 @@ extern int YYPARSE_DECL(); #define recur 257 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax20_lhs[] = { -1, 0, }; diff --git a/test/btyacc/error.tab.c b/test/btyacc/error.tab.c index f300fb2..78f95d2 100644 --- a/test/btyacc/error.tab.c +++ b/test/btyacc/error.tab.c @@ -160,7 +160,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/btyacc/expr.oxout.tab.c b/test/btyacc/expr.oxout.tab.c index ddf2264..3de0148 100644 --- a/test/btyacc/expr.oxout.tab.c +++ b/test/btyacc/expr.oxout.tab.c @@ -198,7 +198,7 @@ extern int YYPARSE_DECL(); #define ID 257 #define CONST 258 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT expr.oxout_lhs[] = { -1, 2, 0, 1, 3, 3, 3, 3, 3, 3, 3, }; diff --git a/test/btyacc/grammar.tab.c b/test/btyacc/grammar.tab.c index 433be20..005fb20 100644 --- a/test/btyacc/grammar.tab.c +++ b/test/btyacc/grammar.tab.c @@ -474,7 +474,7 @@ extern int YYPARSE_DECL(); #define T_ASMARG 290 #define T_VA_DCL 291 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT grammar_lhs[] = { -1, 0, 0, 26, 26, 27, 27, 27, 27, 27, 27, 27, 31, 30, 30, 28, 28, 34, 28, 32, 32, diff --git a/test/btyacc/inherit0.tab.c b/test/btyacc/inherit0.tab.c index 6612682..5022218 100644 --- a/test/btyacc/inherit0.tab.c +++ b/test/btyacc/inherit0.tab.c @@ -171,7 +171,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT inherit0_lhs[] = { -1, 0, 0, 1, 1, 2, 2, 3, 3, 5, 6, 4, diff --git a/test/btyacc/inherit1.tab.c b/test/btyacc/inherit1.tab.c index 65f9434..1f9f64b 100644 --- a/test/btyacc/inherit1.tab.c +++ b/test/btyacc/inherit1.tab.c @@ -192,7 +192,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT inherit1_lhs[] = { -1, 0, 0, 3, 3, 4, 4, 1, 1, 5, 6, 2, diff --git a/test/btyacc/inherit2.tab.c b/test/btyacc/inherit2.tab.c index caed470..c672f16 100644 --- a/test/btyacc/inherit2.tab.c +++ b/test/btyacc/inherit2.tab.c @@ -197,7 +197,7 @@ extern int YYPARSE_DECL(); #define INTEGER 260 #define NAME 261 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT inherit2_lhs[] = { -1, 5, 6, 0, 0, 3, 3, 4, 4, 1, 1, 7, 2, diff --git a/test/btyacc/ok_syntax1.tab.c b/test/btyacc/ok_syntax1.tab.c index c2fe21e..b7e9e7d 100644 --- a/test/btyacc/ok_syntax1.tab.c +++ b/test/btyacc/ok_syntax1.tab.c @@ -198,7 +198,7 @@ extern int YYPARSE_DECL(); #define VT 272 #define UMINUS 273 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT ok_syntax1_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/pure_calc.tab.c b/test/btyacc/pure_calc.tab.c index b54329a..379a8f1 100644 --- a/test/btyacc/pure_calc.tab.c +++ b/test/btyacc/pure_calc.tab.c @@ -180,7 +180,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/pure_error.tab.c b/test/btyacc/pure_error.tab.c index e939d95..43672cc 100644 --- a/test/btyacc/pure_error.tab.c +++ b/test/btyacc/pure_error.tab.c @@ -172,7 +172,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/btyacc/quote_calc-s.tab.c b/test/btyacc/quote_calc-s.tab.c index 78cd571..c2ad0a6 100644 --- a/test/btyacc/quote_calc-s.tab.c +++ b/test/btyacc/quote_calc-s.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc.tab.c b/test/btyacc/quote_calc.tab.c index bf68507..4e96a45 100644 --- a/test/btyacc/quote_calc.tab.c +++ b/test/btyacc/quote_calc.tab.c @@ -182,7 +182,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc2-s.tab.c b/test/btyacc/quote_calc2-s.tab.c index af49092..19d01d5 100644 --- a/test/btyacc/quote_calc2-s.tab.c +++ b/test/btyacc/quote_calc2-s.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc2.tab.c b/test/btyacc/quote_calc2.tab.c index 3f580f6..500f7d9 100644 --- a/test/btyacc/quote_calc2.tab.c +++ b/test/btyacc/quote_calc2.tab.c @@ -182,7 +182,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc3-s.tab.c b/test/btyacc/quote_calc3-s.tab.c index 746118e..34246b7 100644 --- a/test/btyacc/quote_calc3-s.tab.c +++ b/test/btyacc/quote_calc3-s.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc3.tab.c b/test/btyacc/quote_calc3.tab.c index 8a1980e..0fda00e 100644 --- a/test/btyacc/quote_calc3.tab.c +++ b/test/btyacc/quote_calc3.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc4-s.tab.c b/test/btyacc/quote_calc4-s.tab.c index 30a5930..7d75046 100644 --- a/test/btyacc/quote_calc4-s.tab.c +++ b/test/btyacc/quote_calc4-s.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/quote_calc4.tab.c b/test/btyacc/quote_calc4.tab.c index 8d4076f..a75e2bb 100644 --- a/test/btyacc/quote_calc4.tab.c +++ b/test/btyacc/quote_calc4.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/rename_debug.c b/test/btyacc/rename_debug.c index 1401ff6..9a2a550 100644 --- a/test/btyacc/rename_debug.c +++ b/test/btyacc/rename_debug.c @@ -19,7 +19,7 @@ #line 20 "rename_debug.c" #include "rename_debug.i" #include "rename_debug.h" -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, }; diff --git a/test/btyacc/stdin1.calc.c b/test/btyacc/stdin1.calc.c index fed0f27..6d52cd9 100644 --- a/test/btyacc/stdin1.calc.c +++ b/test/btyacc/stdin1.calc.c @@ -77,7 +77,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/stdin2.calc.c b/test/btyacc/stdin2.calc.c index 61d855e..e20dce6 100644 --- a/test/btyacc/stdin2.calc.c +++ b/test/btyacc/stdin2.calc.c @@ -77,7 +77,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/btyacc/varsyntax_calc1.tab.c b/test/btyacc/varsyntax_calc1.tab.c index 8d76e92..9a2f6fb 100644 --- a/test/btyacc/varsyntax_calc1.tab.c +++ b/test/btyacc/varsyntax_calc1.tab.c @@ -196,7 +196,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT varsyntax_calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, diff --git a/test/yacc/calc.tab.c b/test/yacc/calc.tab.c index aeac3fb..211a0ac 100644 --- a/test/yacc/calc.tab.c +++ b/test/yacc/calc.tab.c @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc1.tab.c b/test/yacc/calc1.tab.c index d8bef17..dd6a79e 100644 --- a/test/yacc/calc1.tab.c +++ b/test/yacc/calc1.tab.c @@ -175,7 +175,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, diff --git a/test/yacc/calc2.tab.c b/test/yacc/calc2.tab.c index f232b50..62b1227 100644 --- a/test/yacc/calc2.tab.c +++ b/test/yacc/calc2.tab.c @@ -152,7 +152,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc3.tab.c b/test/yacc/calc3.tab.c index 0ee121f..b5cb450 100644 --- a/test/yacc/calc3.tab.c +++ b/test/yacc/calc3.tab.c @@ -157,7 +157,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_all.tab.c b/test/yacc/calc_code_all.tab.c index f17bb91..6b1f1fa 100644 --- a/test/yacc/calc_code_all.tab.c +++ b/test/yacc/calc_code_all.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_all_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_default.tab.c b/test/yacc/calc_code_default.tab.c index af10ee0..abfd8aa 100644 --- a/test/yacc/calc_code_default.tab.c +++ b/test/yacc/calc_code_default.tab.c @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_default_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_imports.tab.c b/test/yacc/calc_code_imports.tab.c index 8adce07..f576887 100644 --- a/test/yacc/calc_code_imports.tab.c +++ b/test/yacc/calc_code_imports.tab.c @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_imports_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_provides.tab.c b/test/yacc/calc_code_provides.tab.c index 052aab3..9bb7dd0 100644 --- a/test/yacc/calc_code_provides.tab.c +++ b/test/yacc/calc_code_provides.tab.c @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_provides_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_requires.tab.c b/test/yacc/calc_code_requires.tab.c index 6a0abac..9187786 100644 --- a/test/yacc/calc_code_requires.tab.c +++ b/test/yacc/calc_code_requires.tab.c @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_requires_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/calc_code_top.tab.c b/test/yacc/calc_code_top.tab.c index fbcba6b..976ea8c 100644 --- a/test/yacc/calc_code_top.tab.c +++ b/test/yacc/calc_code_top.tab.c @@ -158,7 +158,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_top_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/code_calc.code.c b/test/yacc/code_calc.code.c index d5875d4..eab93d5 100644 --- a/test/yacc/code_calc.code.c +++ b/test/yacc/code_calc.code.c @@ -162,7 +162,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern YYINT yylhs[]; extern YYINT yylen[]; extern YYINT yydefred[]; diff --git a/test/yacc/code_calc.tab.c b/test/yacc/code_calc.tab.c index df3b452..9242641 100644 --- a/test/yacc/code_calc.tab.c +++ b/test/yacc/code_calc.tab.c @@ -1,4 +1,4 @@ -typedef short YYINT; +typedef int YYINT; const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/code_error.code.c b/test/yacc/code_error.code.c index b5fec73..1ea8357 100644 --- a/test/yacc/code_error.code.c +++ b/test/yacc/code_error.code.c @@ -152,7 +152,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern YYINT yylhs[]; extern YYINT yylen[]; extern YYINT yydefred[]; diff --git a/test/yacc/code_error.tab.c b/test/yacc/code_error.tab.c index 9296aa5..d394ad8 100644 --- a/test/yacc/code_error.tab.c +++ b/test/yacc/code_error.tab.c @@ -1,4 +1,4 @@ -typedef short YYINT; +typedef int YYINT; const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/yacc/defines1.calc.c b/test/yacc/defines1.calc.c index cfb06c8..0d03567 100644 --- a/test/yacc/defines1.calc.c +++ b/test/yacc/defines1.calc.c @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/defines2.calc.c b/test/yacc/defines2.calc.c index cfb06c8..0d03567 100644 --- a/test/yacc/defines2.calc.c +++ b/test/yacc/defines2.calc.c @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/defines3.calc.c b/test/yacc/defines3.calc.c index 469df78..a15c93d 100644 --- a/test/yacc/defines3.calc.c +++ b/test/yacc/defines3.calc.c @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/empty.tab.c b/test/yacc/empty.tab.c index e06cab8..a3224c6 100644 --- a/test/yacc/empty.tab.c +++ b/test/yacc/empty.tab.c @@ -144,7 +144,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT empty_lhs[] = { -1, 0, }; diff --git a/test/yacc/err_syntax10.tab.c b/test/yacc/err_syntax10.tab.c index 9cede3a..72d49ff 100644 --- a/test/yacc/err_syntax10.tab.c +++ b/test/yacc/err_syntax10.tab.c @@ -134,7 +134,7 @@ static void yyerror(const char *); extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax10_lhs[] = { -1, 0, }; diff --git a/test/yacc/err_syntax11.tab.c b/test/yacc/err_syntax11.tab.c index 28dadef..f918322 100644 --- a/test/yacc/err_syntax11.tab.c +++ b/test/yacc/err_syntax11.tab.c @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax11_lhs[] = { -1, 0, }; diff --git a/test/yacc/err_syntax12.tab.c b/test/yacc/err_syntax12.tab.c index 6379e81..19c2ac8 100644 --- a/test/yacc/err_syntax12.tab.c +++ b/test/yacc/err_syntax12.tab.c @@ -141,7 +141,7 @@ extern int YYPARSE_DECL(); #define text 456 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax12_lhs[] = { -1, 0, }; diff --git a/test/yacc/err_syntax18.tab.c b/test/yacc/err_syntax18.tab.c index e57edbe..8c353e2 100644 --- a/test/yacc/err_syntax18.tab.c +++ b/test/yacc/err_syntax18.tab.c @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax18_lhs[] = { -1, 0, }; diff --git a/test/yacc/err_syntax20.tab.c b/test/yacc/err_syntax20.tab.c index 081e614..36a4a4a 100644 --- a/test/yacc/err_syntax20.tab.c +++ b/test/yacc/err_syntax20.tab.c @@ -135,7 +135,7 @@ extern int YYPARSE_DECL(); #define recur 257 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax20_lhs[] = { -1, 0, }; diff --git a/test/yacc/error.tab.c b/test/yacc/error.tab.c index 23b7693..e6be842 100644 --- a/test/yacc/error.tab.c +++ b/test/yacc/error.tab.c @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/yacc/expr.oxout.tab.c b/test/yacc/expr.oxout.tab.c index 947818b..569a1d7 100644 --- a/test/yacc/expr.oxout.tab.c +++ b/test/yacc/expr.oxout.tab.c @@ -178,7 +178,7 @@ extern int YYPARSE_DECL(); #define ID 257 #define CONST 258 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT expr.oxout_lhs[] = { -1, 2, 0, 1, 3, 3, 3, 3, 3, 3, 3, }; diff --git a/test/yacc/grammar.tab.c b/test/yacc/grammar.tab.c index 02fceed..8464db9 100644 --- a/test/yacc/grammar.tab.c +++ b/test/yacc/grammar.tab.c @@ -454,7 +454,7 @@ extern int YYPARSE_DECL(); #define T_ASMARG 290 #define T_VA_DCL 291 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT grammar_lhs[] = { -1, 0, 0, 26, 26, 27, 27, 27, 27, 27, 27, 27, 31, 30, 30, 28, 28, 34, 28, 32, 32, diff --git a/test/yacc/ok_syntax1.tab.c b/test/yacc/ok_syntax1.tab.c index 9f54ff4..b31cc72 100644 --- a/test/yacc/ok_syntax1.tab.c +++ b/test/yacc/ok_syntax1.tab.c @@ -178,7 +178,7 @@ extern int YYPARSE_DECL(); #define VT 272 #define UMINUS 273 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT ok_syntax1_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/pure_calc.tab.c b/test/yacc/pure_calc.tab.c index 2e105ff..82674e0 100644 --- a/test/yacc/pure_calc.tab.c +++ b/test/yacc/pure_calc.tab.c @@ -160,7 +160,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/pure_error.tab.c b/test/yacc/pure_error.tab.c index a5658aa..247537e 100644 --- a/test/yacc/pure_error.tab.c +++ b/test/yacc/pure_error.tab.c @@ -152,7 +152,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/yacc/quote_calc-s.tab.c b/test/yacc/quote_calc-s.tab.c index 0932b32..715bae7 100644 --- a/test/yacc/quote_calc-s.tab.c +++ b/test/yacc/quote_calc-s.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc.tab.c b/test/yacc/quote_calc.tab.c index c5733d0..422794e 100644 --- a/test/yacc/quote_calc.tab.c +++ b/test/yacc/quote_calc.tab.c @@ -162,7 +162,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc2-s.tab.c b/test/yacc/quote_calc2-s.tab.c index ed1584f..6ed0ae2 100644 --- a/test/yacc/quote_calc2-s.tab.c +++ b/test/yacc/quote_calc2-s.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc2.tab.c b/test/yacc/quote_calc2.tab.c index 6a6606c..cbd9748 100644 --- a/test/yacc/quote_calc2.tab.c +++ b/test/yacc/quote_calc2.tab.c @@ -162,7 +162,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc3-s.tab.c b/test/yacc/quote_calc3-s.tab.c index 79628ca..52133b4 100644 --- a/test/yacc/quote_calc3-s.tab.c +++ b/test/yacc/quote_calc3-s.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc3.tab.c b/test/yacc/quote_calc3.tab.c index 076cd97..62d1927 100644 --- a/test/yacc/quote_calc3.tab.c +++ b/test/yacc/quote_calc3.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc4-s.tab.c b/test/yacc/quote_calc4-s.tab.c index c90371d..4b5563d 100644 --- a/test/yacc/quote_calc4-s.tab.c +++ b/test/yacc/quote_calc4-s.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/quote_calc4.tab.c b/test/yacc/quote_calc4.tab.c index 4b5db03..d0e8f23 100644 --- a/test/yacc/quote_calc4.tab.c +++ b/test/yacc/quote_calc4.tab.c @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/rename_debug.c b/test/yacc/rename_debug.c index 5199c45..24bbaf5 100644 --- a/test/yacc/rename_debug.c +++ b/test/yacc/rename_debug.c @@ -16,7 +16,7 @@ #line 17 "rename_debug.c" #include "rename_debug.i" #include "rename_debug.h" -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, }; diff --git a/test/yacc/stdin1.calc.c b/test/yacc/stdin1.calc.c index 3904e81..bbe924b 100644 --- a/test/yacc/stdin1.calc.c +++ b/test/yacc/stdin1.calc.c @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/stdin2.calc.c b/test/yacc/stdin2.calc.c index a308587..3788239 100644 --- a/test/yacc/stdin2.calc.c +++ b/test/yacc/stdin2.calc.c @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/varsyntax_calc1.tab.c b/test/yacc/varsyntax_calc1.tab.c index b83725d..ef1635a 100644 --- a/test/yacc/varsyntax_calc1.tab.c +++ b/test/yacc/varsyntax_calc1.tab.c @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT varsyntax_calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, @@ -1,4 +1,4 @@ -/* $Id: verbose.c,v 1.13 2020/09/10 17:57:34 tom Exp $ */ +/* $Id: verbose.c,v 1.14 2021/05/20 23:57:23 tom Exp $ */ #include "defs.h" @@ -36,9 +36,10 @@ verbose(void) if (SRtotal || RRtotal) log_conflicts(); - fprintf(verbose_file, "\n\n%d terminals, %d nonterminals\n", ntokens, - nvars); - fprintf(verbose_file, "%d grammar rules, %d states\n", nrules - 2, nstates); + fprintf(verbose_file, "\n\n%ld terminals, %ld nonterminals\n", + (long)ntokens, (long)nvars); + fprintf(verbose_file, "%ld grammar rules, %ld states\n", + (long)(nrules - 2), (long)nstates); #if defined(YYBTYACC) { /* print out the grammar symbol # and parser internal symbol # for each symbol as an aide to writing the implementation for YYDESTRUCT_CALL() @@ -92,14 +93,14 @@ log_conflicts(void) { fprintf(verbose_file, "State %d contains ", i); if (SRconflicts[i] > 0) - fprintf(verbose_file, "%d shift/reduce conflict%s", - SRconflicts[i], + fprintf(verbose_file, "%ld shift/reduce conflict%s", + (long)SRconflicts[i], PLURAL(SRconflicts[i])); if (SRconflicts[i] && RRconflicts[i]) fprintf(verbose_file, ", "); if (RRconflicts[i] > 0) - fprintf(verbose_file, "%d reduce/reduce conflict%s", - RRconflicts[i], + fprintf(verbose_file, "%ld reduce/reduce conflict%s", + (long)RRconflicts[i], PLURAL(RRconflicts[i])); fprintf(verbose_file, ".\n"); } @@ -147,20 +148,20 @@ print_conflicts(int state) if (state == final_state && symbol == 0) { fprintf(verbose_file, "%d: shift/reduce conflict \ -(accept, reduce %d) on $end\n", state, p->number - 2); +(accept, reduce %ld) on $end\n", state, (long)(p->number - 2)); } else { if (act == SHIFT) { fprintf(verbose_file, "%d: shift/reduce conflict \ -(shift %d, reduce %d) on %s\n", state, number, p->number - 2, +(shift %ld, reduce %ld) on %s\n", state, (long)number, (long)(p->number - 2), symbol_name[symbol]); } else { fprintf(verbose_file, "%d: reduce/reduce conflict \ -(reduce %d, reduce %d) on %s\n", state, number - 2, p->number - 2, +(reduce %ld, reduce %ld) on %s\n", state, (long)(number - 2), (long)(p->number - 2), symbol_name[symbol]); } } @@ -196,7 +197,7 @@ print_core(int state) fprintf(verbose_file, " %s", symbol_name[*sp]); sp++; } - fprintf(verbose_file, " (%d)\n", -2 - *sp); + fprintf(verbose_file, " (%ld)\n", (long)(-2 - *sp)); } } @@ -237,8 +238,8 @@ print_nulls(int state) for (i = 0; i < nnulls; ++i) { j = null_rules[i]; - fprintf(verbose_file, "\t%s : . (%d)\n", symbol_name[rlhs[j]], - j - 2); + fprintf(verbose_file, "\t%s : . (%ld)\n", symbol_name[rlhs[j]], + (long)(j - 2)); } fprintf(verbose_file, "\n"); } @@ -287,8 +288,8 @@ print_shifts(action *p) for (; p; p = p->next) { if (p->action_code == SHIFT && p->suppressed == 0) - fprintf(verbose_file, "\t%s shift %d\n", - symbol_name[p->symbol], p->number); + fprintf(verbose_file, "\t%s shift %ld\n", + symbol_name[p->symbol], (long)p->number); #if defined(YYBTYACC) if (backtrack && p->action_code == SHIFT && p->suppressed == 1) fprintf(verbose_file, "\t%s [trial] shift %d\n", |