From 367a026638efd2101db2dae73c37975c3a540eca Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Nov 2022 21:55:25 +0000 Subject: [PATCH] snapshot of project "byacc", label t20221106 --- CHANGES | 328 ++++++++------- MANIFEST | 2 +- VERSION | 2 +- aclocal.m4 | 63 +-- config.guess | 45 +- config.sub | 15 +- configure | 868 +++++++++++++++++++++------------------ defs.h | 4 +- install-sh | 723 +++++++++++++++++++++----------- makefile.in | 12 +- package/byacc.spec | 4 +- package/debian/changelog | 6 + package/mingw-byacc.spec | 4 +- package/pkgsrc/Makefile | 2 +- test/run_lint.sh | 5 +- test/run_make.sh | 17 +- test/run_test.sh | 7 +- yacc.1 | 45 +- 18 files changed, 1279 insertions(+), 873 deletions(-) diff --git a/CHANGES b/CHANGES index 375fdba..9f7b8eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,35 @@ +2022-11-06 Thomas E. Dickey + + * test/run_test.sh: use context diff, to work with AIX + + * defs.h: + fprintf_lineno might be passed a null, when reading from stdin - show "(null)" + + * makefile.in, test/run_make.sh, test/run_test.sh, test/run_lint.sh: + fgrep-fixes + + * yacc.1: mention use of stderr/stdout for usage/debugging + + * yacc.1: document %empty + + * yacc.1: document %debug + + * yacc.1: minor fixes with check-manpage + + * VERSION, package/byacc.spec, package/debian/changelog, + package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + +2022-10-02 Thomas E. Dickey + + * configure: regen + + * aclocal.m4: resync with my-autoconf + +2022-08-01 Thomas E. Dickey + + * config.guess, config.sub: 2022-08-01 + 2022-01-28 Thomas E. Dickey * package/debian/copyright: update, fix typo @@ -12,7 +44,7 @@ of byacc * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: update packaging, renaming debian folder back to its original location to verify that the version-mangling used in the accepted Debian package will work with the continuous-integration system. @@ -24,7 +56,7 @@ 2022-01-14 Thomas E. Dickey * VERSION, package/byacc.spec, package/detest/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2022-01-09 Thomas E. Dickey @@ -57,7 +89,7 @@ cf: 2014-09-17) * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2022-01-08 Thomas E. Dickey @@ -92,7 +124,7 @@ * package/detest/byacc.prerm: build-script * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2022-01-01 Thomas E. Dickey @@ -144,7 +176,7 @@ * package/debian/control: updates for Debian standard * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * package/debian/byacc2.docs: RCS_BASE @@ -375,7 +407,7 @@ 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, - yaccpar.c: + test/yacc/varsyntax_calc1.tab.c, btyaccpar.c, yaccpar.c: regen * btyaccpar.skel, yaccpar.skel: @@ -383,7 +415,7 @@ different warning * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-08-04 Thomas E. Dickey @@ -430,7 +462,7 @@ Subject: Re: [PATCH] support bison's --defines and --output options in byacc * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-08-01 Thomas E. Dickey @@ -458,7 +490,7 @@ test/yacc/calc_code_requires.tab.c, test/yacc/calc_code_top.tab.c, test/yacc/code_calc.code.c, test/yacc/defines1.calc.c, test/yacc/defines2.calc.c, test/yacc/defines3.calc.c, - test/yacc/stdin2.calc.c: + test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c: regen * output.c: @@ -487,7 +519,7 @@ test/btyacc/code_calc.code.c, test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, test/btyacc/defines3.calc.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, - test/btyacc/stdin2.calc.c: + test/btyacc/stdin1.calc.c, test/btyacc/stdin2.calc.c: regen * reader.c: @@ -511,7 +543,7 @@ #line's are not together in some btyacc cases...) * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-07-14 Thomas E. Dickey @@ -643,7 +675,7 @@ 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/rename_debug.c, - yaccpar.c: + test/yacc/stdin1.calc.c, test/yacc/stdin2.calc.c, yaccpar.c: regen * btyaccpar.skel, yaccpar.skel: cancel unused assignments @@ -661,7 +693,7 @@ 2021-06-19 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-06-13 Thomas E. Dickey @@ -935,7 +967,7 @@ * configure: regen * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-05-01 Thomas E. Dickey @@ -1032,7 +1064,7 @@ test/yacc/varsyntax_calc1.tab.c, test/yacc/varsyntax_calc1.tab.h, test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h, test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h, - test/yacc/calc1.tab.h: + test/yacc/calc1.tab.c, test/yacc/calc1.tab.h: regen * reader.c: @@ -1050,7 +1082,7 @@ * package/byacc.spec, package/debian/rules: use stdnoreturn * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2021-03-20 Thomas E. Dickey @@ -1221,6 +1253,10 @@ Reported-by: Karl Berry Link: https://lists.gnu.org/archive/html/config-patches/2020-12/msg00001.html +2020-11-30 Thomas E. Dickey + + * install-sh: 2020-11-30 + 2020-11-19 Thomas E. Dickey * config.guess, config.sub: 2020-11-17 (repaired) @@ -1386,7 +1422,7 @@ 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/varsyntax_calc1.tab.c: + test/yacc/stdin2.calc.c, test/yacc/varsyntax_calc1.tab.c: update to version 2.0 * reader.c: @@ -1409,7 +1445,7 @@ cppcheck -- eliminate bogus returns after no-return functions * verbose.c, output.c, mkpar.c, main.c, warshall.c, lr0.c, lalr.c, - closure.c: + graph.c, closure.c: cppcheck -- scope reduction * package/debian/compat: quiet compatibility-warning @@ -1424,7 +1460,7 @@ resync with my-autoconf, for compiler-warning fixes with macOS * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2020-09-07 Thomas E. Dickey @@ -1465,7 +1501,7 @@ 2020-03-30 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2020-03-10 Thomas E. Dickey @@ -1493,7 +1529,7 @@ suppress bison's -Wyacc warning, which is not useful. * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2019-11-19 Thomas E. Dickey @@ -1501,7 +1537,7 @@ * yacc.1: new version of manpage * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * yacc.1: document %code @@ -1529,7 +1565,7 @@ test/yacc/calc_code_all.tab.h, test/yacc/calc_code_default.tab.c, test/yacc/calc_code_provides.tab.c, test/yacc/calc_code_provides.tab.h, test/yacc/calc_code_requires.tab.c, - test/yacc/calc_code_top.tab.c: + test/yacc/calc_code_requires.tab.h, test/yacc/calc_code_top.tab.c: RCS_BASE * output.c: @@ -1555,14 +1591,14 @@ test/yacc/calc_code_provides.output, test/yacc/calc_code_requires.error, test/yacc/calc_code_requires.output, test/yacc/calc_code_top.error, - test/yacc/calc_code_top.tab.h: + test/yacc/calc_code_top.output, test/yacc/calc_code_top.tab.h: RCS_BASE 2019-11-18 Thomas E. Dickey * test/calc_code_imports.y, test/calc_code_all.y, test/calc_code_default.y, test/calc_code_top.y, - test/calc_code_requires.y: + test/calc_code_provides.y, test/calc_code_requires.y: RCS_BASE 2019-11-04 Michael.Forney @@ -1603,7 +1639,7 @@ * test/btyacc/help.error, test/btyacc/no_b_opt.error, test/btyacc/no_output2.error, test/btyacc/no_p_opt.error, test/yacc/help.error, test/yacc/no_b_opt.error, - test/yacc/no_p_opt.error: + test/yacc/no_output2.error, test/yacc/no_p_opt.error: regen * test/run_test.sh: @@ -1631,7 +1667,7 @@ warning options between gcc/clang when --enable-warnings is not set. * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2019-09-11 Thomas E. Dickey @@ -1657,7 +1693,7 @@ change "-D" option to "-H" (discussion with Ethan Sommer) * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * test/btyacc/defines1.calc.c, test/btyacc/defines2.calc.c, @@ -1698,7 +1734,7 @@ * test/btyacc/stdin1.calc.c, test/btyacc/stdin1.error, test/btyacc/stdin1.output, test/btyacc/stdin2.calc.c, - test/btyacc/stdin2.output: + test/btyacc/stdin2.error, test/btyacc/stdin2.output: RCS_BASE * test/btyacc/big_b.error, test/btyacc/big_b.output, @@ -1733,7 +1769,7 @@ test/yacc/no_p_opt.error, test/yacc/no_p_opt.output, test/yacc/no_p_opt1.error, test/yacc/no_p_opt1.output, test/yacc/no_verbose.error, test/yacc/no_verbose.output, - test/yacc/nostdin.output: + test/yacc/nostdin.error, test/yacc/nostdin.output: regen * test/run_test.sh: @@ -1742,7 +1778,7 @@ * test/yacc/stdin2.output, test/yacc/stdin2.calc.c, test/yacc/stdin1.calc.c, test/yacc/stdin1.error, - test/yacc/stdin2.error: + test/yacc/stdin1.output, test/yacc/stdin2.error: RCS_BASE * test/btyacc/big_b.output, test/btyacc/big_l.output, @@ -1751,7 +1787,7 @@ test/btyacc/nostdin.output, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, - test/yacc/nostdin.output: + test/yacc/no_p_opt.output, test/yacc/nostdin.output: regen * main.c: add -D option, to specify filename vs y.tab.h for -d @@ -1790,7 +1826,7 @@ add/use CF_POSIX_VISIBLE * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2019-06-10 Thomas E. Dickey @@ -1823,11 +1859,11 @@ 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, - btyaccpar.c: + test/btyacc/err_syntax18.tab.c, test/btyacc/rename_debug.c, btyaccpar.c: regen * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2018-06-09 Tom.Shields @@ -1846,7 +1882,7 @@ * package/byacc.spec: add btyacc package * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * package/debian/control: add a package for btyacc @@ -1902,7 +1938,7 @@ * test/btyacc/rename_debug.i, test/yacc/rename_debug.i: regen * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2018-05-09 Thomas E. Dickey @@ -1912,7 +1948,7 @@ * aclocal.m4: resync with my-autoconf * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * test/btyacc/rename_debug.i, btyaccpar.c, @@ -1934,7 +1970,7 @@ 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/varsyntax_calc1.tab.c: + test/btyacc/rename_debug.c, test/btyacc/varsyntax_calc1.tab.c: regen * btyaccpar.skel: apply Guy Harris' changes here as well @@ -1973,7 +2009,7 @@ 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/rename_debug.c, - yaccpar.c: + test/yacc/rename_debug.i, yaccpar.c: regen * VERSION, package/byacc.spec, package/debian/changelog, @@ -2036,7 +2072,7 @@ guard against sign-extension in ctype-macros * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * reader.c: check for numeric overflow in get_number() @@ -2066,7 +2102,7 @@ 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/rename_debug.c, - btyaccpar.skel: + btyaccpar.c, btyaccpar.skel: fix another uninitialized variable warning in "make check_make" for btyacc * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, @@ -2074,7 +2110,7 @@ test/btyacc/calc3.tab.c, btyaccpar.c, btyaccpar.skel, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/calc3.tab.c, yaccpar.c, defs.h, - output.c: + yaccpar.skel, output.c: fix some compiler warnings for "make check_make" by adding section init_vars, which initializes the body_vars for pure-parser configuration. @@ -2091,7 +2127,7 @@ 2017-04-30 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2017-04-29 Thomas E. Dickey @@ -2109,7 +2145,7 @@ * test/btyacc/expr.oxout.error, test/btyacc/expr.oxout.output, test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h, test/yacc/expr.oxout.error, test/yacc/expr.oxout.output, - test/yacc/expr.oxout.tab.h: + test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h: RCS_BASE * package/debian/copyright: update copyright @@ -2131,7 +2167,7 @@ 2017-02-01 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2016-12-31 Thomas E. Dickey @@ -2158,7 +2194,7 @@ test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, - btyaccpar.c: + test/btyacc/btyacc_destroy3.tab.c, btyaccpar.c: regen * btyaccpar.skel: changes from NetBSD @@ -2178,7 +2214,7 @@ + struct YYLTYPE now has a "source" field * test/btyacc/btyacc_demo.tab.h, test/btyacc/code_calc.tab.c, - test/btyacc/err_inherit4.tab.h: + test/btyacc/code_error.tab.c, test/btyacc/err_inherit4.tab.h: regen * btyaccpar.c, btyaccpar.skel, reader.c: changes from NetBSD @@ -2268,7 +2304,7 @@ + build-fixes for OS/2 * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2016-11-20 Thomas E. Dickey @@ -2288,7 +2324,7 @@ CF_PROG_LINT - add cpplint to programs to use; drop ad hoc tdlint and alint. * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * lalr.c: indented @@ -2334,7 +2370,7 @@ test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, - yaccpar.c: + test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c, yaccpar.c: regen 2016-06-06 Tom.Shields @@ -2395,13 +2431,13 @@ test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, - btyaccpar.c: + test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c: regen 2016-06-01 Tom.Shields * btyaccpar.skel, defs.h, error.c, output.c, reader.c, test/code_calc.y, - yaccpar.skel: + test/err_inherit4.y, test/run_make.sh, yaccpar.skel: fixes for issues in btyacc (report by Francis Andre): + correction to the placement of the #line directive for a %union specification @@ -2437,7 +2473,7 @@ 2016-06-01 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2016-03-24 Thomas E. Dickey @@ -2459,7 +2495,7 @@ update CF_WITH_MAN2HTML to use configured shell rather than /bin/sh * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2016-01-25 Thomas E. Dickey @@ -2471,7 +2507,7 @@ * lr0.c: fix a duplicate-free in the leak-checking * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * reader.c: @@ -2509,7 +2545,7 @@ * lr0.c: coverity #39181: memory leak * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2014-11-13 Jouk.Jansen @@ -2535,7 +2571,7 @@ change to native format to work around regression in Debian packaging. * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * configure: regen @@ -2596,7 +2632,7 @@ 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/rename_debug.c: + test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c: regen * btyaccpar.c: add casts, change types to fix strict compiler warnings @@ -2614,7 +2650,7 @@ test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, - test/btyacc/err_syntax16.tab.c: + test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c: regen * output.c: gcc-warning @@ -2648,7 +2684,7 @@ was output). * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, - test/btyacc/calc3.tab.c: + test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c: regen * reader.c: @@ -2666,7 +2702,7 @@ * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * reader.c: @@ -2687,7 +2723,7 @@ test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, - test/btyacc_destroy2.y: + test/btyacc_destroy1.y, test/btyacc_destroy2.y: RCS_BASE 2014-10-02 Thomas E. Dickey @@ -2713,7 +2749,7 @@ * aclocal.m4: modified to support port to Minix3.2 * package/pkgsrc/Makefile, VERSION, package/byacc.spec, - package/mingw-byacc.spec: + package/debian/changelog, package/mingw-byacc.spec: bump 2014-07-15 Thomas E. Dickey @@ -2721,7 +2757,7 @@ * aclocal.m4: resync with my-autoconf (no change to configure script) * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * test/run_test.sh: @@ -2786,7 +2822,7 @@ * VERSION, package/byacc.spec, package/debian/changelog, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, - test/yacc/nostdin.output: + test/yacc/no_p_opt.output, test/yacc/nostdin.output: bump 2014-04-22 Thomas E. Dickey @@ -2820,7 +2856,7 @@ 2014-04-22 Thomas E. Dickey * package/pkgsrc/Makefile, VERSION, package/byacc.spec, - package/mingw-byacc.spec: + package/debian/changelog, package/mingw-byacc.spec: bump 2014-04-19 Thomas E. Dickey @@ -2854,7 +2890,7 @@ test/btyacc/err_syntax12.tab.c, test/btyacc/error.tab.c, test/btyacc/rename_debug.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, - output.c: + test/btyacc/calc3.tab.c, test/btyacc/code_calc.tab.c, output.c: fix a few clang --analyze warnings; one was a case where output_ctable emitted an empty table (which should be an error). @@ -2865,7 +2901,7 @@ * package/debian/changelog: reason for release * VERSION, package/byacc.spec, package/debian/changelog, - package/pkgsrc/Makefile: + package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * makefile.in: use $LINT_OPTS from environment via configure script @@ -2877,14 +2913,14 @@ * test/btyacc/rename_debug.c, test/btyacc/rename_debug.error, test/btyacc/rename_debug.h, test/btyacc/rename_debug.i, - test/yacc/rename_debug.c: + test/btyacc/rename_debug.output, test/yacc/rename_debug.c: reference output for testing * test/run_test.sh: retain the renaming done for code_debug.y so that check_make will work. * test/yacc/rename_debug.error, test/yacc/rename_debug.h, - test/yacc/rename_debug.output: + test/yacc/rename_debug.i, test/yacc/rename_debug.output: reference output for testing * test/btyacc/ok_syntax1.error: RCS_BASE @@ -2901,7 +2937,7 @@ test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, - yaccpar.c: + test/yacc/code_calc.code.c, yaccpar.c: regen * yacc.1: @@ -2911,7 +2947,7 @@ * test/yacc/ok_syntax1.output, test/yacc/ok_syntax1.tab.c, test/yacc/ok_syntax1.tab.h, test/btyacc/ok_syntax1.output, - test/btyacc/ok_syntax1.tab.h: + test/btyacc/ok_syntax1.tab.c, test/btyacc/ok_syntax1.tab.h: reference output for testing * test/ok_syntax1.y: RCS_BASE @@ -2921,7 +2957,7 @@ * test/yacc/big_b.error, test/yacc/big_b.output, test/yacc/big_l.error, test/yacc/big_l.output, test/btyacc/big_b.error, test/btyacc/big_b.output, test/btyacc/big_l.error, - test/run_test.sh: + test/btyacc/big_l.output, test/run_test.sh: exercise -L/-B options * test/yacc/code_debug.c, test/btyacc/code_debug.c, @@ -3017,7 +3053,7 @@ test/yacc/no_p_opt.output, test/yacc/no_p_opt1.error, test/yacc/no_p_opt1.output, test/yacc/no_verbose.error, test/yacc/no_verbose.output, test/yacc/nostdin.error, - test/yacc/test-no_b_opt1.output: + test/yacc/nostdin.output, test/yacc/test-no_b_opt1.output: reference output for testing * test/run_test.sh: @@ -3036,7 +3072,7 @@ test/btyacc/no_opts.output, test/btyacc/no_verbose.error, test/btyacc/nostdin.error, test/btyacc/nostdin.output, test/btyacc/no_output.error, test/btyacc/no_output.output, - test/btyacc/no_output1.output: + test/btyacc/no_output1.error, test/btyacc/no_output1.output: reference output for testing * main.c: @@ -3047,7 +3083,7 @@ test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax27.tab.h, test/btyacc/help.error, test/btyacc/help.output, test/yacc/err_syntax27.error, test/yacc/err_syntax27.output, - test/yacc/err_syntax27.tab.h: + test/yacc/err_syntax27.tab.c, test/yacc/err_syntax27.tab.h: reference output for testing * test/err_syntax27.y: testcase for missing_brace() @@ -3199,7 +3235,7 @@ 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/varsyntax_calc1.tab.c, - defs.h: + output.c, skeleton.c, defs.h: use improvement from Tom Shield's btyacc changes, getting rid of special cases for generating two yyerror calls in skeleton * output.c: simplify output_yyerror_decl() @@ -3215,7 +3251,7 @@ 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, - output.c: + test/yacc/grammar.tab.c, test/yacc/pure_calc.tab.c, output.c: add second "const" to string-table declarations, from Tom Shield's btyacc changes * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, @@ -3232,7 +3268,7 @@ test/btyacc/calc3.tab.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_syntax18.tab.c: + test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c: discard unnecessary call on write_code_lineno() from Tom Shield's changes * test/yacc/error.tab.c, test/yacc/grammar.tab.c, @@ -3247,7 +3283,7 @@ test/yacc/code_error.code.c, test/yacc/code_error.tab.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, - output.c: + test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, output.c: use YYINT typedef from Tom Shield's btyacc changes to replace explicit "short" * test/yacc/code_calc.code.c, test/yacc/code_error.code.c, output.c: @@ -3268,11 +3304,11 @@ test/btyacc/code_calc.code.c, test/btyacc/code_error.code.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_syntax12.tab.c: + test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c: discard unnecessary call on write_code_lineno() from Tom Shield's changes * output.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, - test/yacc/code_error.tab.c: + test/yacc/code_calc.tab.c, test/yacc/code_error.tab.c: use fix from Tom Shield's btyacc changes: prefix-definitions went to the output (.tab.c) file in a case where they should have gone to the code (.code.c) file. Remove now-redundant call to output_prefix(). @@ -3301,7 +3337,7 @@ 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/error.tab.c: + test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c: discard a change which merged CountLines() with explicit comparisons against code_file because that adds extra to the #line values @@ -3314,7 +3350,7 @@ test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, - output.c: + test/yacc/error.tab.c, output.c: add Tom Shield's change to allow definition of YYSTYPE_IS_DECLARED symbol to override fallback typedef for YYSTYPE when that symbol is undefined @@ -3346,7 +3382,7 @@ test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, - test/btyacc/err_syntax10.tab.c: + test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c: regen to make YYMAXTOKEN and YYUNDFTOKEN adjacent * test/yacc/err_syntax20.tab.c, test/yacc/grammar.tab.c, @@ -3358,7 +3394,7 @@ 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/empty.tab.c, test/yacc/err_syntax10.tab.c, - test/yacc/err_syntax12.tab.c: + test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c: regen after adding the YYUNDFTOKEN symbol * output.c: @@ -3427,7 +3463,7 @@ test/yacc/err_syntax22.tab.c, test/yacc/err_syntax23.tab.c, test/yacc/err_syntax24.tab.c, test/yacc/err_syntax25.tab.c, test/yacc/err_syntax26.tab.c, test/yacc/err_syntax3.tab.c, - skeleton.c: + test/yacc/err_syntax4.tab.c, test/yacc/err_syntax5.tab.c, skeleton.c: incorporate YYENOMEM and YYEOF symbols from btyacc * output.c: merge chunk from btyacc changes for header-guards @@ -3474,7 +3510,7 @@ test/btyacc/code_error.code.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_syntax18.tab.c: + test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c: omit the GCC_UNUSED, as noted by Tom Shields not really essential 2014-04-01 Tom.Shields @@ -3507,7 +3543,7 @@ test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, - test/btyacc/err_syntax24.tab.c: + test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c: regen 2014-03-29 Thomas E. Dickey @@ -3535,7 +3571,7 @@ test/yacc/err_syntax15.tab.c, test/yacc/err_syntax16.tab.c, test/yacc/err_syntax17.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax19.tab.c, test/yacc/err_syntax2.tab.c, - skeleton.c: + test/yacc/err_syntax20.tab.c, test/yacc/err_syntax21.tab.c, skeleton.c: comment-out yysccsid in the banner because it produces unnecessary compiler warnings. The suggested alternative (using #pragma ident) in the preceding comment is also obsolete; remove that comment (request by Gleb Smirnoff). @@ -3588,7 +3624,7 @@ test/btyacc/inherit2.output, test/btyacc/inherit2.tab.c, test/btyacc/inherit2.tab.h, test/btyacc/calc.error, test/btyacc/err_inherit1.error, test/btyacc/err_inherit1.output, - test/btyacc/err_inherit1.tab.h: + test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit1.tab.h: reference output for testing * defs.h: new functions/variables for btyacc @@ -3599,7 +3635,7 @@ 2014-03-27 Tom.Shields * test/err_inherit5.y, test/err_inherit4.y, test/err_inherit3.y, - test/inherit2.y: + test/err_inherit2.y, test/err_inherit1.y, test/inherit2.y: testcase for btyacc 2014-03-25 Tom.Shields @@ -3689,7 +3725,7 @@ test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8.tab.h, test/btyacc/err_syntax8a.output, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax8a.tab.h, test/btyacc/err_syntax9.output, - test/btyacc/err_syntax9.tab.h: + test/btyacc/err_syntax9.tab.c, test/btyacc/err_syntax9.tab.h: reference output for testing 2014-03-24 Thomas E. Dickey @@ -3701,7 +3737,7 @@ * test/btyacc_demo.y: testcase for btyacc * test/btyacc/varsyntax_calc1.error, test/btyacc/varsyntax_calc1.output, - test/btyacc/varsyntax_calc1.tab.h: + test/btyacc/varsyntax_calc1.tab.c, test/btyacc/varsyntax_calc1.tab.h: reference output for testing * test/varsyntax_calc1.y, test/btyacc_calc1.y: testcase for btyacc @@ -3711,7 +3747,7 @@ * test/err_syntax26.error, test/err_syntax26.output, test/err_syntax26.tab.c, test/err_syntax26.tab.h, test/yacc/err_syntax26.error, test/yacc/err_syntax26.output, - test/yacc/err_syntax26.tab.h: + test/yacc/err_syntax26.tab.c, test/yacc/err_syntax26.tab.h: reference output for testing * test/err_syntax26.y: testcase for missing_brace() @@ -3719,7 +3755,7 @@ * test/err_syntax25.error, test/err_syntax25.output, test/err_syntax25.tab.c, test/err_syntax25.tab.h, test/yacc/err_syntax25.error, test/yacc/err_syntax25.output, - test/yacc/err_syntax25.tab.h: + test/yacc/err_syntax25.tab.c, test/yacc/err_syntax25.tab.h: reference output for testing * test/err_syntax25.y: testcase for over_unionized() @@ -3727,7 +3763,7 @@ * test/err_syntax24.error, test/err_syntax24.output, test/err_syntax24.tab.c, test/err_syntax24.tab.h, test/yacc/err_syntax24.error, test/yacc/err_syntax24.output, - test/yacc/err_syntax24.tab.h: + test/yacc/err_syntax24.tab.c, test/yacc/err_syntax24.tab.h: reference output for testing * test/err_syntax24.y: testcase for default_action_warning() @@ -3758,7 +3794,7 @@ * test/err_syntax23.error, test/err_syntax23.output, test/err_syntax23.tab.c, test/err_syntax23.tab.h, test/yacc/err_syntax23.error, test/yacc/err_syntax23.output, - test/yacc/err_syntax23.tab.h: + test/yacc/err_syntax23.tab.c, test/yacc/err_syntax23.tab.h: reference output for testing * test/err_syntax23.y: testcase for untyped_lhs() @@ -3773,7 +3809,7 @@ * test/err_syntax22.error, test/err_syntax22.output, test/err_syntax22.tab.c, test/err_syntax22.tab.h, test/yacc/err_syntax22.error, test/yacc/err_syntax22.output, - test/yacc/err_syntax22.tab.h: + test/yacc/err_syntax22.tab.c, test/yacc/err_syntax22.tab.h: reference output for testing * test/err_syntax22.y: testcase for untyped_rhs() @@ -3785,7 +3821,7 @@ test/err_syntax20.error, test/err_syntax20.output, test/err_syntax20.tab.c, test/err_syntax20.tab.h, test/yacc/err_syntax20.error, test/yacc/err_syntax20.output, - test/yacc/err_syntax20.tab.h: + test/yacc/err_syntax20.tab.c, test/yacc/err_syntax20.tab.h: reference output for testing * test/err_syntax20.y: testcase for undefined_symbol_warning() @@ -3795,7 +3831,7 @@ * test/err_syntax19.error, test/err_syntax19.output, test/err_syntax19.tab.c, test/err_syntax19.tab.h, test/yacc/err_syntax19.error, test/yacc/err_syntax19.output, - test/yacc/err_syntax19.tab.h: + test/yacc/err_syntax19.tab.c, test/yacc/err_syntax19.tab.h: reference output for testing * test/err_syntax19.y: testcase for dollar_error() @@ -3803,7 +3839,7 @@ * test/err_syntax18.error, test/err_syntax18.output, test/err_syntax18.tab.c, test/err_syntax18.tab.h, test/yacc/err_syntax18.error, test/yacc/err_syntax18.output, - test/yacc/err_syntax18.tab.h: + test/yacc/err_syntax18.tab.c, test/yacc/err_syntax18.tab.h: reference output for testing * test/err_syntax18.y: testcase for dollar_warning() @@ -3811,7 +3847,7 @@ * test/err_syntax17.error, test/err_syntax17.output, test/err_syntax17.tab.c, test/err_syntax17.tab.h, test/yacc/err_syntax17.error, test/yacc/err_syntax17.output, - test/yacc/err_syntax17.tab.h: + test/yacc/err_syntax17.tab.c, test/yacc/err_syntax17.tab.h: reference output for testing * test/err_syntax17.y: testcase for unterminated_action() @@ -3821,7 +3857,7 @@ * test/err_syntax16.error, test/err_syntax16.output, test/err_syntax16.tab.c, test/err_syntax16.tab.h, test/yacc/err_syntax16.error, test/yacc/err_syntax16.output, - test/yacc/err_syntax16.tab.h: + test/yacc/err_syntax16.tab.c, test/yacc/err_syntax16.tab.h: reference output for testing * test/err_syntax16.y: testcase for terminal_lhs() @@ -3829,7 +3865,7 @@ * test/err_syntax15.error, test/err_syntax15.output, test/err_syntax15.tab.c, test/err_syntax15.tab.h, test/yacc/err_syntax15.error, test/yacc/err_syntax15.output, - test/yacc/err_syntax15.tab.h: + test/yacc/err_syntax15.tab.c, test/yacc/err_syntax15.tab.h: reference output for testing * test/err_syntax15.y: testcase for no_grammar() @@ -3837,7 +3873,7 @@ * test/err_syntax14.error, test/err_syntax14.output, test/err_syntax14.tab.c, test/err_syntax14.tab.h, test/yacc/err_syntax14.error, test/yacc/err_syntax14.output, - test/yacc/err_syntax14.tab.h: + test/yacc/err_syntax14.tab.c, test/yacc/err_syntax14.tab.h: reference output for testing * test/err_syntax14.y: @@ -3846,7 +3882,7 @@ * test/err_syntax13.error, test/err_syntax13.output, test/err_syntax13.tab.c, test/err_syntax13.tab.h, test/yacc/err_syntax13.error, test/yacc/err_syntax13.output, - test/yacc/err_syntax13.tab.h: + test/yacc/err_syntax13.tab.c, test/yacc/err_syntax13.tab.h: reference output for testing * test/err_syntax13.y: testcase for terminal_start() @@ -3854,7 +3890,7 @@ * test/err_syntax12.error, test/err_syntax12.output, test/err_syntax12.tab.c, test/err_syntax12.tab.h, test/yacc/err_syntax12.error, test/yacc/err_syntax12.output, - test/yacc/err_syntax12.tab.h: + test/yacc/err_syntax12.tab.c, test/yacc/err_syntax12.tab.h: reference output for testing * test/err_syntax12.y: testcase for revalued_warning() @@ -3862,7 +3898,7 @@ * test/err_syntax11.error, test/err_syntax11.output, test/err_syntax11.tab.c, test/err_syntax11.tab.h, test/yacc/err_syntax11.error, test/yacc/err_syntax11.output, - test/yacc/err_syntax11.tab.h: + test/yacc/err_syntax11.tab.c, test/yacc/err_syntax11.tab.h: reference output for testing * test/err_syntax11.y: testcase for reprec_warning() @@ -3870,7 +3906,7 @@ * test/err_syntax10.error, test/err_syntax10.output, test/err_syntax10.tab.c, test/err_syntax10.tab.h, test/yacc/err_syntax10.error, test/yacc/err_syntax10.output, - test/yacc/err_syntax10.tab.h: + test/yacc/err_syntax10.tab.c, test/yacc/err_syntax10.tab.h: reference output for testing * test/err_syntax10.y: testcase for retyped_warning() @@ -3880,7 +3916,7 @@ * test/err_syntax9.error, test/err_syntax9.output, test/err_syntax9.tab.c, test/err_syntax9.tab.h, test/yacc/err_syntax9.error, test/yacc/err_syntax9.output, - test/yacc/err_syntax9.tab.h: + test/yacc/err_syntax9.tab.c, test/yacc/err_syntax9.tab.h: reference output for testing * test/err_syntax9.y: testcase for tokenized_start() @@ -3892,7 +3928,7 @@ test/yacc/err_syntax8.error, test/yacc/err_syntax8.output, test/yacc/err_syntax8.tab.c, test/yacc/err_syntax8.tab.h, test/yacc/err_syntax8a.error, test/yacc/err_syntax8a.output, - test/yacc/err_syntax8a.tab.h: + test/yacc/err_syntax8a.tab.c, test/yacc/err_syntax8a.tab.h: reference output for testing * test/err_syntax8a.y, test/err_syntax8.y: testcase for used_reserved() @@ -3908,7 +3944,7 @@ test/yacc/err_syntax7a.error, test/yacc/err_syntax7a.output, test/yacc/err_syntax7a.tab.c, test/yacc/err_syntax7a.tab.h, test/yacc/err_syntax7b.error, test/yacc/err_syntax7b.output, - test/yacc/err_syntax7b.tab.h: + test/yacc/err_syntax7b.tab.c, test/yacc/err_syntax7b.tab.h: reference output for testing * test/err_syntax7b.y, test/err_syntax7a.y, test/err_syntax7.y: @@ -3917,7 +3953,7 @@ * test/err_syntax6.error, test/err_syntax6.output, test/err_syntax6.tab.c, test/err_syntax6.tab.h, test/yacc/err_syntax6.error, test/yacc/err_syntax6.output, - test/yacc/err_syntax6.tab.h: + test/yacc/err_syntax6.tab.c, test/yacc/err_syntax6.tab.h: reference output for testing * test/err_syntax6.y: testcase for illegal_tag() @@ -3925,7 +3961,7 @@ * test/err_syntax5.error, test/err_syntax5.output, test/err_syntax5.tab.c, test/err_syntax5.tab.h, test/yacc/err_syntax5.error, test/yacc/err_syntax5.output, - test/yacc/err_syntax5.tab.h: + test/yacc/err_syntax5.tab.c, test/yacc/err_syntax5.tab.h: reference output for testing * test/err_syntax5.y: testcase for unterminated_union() @@ -3933,7 +3969,7 @@ * test/err_syntax4.error, test/err_syntax4.output, test/err_syntax4.tab.c, test/err_syntax4.tab.h, test/yacc/err_syntax4.error, test/yacc/err_syntax4.output, - test/yacc/err_syntax4.tab.h: + test/yacc/err_syntax4.tab.c, test/yacc/err_syntax4.tab.h: reference output for testing * test/err_syntax4.y: testcase for unterminated_text() @@ -3941,7 +3977,7 @@ * test/err_syntax3.error, test/err_syntax3.output, test/err_syntax3.tab.c, test/err_syntax3.tab.h, test/yacc/err_syntax3.error, test/yacc/err_syntax3.output, - test/yacc/err_syntax3.tab.h: + test/yacc/err_syntax3.tab.c, test/yacc/err_syntax3.tab.h: reference output for testing * test/err_syntax3.y: testcase for unterminated_string() @@ -3949,7 +3985,7 @@ * test/err_syntax2.error, test/err_syntax2.output, test/err_syntax2.tab.c, test/err_syntax2.tab.h, test/yacc/err_syntax2.error, test/yacc/err_syntax2.output, - test/yacc/err_syntax2.tab.h: + test/yacc/err_syntax2.tab.c, test/yacc/err_syntax2.tab.h: reference output for testing * test/err_syntax2.y: testcase for unterminated_comment() @@ -3984,7 +4020,7 @@ * test/err_syntax1.output, test/err_syntax1.tab.c, test/err_syntax1.tab.h, test/yacc/err_syntax1.output, - test/yacc/err_syntax1.tab.h: + test/yacc/err_syntax1.tab.c, test/yacc/err_syntax1.tab.h: reference output for testing * test/run_test.sh: generate a ".dot" file for the grammar file @@ -4039,7 +4075,7 @@ test/btyacc/grammar.output, test/btyacc/grammar.tab.c, test/btyacc/grammar.tab.h, test/btyacc/pure_calc.output, test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.h, - test/btyacc/calc.tab.h: + test/btyacc/calc.output, test/btyacc/calc.tab.c, test/btyacc/calc.tab.h: reference output for testing * defs.h: @@ -4103,7 +4139,7 @@ test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, - test/quote_calc4.tab.c: + test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: regen * output.c, skeleton.c: @@ -4159,7 +4195,7 @@ test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, - test/quote_calc4.tab.c: + test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: regen * skeleton.c: @@ -4215,7 +4251,7 @@ test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, - test/quote_calc4.tab.c: + test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: regen * skeleton.c: quiet a gcc conversion-warning in yygrowstack() @@ -4378,7 +4414,7 @@ * test/pure_error.y, test/pure_calc.y: bison-fixes * test/calc2.tab.c, test/calc3.tab.c, test/code_error.code.c, - test/pure_error.tab.c: + test/ftp.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c: regen * test/code_debug.y: RCS_BASE @@ -4417,18 +4453,18 @@ * yacc.1: comment on portability * test/ftp.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, - test/quote_calc3-s.tab.c: + test/quote_calc2-s.tab.c, test/quote_calc3-s.tab.c: regen * test/ftp.y: modified to help make the files build with bison (bison's "-y" option is of no use in providing "yacc" compatibility) * test/quote_calc2.tab.c, test/quote_calc3.tab.c, - test/quote_calc4.tab.c: + test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: regen * test/code_calc.y, test/quote_calc2.y, test/quote_calc.y, - test/quote_calc3.y: + test/quote_calc4.y, test/quote_calc3.y: modified to help make the files build with bison * test/calc.tab.c: regen @@ -4485,13 +4521,13 @@ test/quote_calc2-s.tab.c, test/quote_calc2-s.tab.h, test/quote_calc3-s.output, test/quote_calc3-s.tab.c, test/quote_calc3-s.tab.h, test/quote_calc4-s.output, - test/quote_calc4-s.tab.h: + test/quote_calc4-s.tab.c, test/quote_calc4-s.tab.h: RCS_BASE * test/yacc/quote_calc-s.output, test/yacc/quote_calc-s.tab.h, test/yacc/quote_calc2-s.output, test/yacc/quote_calc2-s.tab.h, test/yacc/quote_calc3-s.output, test/yacc/quote_calc3-s.tab.h, - test/yacc/quote_calc4-s.tab.h: + test/yacc/quote_calc4-s.output, test/yacc/quote_calc4-s.tab.h: reference output for testing * test/run_test.sh: generate/test with "-s" option applied. @@ -4507,7 +4543,7 @@ * main.c: add -s option to usage message. * test/quote_calc3.output, test/quote_calc3.tab.c, - test/quote_calc4.tab.h: + test/quote_calc4.output, test/quote_calc4.tab.c, test/quote_calc4.tab.h: RCS_BASE * test/yacc/quote_calc3.output, test/yacc/quote_calc4.output, @@ -4520,11 +4556,11 @@ * test/quote_calc.output, test/quote_calc.tab.c, test/quote_calc2.output, test/quote_calc2.tab.c, - test/quote_calc3.tab.h: + test/quote_calc2.tab.h, test/quote_calc3.tab.h: RCS_BASE * test/yacc/quote_calc.output, test/yacc/quote_calc2.output, - test/yacc/quote_calc3.tab.h: + test/yacc/quote_calc2.tab.h, test/yacc/quote_calc3.tab.h: reference output for testing * test/quote_calc4.y, test/quote_calc.y, test/quote_calc2.y: RCS_BASE @@ -4628,12 +4664,12 @@ * test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, - test/error.tab.c: + test/code_error.code.c, test/error.tab.c: regen * test/pure_error.y, test/pure_calc.y, test/ftp.y, test/error.y, test/code_error.y, test/code_calc.y, test/calc.y, test/calc3.y, - test/calc1.y: + test/calc2.y, test/calc1.y: use byacc's YYLEX_DECL/YYERROR_DECL symbols to prototype yylex/yyerror * skeleton.c: @@ -4706,7 +4742,7 @@ * test/calc2.tab.c, test/calc2.y, test/calc3.tab.c, test/calc3.y, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, - test/error.tab.c: + test/code_calc.code.c, test/code_error.code.c, test/error.tab.c: regen * output.c: @@ -4717,7 +4753,7 @@ * test/calc1.y, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, - test/error.tab.c: + test/code_calc.code.c, test/code_error.code.c, test/error.tab.c: regen * output.c: generate yyerror() calls in output.c @@ -4842,7 +4878,7 @@ use CF_XOPEN_SOURCE check to ensure that strdup is in scope, e.g., for c89 * test/ftp.tab.c, test/ftp.y, reader.c, symtab.c, verbose.c, lr0.c, - closure.c: + main.c, mkpar.c, output.c, defs.h, closure.c: fix warnings from clang --analyze 2010-06-08 Thomas E. Dickey @@ -4854,7 +4890,7 @@ * test/ftp.tab.c, test/ftp.y, test/calc.tab.c, test/code_calc.code.c, test/code_error.code.c, test/code_error.y, test/code_calc.y, test/calc.y, test/pure_error.tab.c, test/error.tab.c, test/error.y, - test/pure_calc.y: + test/pure_error.y, test/pure_calc.tab.c, test/pure_calc.y: modified test-cases to allow them to compile, to validate pure-parser changes. updated reference files to match. @@ -4903,7 +4939,7 @@ RCS_BASE * test/yacc/pure_calc.output, test/yacc/pure_calc.tab.h, - test/yacc/pure_error.tab.h: + test/yacc/pure_error.output, test/yacc/pure_error.tab.h: reference output for testing * test/code_calc.output, test/code_error.output: RCS_BASE @@ -5074,7 +5110,7 @@ * VERSION: 20091027 * output.c, mkpar.c, defs.h, lalr.c, closure.c, graph.c, lr0.c, - reader.c: + verbose.c, main.c, reader.c: strict compiler warnings 2009-10-26 Thomas E. Dickey @@ -5127,7 +5163,7 @@ 2008-11-24 Thomas E. Dickey * closure.c, defs.h, error.c, graph.c, lalr.c, lr0.c, main.c, mkpar.c, - warshall.c: + output.c, reader.c, skeleton.c, symtab.c, verbose.c, warshall.c: change indent-style (request by Perry E. Metzger) 2008-08-27 Thomas E. Dickey @@ -5173,7 +5209,7 @@ 2008-08-26 Thomas E. Dickey * warshall.c, verbose.c, symtab.c, skeleton.c, reader.c, output.c, - closure.c: + mkpar.c, main.c, lr0.c, lalr.c, graph.c, error.c, closure.c: remove 'register' keywords 2008-08-25 Thomas E. Dickey @@ -5361,7 +5397,7 @@ YYPATCH symbols. * lalr.c, lr0.c, mkpar.c, defs.h, closure.c, warshall.c, output.c, - symtab.c: + verbose.c, graph.c, reader.c, main.c, symtab.c: reduce externs by making static the procedures that are not referenced outside the module in which they are defined. @@ -5393,7 +5429,7 @@ add support for "%expect", a bison feature from FreeBSD sources * lr0.c, reader.c, main.c, skeleton.c, graph.c, symtab.c, closure.c, - output.c: + mkpar.c, lalr.c, error.c, warshall.c, verbose.c, output.c: indent'd * configure: regenerated for 2005/5/5 @@ -5534,7 +5570,7 @@ 2000-02-13 Thomas E. Dickey * defs.h, verbose.c, reader.c, main.c, skeleton.c, warshall.c, symtab.c, - error.c: + closure.c, mkpar.c, lalr.c, lr0.c, output.c, error.c: ansify 1999-11-30 Thomas E. Dickey diff --git a/MANIFEST b/MANIFEST index 74f6e7a..e1f20e0 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for byacc, version t20220128 +MANIFEST for byacc, version t20221106 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 diff --git a/VERSION b/VERSION index 5f74118..a9017fb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20220128 +20221106 diff --git a/aclocal.m4 b/aclocal.m4 index 94842ab..0665c7f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.56 2021/12/16 23:22:31 tom Exp $ +dnl $Id: aclocal.m4,v 1.57 2022/10/02 23:55:56 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- -dnl Copyright 2004-2020,2021 Thomas E. Dickey +dnl Copyright 2004-2021,2022 Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -1449,7 +1449,7 @@ AC_SUBST(GROFF_NOTE) AC_SUBST(NROFF_NOTE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37 +dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ @@ -1460,6 +1460,7 @@ case "x$LINT" in ;; esac AC_SUBST(LINT_OPTS) +AC_SUBST(LINT_LIBS) ])dnl dnl --------------------------------------------------------------------------- dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40 @@ -1497,34 +1498,20 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 3 updated: 2021/08/28 15:20:37 +dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([ -#include -#include -#include -],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, [cf_cv_xopen_source=no], [cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE) - AC_TRY_COMPILE([ -#include -#include -#include -],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" ]) ]) @@ -1779,7 +1766,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 59 updated: 2021/08/28 15:20:37 +dnl CF_XOPEN_SOURCE version: 62 updated: 2022/10/02 19:55:56 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, @@ -1830,7 +1817,7 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; (minix*) @@ -1879,7 +1866,13 @@ case "$host_os" in ;; (*) CF_TRY_XOPEN_SOURCE + cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + # Some of these niche implementations use copy/paste, double-check... + CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes) + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ + AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) + CPPFLAGS="$cf_save_xopen_cppflags"]) ;; esac @@ -1917,3 +1910,23 @@ make an error fi fi # cf_cv_posix_visible ]) +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_BODY version: 1 updated: 2022/09/10 15:17:35 +dnl --------------------- +dnl body of test when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_BODY], +[ +#ifndef _XOPEN_SOURCE +make an error +#endif +]) +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_HEAD version: 1 updated: 2022/09/10 15:17:03 +dnl --------------------- +dnl headers to include when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_HEAD], +[ +#include +#include +#include +]) diff --git a/config.guess b/config.guess index 1105a74..a419d86 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-11-30' +timestamp='2022-08-01' # 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 -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2022 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." @@ -929,6 +929,9 @@ EOF i*:PW*:*) GUESS=$UNAME_MACHINE-pc-pw32 ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) case $UNAME_MACHINE in x86) @@ -1033,7 +1036,7 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1148,16 +1151,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1364,8 +1378,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE diff --git a/config.sub b/config.sub index 200e14f..fbaa37f 100755 --- a/config.sub +++ b/config.sub @@ -1,14 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-12-24' +timestamp='2022-08-01' # 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 -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2022 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." @@ -1020,6 +1020,11 @@ case $cpu-$vendor in ;; # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull @@ -1202,7 +1207,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ diff --git a/configure b/configure index 911b4a4..f8984c1 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # From configure.in Revision: 1.26 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20210509. +# Generated by Autoconf 2.52.20221009. # -# Copyright 2003-2020,2021 Thomas E. Dickey +# Copyright 2003-2021,2022 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -34,9 +34,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -51,7 +51,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -768,7 +768,7 @@ test -n "$ac_init_help" && exit 0 if "$ac_init_version"; then cat <<\EOF -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2021,2022 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -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.20210509. Invocation command line was +generated by GNU Autoconf 2.52.20221009. Invocation command line was $ $0 $@ @@ -2868,7 +2868,7 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) cf_gnu_xopen_source=$cf_XOPEN_SOURCE @@ -3711,21 +3711,22 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3719: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3722: \$? = $ac_status" >&5 + echo "$as_me:3723: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3725: \"$ac_try\"") >&5 + { (eval echo "$as_me:3726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3728: \$? = $ac_status" >&5 + echo "$as_me:3729: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3737,7 +3738,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 3740 "configure" +#line 3741 "configure" #include "confdefs.h" #include @@ -3748,24 +3749,25 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3761: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3762: \$? = $ac_status" >&5 + echo "$as_me:3764: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3765: \"$ac_try\"") >&5 + { (eval echo "$as_me:3767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3768: \$? = $ac_status" >&5 + echo "$as_me:3770: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3774,13 +3776,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3783: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3785: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3923,6 +3925,8 @@ done fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -3938,16 +3942,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:3941: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3945: 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}:3947: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3951: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3950 "configure" +#line 3954 "configure" #include "confdefs.h" #include int @@ -3962,16 +3966,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3965: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3969: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3968: \$? = $ac_status" >&5 + echo "$as_me:3972: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3971: \"$ac_try\"") >&5 + { (eval echo "$as_me:3975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3974: \$? = $ac_status" >&5 + echo "$as_me:3978: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -3992,7 +3996,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3995 "configure" +#line 3999 "configure" #include "confdefs.h" #include int @@ -4007,16 +4011,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4014: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4013: \$? = $ac_status" >&5 + echo "$as_me:4017: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4016: \"$ac_try\"") >&5 + { (eval echo "$as_me:4020: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4019: \$? = $ac_status" >&5 + echo "$as_me:4023: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4027,7 +4031,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4030: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4034: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4035,10 +4039,10 @@ echo "${as_me:-configure}:4030: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4038: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4042: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4041 "configure" +#line 4045 "configure" #include "confdefs.h" #include int @@ -4053,16 +4057,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4056: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4060: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4059: \$? = $ac_status" >&5 + echo "$as_me:4063: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4062: \"$ac_try\"") >&5 + { (eval echo "$as_me:4066: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4065: \$? = $ac_status" >&5 + echo "$as_me:4069: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4078,7 +4082,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4081: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4085: 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 @@ -4187,6 +4191,53 @@ fi fi # cf_cv_posix_visible + # Some of these niche implementations use copy/paste, double-check... + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + +echo "${as_me:-configure}:4197: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 4200 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4223: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:4236: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ;; esac @@ -4204,7 +4255,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:4207: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:4258: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -4216,7 +4267,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:4219: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:4270: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -4304,7 +4355,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}:4307: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4358: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4314,7 +4365,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}:4317: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4368: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4324,7 +4375,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}:4327: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4378: 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" @@ -4336,10 +4387,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4339: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4390: 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 4342 "configure" +#line 4393 "configure" #include "confdefs.h" #include int @@ -4354,16 +4405,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4357: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4360: \$? = $ac_status" >&5 + echo "$as_me:4411: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4363: \"$ac_try\"") >&5 + { (eval echo "$as_me:4414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4366: \$? = $ac_status" >&5 + echo "$as_me:4417: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4372,12 +4423,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:4375: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4426: 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 4380 "configure" +#line 4431 "configure" #include "confdefs.h" #include int @@ -4392,57 +4443,6 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4395: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4398: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4404: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_XOPEN_SOURCE_set_ok=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_XOPEN_SOURCE_set_ok=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - if test "$cf_XOPEN_SOURCE_set_ok" = no - then - { echo "$as_me:4415: WARNING: _XOPEN_SOURCE is lower than requested" >&5 -echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} - fi - else - -echo "$as_me:4420: 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 4427 "configure" -#include "confdefs.h" - -#include -#include -#include - -int -main (void) -{ - -#ifndef _XOPEN_SOURCE -make an error -#endif - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4454,17 +4454,28 @@ if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:4455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_xopen_source=no + cf_XOPEN_SOURCE_set_ok=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_save="$CPPFLAGS" +cf_XOPEN_SOURCE_set_ok=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then + { echo "$as_me:4466: WARNING: _XOPEN_SOURCE is lower than requested" >&5 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +echo "$as_me:4471: 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 4467 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4478 "configure" #include "confdefs.h" #include @@ -4475,24 +4486,66 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4489: \$? = $ac_status" >&5 + echo "$as_me:4501: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4492: \"$ac_try\"") >&5 + { (eval echo "$as_me:4504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4495: \$? = $ac_status" >&5 + echo "$as_me:4507: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 4519 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4539: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4542: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4548: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4501,13 +4554,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4510: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4563: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4658,7 +4711,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:4661: checking for $ac_word" >&5 +echo "$as_me:4714: 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 @@ -4673,7 +4726,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:4676: found $ac_dir/$ac_word" >&5 +echo "$as_me:4729: found $ac_dir/$ac_word" >&5 break done @@ -4681,10 +4734,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:4684: result: $GREP" >&5 + echo "$as_me:4737: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:4687: result: no" >&5 + echo "$as_me:4740: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4692,7 +4745,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:4695: checking for egrep" >&5 +echo "$as_me:4748: 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 @@ -4704,7 +4757,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:4707: checking for $ac_word" >&5 +echo "$as_me:4760: 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 @@ -4721,7 +4774,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:4724: found $ac_dir/$ac_word" >&5 + echo "$as_me:4777: found $ac_dir/$ac_word" >&5 break fi done @@ -4732,10 +4785,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:4735: result: $EGREP" >&5 + echo "$as_me:4788: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:4738: result: no" >&5 + echo "$as_me:4791: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4743,12 +4796,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4746: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4799: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:4751: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:4804: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -4758,7 +4811,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:4761: checking how to run the C preprocessor" >&5 +echo "$as_me:4814: 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 @@ -4779,18 +4832,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 4782 "configure" +#line 4835 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:4787: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4840: \"$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:4793: \$? = $ac_status" >&5 + echo "$as_me:4846: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4813,17 +4866,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 4816 "configure" +#line 4869 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4820: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4873: \"$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:4826: \$? = $ac_status" >&5 + echo "$as_me:4879: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4860,7 +4913,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:4863: result: $CPP" >&5 +echo "$as_me:4916: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4870,18 +4923,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 4873 "configure" +#line 4926 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:4878: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4931: \"$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:4884: \$? = $ac_status" >&5 + echo "$as_me:4937: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4904,17 +4957,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 4907 "configure" +#line 4960 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4911: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4964: \"$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:4917: \$? = $ac_status" >&5 + echo "$as_me:4970: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4942,7 +4995,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:4945: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:4998: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -4957,23 +5010,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:4960: checking for $ac_header" >&5 +echo "$as_me:5013: 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 4966 "configure" +#line 5019 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4970: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5023: \"$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:4976: \$? = $ac_status" >&5 + echo "$as_me:5029: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4992,7 +5045,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5048: 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 <&5 +echo "$as_me:5063: 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 5016 "configure" +#line 5069 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5020: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5073: \"$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:5026: \$? = $ac_status" >&5 + echo "$as_me:5079: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5042,7 +5095,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5045: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5098: 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 <&5 +echo "$as_me:5108: 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 @@ -5063,7 +5116,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 5066 "configure" +#line 5119 "configure" #include "confdefs.h" #include @@ -5104,15 +5157,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5160: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5110: \$? = $ac_status" >&5 + echo "$as_me:5163: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5112: \"$ac_try\"") >&5 + { (eval echo "$as_me:5165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5115: \$? = $ac_status" >&5 + echo "$as_me:5168: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -5127,16 +5180,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:5130: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:5183: 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:5133: checking for mkstemp" >&5 + echo "$as_me:5186: 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 5139 "configure" +#line 5192 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5167,16 +5220,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5170: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5223: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5173: \$? = $ac_status" >&5 + echo "$as_me:5226: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5176: \"$ac_try\"") >&5 + { (eval echo "$as_me:5229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5179: \$? = $ac_status" >&5 + echo "$as_me:5232: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -5186,7 +5239,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5189: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:5242: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -5201,23 +5254,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:5204: checking for $ac_header" >&5 +echo "$as_me:5257: 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 5210 "configure" +#line 5263 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5214: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5267: \"$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:5220: \$? = $ac_status" >&5 + echo "$as_me:5273: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5236,7 +5289,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5239: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5292: 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 <&5 +echo "$as_me:5302: 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 @@ -5256,7 +5309,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 5259 "configure" +#line 5312 "configure" #include "confdefs.h" #include <$cf_header> @@ -5269,16 +5322,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5272: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5275: \$? = $ac_status" >&5 + echo "$as_me:5328: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5278: \"$ac_try\"") >&5 + { (eval echo "$as_me:5331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5281: \$? = $ac_status" >&5 + echo "$as_me:5334: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -5290,7 +5343,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5293: result: $cf_cv_getopt_header" >&5 +echo "$as_me:5346: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -5310,13 +5363,13 @@ fi for ac_func in getopt vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5313: checking for $ac_func" >&5 +echo "$as_me:5366: 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 5319 "configure" +#line 5372 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5347,16 +5400,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5353: \$? = $ac_status" >&5 + echo "$as_me:5406: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5356: \"$ac_try\"") >&5 + { (eval echo "$as_me:5409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5359: \$? = $ac_status" >&5 + echo "$as_me:5412: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -5366,7 +5419,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5369: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:5422: 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 <&5 +echo "$as_me:5432: 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. @@ -5386,12 +5439,12 @@ if test "${with_max_table_size+set}" = set; then fi; if test -n "$with_max_table_size" then - echo "$as_me:5389: result: $with_max_table_size" >&5 + echo "$as_me:5442: 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:5394: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 + { { echo "$as_me:5447: 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 @@ -5401,11 +5454,11 @@ cat >>confdefs.h <&5 + echo "$as_me:5457: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:5408: checking if backtracking extension is wanted" >&5 +echo "$as_me:5461: 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. @@ -5413,7 +5466,7 @@ if test "${enable_btyacc+set}" = set; then enableval="$enable_btyacc" fi; -echo "$as_me:5416: result: $enable_btyacc" >&5 +echo "$as_me:5469: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "no"; then SKELETON=yaccpar @@ -5426,7 +5479,7 @@ EOF SKELETON=btyaccpar fi -echo "$as_me:5429: checking for fgrep" >&5 +echo "$as_me:5482: 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 @@ -5438,7 +5491,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:5441: checking for $ac_word" >&5 +echo "$as_me:5494: 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 @@ -5455,7 +5508,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:5458: found $ac_dir/$ac_word" >&5 + echo "$as_me:5511: found $ac_dir/$ac_word" >&5 break fi done @@ -5466,10 +5519,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:5469: result: $FGREP" >&5 + echo "$as_me:5522: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:5472: result: no" >&5 + echo "$as_me:5525: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5477,16 +5530,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5480: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5533: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:5485: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:5538: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:5489: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:5542: 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. @@ -5503,17 +5556,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:5506: result: $enable_stdnoreturn" >&5 +echo "$as_me:5559: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:5510: checking for C11 _Noreturn feature" >&5 +echo "$as_me:5563: 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 5516 "configure" +#line 5569 "configure" #include "confdefs.h" #include @@ -5530,16 +5583,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5586: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5536: \$? = $ac_status" >&5 + echo "$as_me:5589: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5539: \"$ac_try\"") >&5 + { (eval echo "$as_me:5592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5542: \$? = $ac_status" >&5 + echo "$as_me:5595: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -5550,7 +5603,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5553: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:5606: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -5606,16 +5659,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:5609: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5662: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:5614: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5667: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5618: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5671: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5654,16 +5707,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5657: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5710: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5662: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5715: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5666: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5719: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5702,23 +5755,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5705: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5758: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5710: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5763: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5714: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5767: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:5721: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:5774: 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. @@ -5735,14 +5788,14 @@ else enable_warnings=no fi; -echo "$as_me:5738: result: $enable_warnings" >&5 +echo "$as_me:5791: 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" <&5 + { echo "$as_me:5814: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -5774,12 +5827,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:5777: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5830: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5780: \$? = $ac_status" >&5 + echo "$as_me:5833: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5782: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5835: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -5787,7 +5840,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:5790: checking for $CC warning options..." >&5 + { echo "$as_me:5843: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -5810,12 +5863,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:5813: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5816: \$? = $ac_status" >&5 + echo "$as_me:5869: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5818: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5871: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -5823,7 +5876,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}:5826: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5879: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5833,7 +5886,7 @@ echo "${as_me:-configure}:5826: 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}:5836: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5889: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5866,10 +5919,10 @@ cat > conftest.i <&5 + { echo "$as_me:5922: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <&5 + if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5924: \$? = $ac_status" >&5 + echo "$as_me:5977: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5926: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:5979: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -5984,7 +6037,7 @@ fi fi -echo "$as_me:5987: checking if you want to see long compiling messages" >&5 +echo "$as_me:6040: 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. @@ -6018,10 +6071,10 @@ else ECHO_CC='' fi; -echo "$as_me:6021: result: $enableval" >&5 +echo "$as_me:6074: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:6024: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:6077: 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. @@ -6043,7 +6096,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:6046: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:6099: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6157,23 +6210,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6160: checking for dmalloc.h" >&5 + echo "$as_me:6213: 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 6166 "configure" +#line 6219 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6170: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6223: \"$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:6176: \$? = $ac_status" >&5 + echo "$as_me:6229: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6192,11 +6245,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6195: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6248: 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:6199: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6252: 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 @@ -6204,7 +6257,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6207 "configure" +#line 6260 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6223,16 +6276,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6279: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6229: \$? = $ac_status" >&5 + echo "$as_me:6282: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6232: \"$ac_try\"") >&5 + { (eval echo "$as_me:6285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6235: \$? = $ac_status" >&5 + echo "$as_me:6288: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6243,7 +6296,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6246: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6299: 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 <&5 +echo "$as_me:6314: 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. @@ -6280,7 +6333,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:6283: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6336: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6394,23 +6447,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6397: checking for dbmalloc.h" >&5 + echo "$as_me:6450: 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 6403 "configure" +#line 6456 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6407: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6460: \"$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:6413: \$? = $ac_status" >&5 + echo "$as_me:6466: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6429,11 +6482,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6432: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6485: 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:6436: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6489: 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 @@ -6441,7 +6494,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6444 "configure" +#line 6497 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6460,16 +6513,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6463: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6516: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6466: \$? = $ac_status" >&5 + echo "$as_me:6519: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6469: \"$ac_try\"") >&5 + { (eval echo "$as_me:6522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6472: \$? = $ac_status" >&5 + echo "$as_me:6525: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6480,7 +6533,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6483: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6536: 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 <&5 +echo "$as_me:6551: 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. @@ -6517,7 +6570,7 @@ EOF else with_valgrind= fi; -echo "$as_me:6520: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6573: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -6630,7 +6683,7 @@ fi ;; esac -echo "$as_me:6633: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6686: 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. @@ -6641,7 +6694,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:6644: result: $with_no_leaks" >&5 +echo "$as_me:6697: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -6658,7 +6711,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:6661: checking for $ac_word" >&5 +echo "$as_me:6714: 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 @@ -6675,7 +6728,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:6678: found $ac_dir/$ac_word" >&5 + echo "$as_me:6731: found $ac_dir/$ac_word" >&5 break fi done @@ -6687,10 +6740,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6690: result: $GROFF_PATH" >&5 + echo "$as_me:6743: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6693: result: no" >&5 + echo "$as_me:6746: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6698,7 +6751,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:6701: checking for $ac_word" >&5 +echo "$as_me:6754: 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 @@ -6715,7 +6768,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:6718: found $ac_dir/$ac_word" >&5 + echo "$as_me:6771: found $ac_dir/$ac_word" >&5 break fi done @@ -6726,10 +6779,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:6729: result: $NROFF_PATH" >&5 + echo "$as_me:6782: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:6732: result: no" >&5 + echo "$as_me:6785: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6739,7 +6792,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:6742: checking for $ac_word" >&5 +echo "$as_me:6795: 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 @@ -6756,7 +6809,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:6759: found $ac_dir/$ac_word" >&5 + echo "$as_me:6812: found $ac_dir/$ac_word" >&5 break fi done @@ -6768,10 +6821,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:6771: result: $TBL_PATH" >&5 + echo "$as_me:6824: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:6774: result: no" >&5 + echo "$as_me:6827: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6791,7 +6844,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:6794: checking for $ac_word" >&5 +echo "$as_me:6847: 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 @@ -6808,7 +6861,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:6811: found $ac_dir/$ac_word" >&5 + echo "$as_me:6864: found $ac_dir/$ac_word" >&5 break fi done @@ -6820,16 +6873,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6823: result: $cf_man2html" >&5 + echo "$as_me:6876: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6826: result: no" >&5 + echo "$as_me:6879: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:6832: checking for the modified Earl Hood script" >&5 + echo "$as_me:6885: 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 @@ -6838,7 +6891,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:6841: result: $cf_man2html_ok" >&5 + echo "$as_me:6894: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6847,7 +6900,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6850: checking for program to convert manpage to html" >&5 +echo "$as_me:6903: 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. @@ -6862,11 +6915,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6865: result: man2html" >&5 + echo "$as_me:6918: 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:6869: checking for $ac_word" >&5 +echo "$as_me:6922: 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 @@ -6883,7 +6936,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:6886: found $ac_dir/$ac_word" >&5 + echo "$as_me:6939: found $ac_dir/$ac_word" >&5 break fi done @@ -6895,10 +6948,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6898: result: $cf_man2html" >&5 + echo "$as_me:6951: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6901: result: no" >&5 + echo "$as_me:6954: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6906,11 +6959,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6909: result: $cf_man2html" >&5 + echo "$as_me:6962: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6913: result: $cf_man2html" >&5 + echo "$as_me:6966: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6951,12 +7004,12 @@ else # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:6954: checking if nroff is really groff" >&5 + echo "$as_me:7007: 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:6959: result: $cf_check_groff" >&5 + echo "$as_me:7012: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -6987,14 +7040,14 @@ case ".$cf_man2html" in cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6990: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:7043: 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:6997: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:7050: 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 @@ -7012,10 +7065,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:7015: result: $cf_man2html_top_bot" >&5 + echo "$as_me:7068: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:7018: checking for pagesize to use" >&5 + echo "$as_me:7071: 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 @@ -7040,7 +7093,7 @@ CF_EOF test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:7043: result: $cf_man2html_page" >&5 + echo "$as_me:7096: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <&5 +echo "$as_me:7115: 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 7068 "configure" +#line 7121 "configure" #include "confdefs.h" #include #include @@ -7073,13 +7126,13 @@ else #include _ACEOF -if { (eval echo "$as_me:7076: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7129: \"$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:7082: \$? = $ac_status" >&5 + echo "$as_me:7135: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7101,7 +7154,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 7104 "configure" +#line 7157 "configure" #include "confdefs.h" #include @@ -7119,7 +7172,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 7122 "configure" +#line 7175 "configure" #include "confdefs.h" #include @@ -7140,7 +7193,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 7143 "configure" +#line 7196 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -7166,15 +7219,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7222: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7172: \$? = $ac_status" >&5 + echo "$as_me:7225: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 + { (eval echo "$as_me:7227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7177: \$? = $ac_status" >&5 + echo "$as_me:7230: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7187,7 +7240,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:7190: result: $ac_cv_header_stdc" >&5 +echo "$as_me:7243: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -7203,28 +7256,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:7206: checking for $ac_header" >&5 +echo "$as_me:7259: 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 7212 "configure" +#line 7265 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7218: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7221: \$? = $ac_status" >&5 + echo "$as_me:7274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7224: \"$ac_try\"") >&5 + { (eval echo "$as_me:7277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7227: \$? = $ac_status" >&5 + echo "$as_me:7280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -7234,7 +7287,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7237: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7290: 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 <&5 +echo "$as_me:7300: 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 7253 "configure" +#line 7306 "configure" #include "confdefs.h" $ac_includes_default int @@ -7265,16 +7318,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7268: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7321: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7271: \$? = $ac_status" >&5 + echo "$as_me:7324: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7274: \"$ac_try\"") >&5 + { (eval echo "$as_me:7327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7277: \$? = $ac_status" >&5 + echo "$as_me:7330: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -7284,7 +7337,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7287: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:7340: 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 : @@ -7377,7 +7430,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:7380: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7433: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -7386,6 +7439,8 @@ cat >"$CONFIG_STATUS" <<_ACEOF # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. +me=\`echo "\$0" | sed -e 's,.*\\/,,'\` + debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" @@ -7407,9 +7462,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -7424,7 +7479,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -7508,10 +7563,10 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7556: error: ambiguous option: $1 + { { echo "$as_me:7611: 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;} @@ -7572,7 +7627,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7575: error: unrecognized option: $1 + -*) { { echo "$as_me:7630: 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;} @@ -7591,7 +7646,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20210509, executed with +This file was extended by $as_me 2.52.20221009, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -7609,7 +7664,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:7612: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:7667: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7632,14 +7687,14 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} +: "${TMPDIR=/tmp}" { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 @@ -7659,7 +7714,7 @@ cat >>"$CONFIG_STATUS" <\$tmp/subs.sed <<\\CEOF + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >"\$tmp"/subs.sed <<\\CEOF s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_LIBS@,$X_LIBS,;t t s,@SHELL@,$SHELL,;t t @@ -7725,6 +7780,7 @@ s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t s,@AWK@,$AWK,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t s,@CPP@,$CPP,;t t s,@GREP@,$GREP,;t t s,@EGREP@,$EGREP,;t t @@ -7762,11 +7818,11 @@ EOF ac_sed_cmds= while "$ac_more_lines"; do if test "$ac_beg" -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "1,${ac_beg}d; ${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag fi - if test ! -s $tmp/subs.frag; then + if test ! -s "$tmp"/subs.frag; then ac_more_lines=false else # The purpose of the label and of the branching condition is to @@ -7774,17 +7830,17 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` - sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next - if test -s $tmp/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then - grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then + sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next + if test -s "$tmp"/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then if test "$ac_beg" -gt 1; then ac_end=`expr "$ac_end" - 1` continue @@ -7794,9 +7850,9 @@ EOF fi if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f \"$tmp\"/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f \"$tmp\"/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end @@ -7804,7 +7860,7 @@ EOF fi done if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_sed_cmds="cat" fi fi # test -n "$CONFIG_FILES" @@ -7814,7 +7870,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -7851,7 +7907,7 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do esac done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + ac_dir_suffix="/`echo "$ac_dir"|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else @@ -7879,7 +7935,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7882: creating $ac_file" >&5 + { echo "$as_me:7938: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7894,23 +7950,23 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7900: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7956: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative if test -f "$f"; then # Build tree - echo $f + echo "$f" elif test -f "$srcdir/$f"; then # Source tree echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7913: error: cannot find input file: $f" >&5 + { { echo "$as_me:7969: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7926,7 +7982,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:7929: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:7985: 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;} @@ -7935,7 +7991,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:7938: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:7994: 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;} @@ -7960,38 +8016,46 @@ s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin +" $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out + rm -f "$tmp"/stdin +EOF +: "${FGREP:=grep -F}" +: "${EGREP:=grep -E}" +cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` + ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then - ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:7975: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:8039: 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;} fi fi done - ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out - ${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:7986: WARNING: Some variables may not be substituted: + $EGREP -n '@[a-z_][a-z_0-9]+@' "$ac_file" >"$tmp"/out + $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:8050: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} fi else - cat $tmp/out + cat "$tmp"/out fi - rm -f $tmp/out + rm -f "$tmp"/out done EOF @@ -8024,7 +8088,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -8032,7 +8096,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:8035: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:8099: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -8040,10 +8104,10 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:8046: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8110: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -8056,14 +8120,14 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:8059: error: cannot find input file: $f" >&5 + { { echo "$as_me:8123: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >"$tmp"/in EOF @@ -8109,14 +8173,14 @@ EOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>"$CONFIG_STATUS" -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>"$CONFIG_STATUS" +echo ' if ${EGREP-grep -E} "^[ ]*#[ ]*define" "$tmp"/in >/dev/null; then' >>"$CONFIG_STATUS" echo ' # If there are no defines, we may have an empty if/fi' >>"$CONFIG_STATUS" echo ' :' >>"$CONFIG_STATUS" rm -f conftest.tail while grep . conftest.defines >/dev/null do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>"$CONFIG_STATUS" + # Write a limited-size here document to "$tmp"/defines.sed. + echo ' cat >"$tmp"/defines.sed <>"$CONFIG_STATUS" # Speed up: don't consider the non `#define' lines. echo '/^[ ]*#[ ]*define/!b' >>"$CONFIG_STATUS" # Work around the forget-to-reset-the-flag bug. @@ -8124,16 +8188,16 @@ do echo ': clr' >>"$CONFIG_STATUS" sed "${ac_max_here_lines}q" conftest.defines >>"$CONFIG_STATUS" echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in + sed -f "$tmp"/defines.sed "$tmp"/in >"$tmp"/out + rm -f "$tmp"/in + mv "$tmp"/out "$tmp"/in ' >>"$CONFIG_STATUS" sed "1,${ac_max_here_lines}d" conftest.defines >conftest.tail rm -f conftest.defines mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>"$CONFIG_STATUS" +echo ' fi # grep' >>"$CONFIG_STATUS" echo >>"$CONFIG_STATUS" # Break up conftest.undefs because some shells have a limit on the size @@ -8142,8 +8206,8 @@ echo ' # Handle all the #undef templates' >>"$CONFIG_STATUS" rm -f conftest.tail while grep . conftest.undefs >/dev/null do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>"$CONFIG_STATUS" + # Write a limited-size here document to "$tmp"/undefs.sed. + echo ' cat >"$tmp"/undefs.sed <>"$CONFIG_STATUS" # Speed up: don't consider the non `#undef' echo '/^[ ]*#[ ]*undef/!b' >>"$CONFIG_STATUS" # Work around the forget-to-reset-the-flag bug. @@ -8151,9 +8215,9 @@ do echo ': clr' >>"$CONFIG_STATUS" sed "${ac_max_here_lines}q" conftest.undefs >>"$CONFIG_STATUS" echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in + sed -f "$tmp"/undefs.sed "$tmp"/in >"$tmp"/out + rm -f "$tmp"/in + mv "$tmp"/out "$tmp"/in ' >>"$CONFIG_STATUS" sed "1,${ac_max_here_lines}d" conftest.undefs >conftest.tail rm -f conftest.undefs @@ -8166,15 +8230,15 @@ cat >>"$CONFIG_STATUS" <<\EOF # use $as_me), people would be surprised to read: # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated automatically by configure. */" >"$tmp"/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated automatically by configure. */" >"$tmp"/config.h fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + cat "$tmp"/in >>"$tmp"/config.h + 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:8177: $ac_file is unchanged" >&5 + { echo "$as_me:8241: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -8210,8 +8274,8 @@ done; } mv "$tmp/config.h" "$ac_file" fi else - cat $tmp/config.h - rm -f $tmp/config.h + cat "$tmp"/config.h + rm -f "$tmp"/config.h fi done EOF diff --git a/defs.h b/defs.h index 614478b..62855e4 100644 --- a/defs.h +++ b/defs.h @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.70 2021/08/01 22:21:53 tom Exp $ */ +/* $Id: defs.h,v 1.71 2022/11/06 21:44:54 tom Exp $ */ #ifdef HAVE_CONFIG_H #include @@ -360,7 +360,7 @@ extern char line_format[]; #define fprintf_lineno(f, n, s) \ if (!lflag) \ - fprintf(f, line_format, (n), (s)) + fprintf(f, line_format, (n), (s) ? (s) : "(null)") extern Value_t start_symbol; extern char **symbol_name; diff --git a/install-sh b/install-sh index 462fa9c..ec298b5 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,8 @@ -#! /bin/sh -# +#!/bin/sh # install - install a program, script, or datafile -# + +scriptversion=2020-11-14.01; # UTC + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -34,261 +35,507 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. +tab=' ' +nl=' +' +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} +doit_exec=${doit:-exec} +# Put in absolute file names if you don't have them in your path; +# or use environment vars. -# put in absolute paths if you don't have them in your path; or use env. vars. +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +posix_mkdir= -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +# Desired mode of installed file. +mode=0755 + +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" +stripcmd= -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; +src= +dst= +dir_arg= +dst_arg= - -d) dir_arg=true - shift - continue;; +copy_on_change=false +is_target_a_directory=possibly - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... - -o) chowncmd="$chownprog $2" - shift - shift - continue;; +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; +Options: + --help display this help and exit. + --version display version info and exit. - -s) stripcmd=$stripprog - shift - continue;; + -c (ignored) + -C install only if different (preserve data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. + -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -p) cpprog="$cpprog -p";; + + -s) stripcmd=$stripprog;; + + -S) backupsuffix="$2" + shift;; + + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac + dstdir_status=0 + else + dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi + fi + + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + oIFS=$IFS + IFS=/ + set -f + set fnord $dstdir + shift + set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi done -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift - - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi - - pathcomp=$pathcomp/ -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. - - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - -fi && - -# The final little trick to "correctly" pass the exit status to the exit trap. - -{ - (exit 0); exit -} +# Local variables: +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/makefile.in b/makefile.in index 292c151..62d4eb7 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.24 2015/07/05 22:12:29 tom Exp $ +# $Id: makefile.in,v 1.25 2022/11/06 21:03:11 tom Exp $ # # UNIX template-makefile for Berkeley Yacc @@ -27,6 +27,7 @@ LIBS = @LIBS@ AWK = @AWK@ CTAGS = @CTAGS@ ETAGS = @ETAGS@ +FGREP = @FGREP@ LINT = @LINT@ LINTFLAGS = @LINT_OPTS@ @@ -147,13 +148,16 @@ maintainer-clean :: realclean ################################################################################ check: $(THIS)$x - $(SHELL) $(testdir)/run_test.sh $(testdir) + @echo "** making $@" + @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_test.sh $(testdir) check_make: $(THIS)$x - $(SHELL) $(testdir)/run_make.sh $(testdir) + @echo "** making $@" + @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_make.sh $(testdir) check_lint: - $(SHELL) $(testdir)/run_lint.sh $(testdir) + @echo "** making $@" + @FGREP="$(FGREP)" $(SHELL) $(testdir)/run_lint.sh $(testdir) ################################################################################ tags: $(H_FILES) $(C_FILES) $(CTAGS) $(C_FILES) $(H_FILES) diff --git a/package/byacc.spec b/package/byacc.spec index 81d069d..17d021c 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,12 +1,12 @@ Summary: public domain Berkeley LALR Yacc parser generator %global AppVersion 2.0 -%global AppPatched 20220128 +%global AppPatched 20221106 %global AltProgram byacc2 %global UseProgram yacc -# $Id: byacc.spec,v 1.67 2022/01/28 13:38:52 tom Exp $ +# $Id: byacc.spec,v 1.68 2022/11/06 15:51:43 tom Exp $ Name: byacc Version: %{AppVersion}.%{AppPatched} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index 06275d5..c8fa458 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +byacc (1:2.0.20221106) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey Sun, 06 Nov 2022 10:51:43 -0500 + byacc (1:2.0.20220128) unstable; urgency=low * maintenance updates diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index 6fc3ae8..28dbdbe 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,11 +1,11 @@ Summary: public domain Berkeley LALR Yacc parser generator %global AppVersion 2.0 -%global AppPatched 20220128 +%global AppPatched 20221106 %global UseProgram yacc -# $Id: mingw-byacc.spec,v 1.44 2022/01/28 13:38:52 tom Exp $ +# $Id: mingw-byacc.spec,v 1.45 2022/11/06 15:51:43 tom Exp $ Name: byacc Version: %{AppVersion}.%{AppPatched} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index 1188e91..edb36ad 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $ # -DISTNAME= byacc-20220128 +DISTNAME= byacc-20221106 CATEGORIES= devel MASTER_SITES= https://invisible-mirror.net/archives/byacc/ DIST_SUBDIR= byacc-20220101 diff --git a/test/run_lint.sh b/test/run_lint.sh index 6b8f289..c6cedc2 100755 --- a/test/run_lint.sh +++ b/test/run_lint.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_lint.sh,v 1.4 2021/06/19 19:30:10 tom Exp $ +# $Id: run_lint.sh,v 1.5 2022/11/06 20:56:42 tom Exp $ # vi:ts=4 sw=4: # run lint on each of the ".c" files in the test directory @@ -13,7 +13,8 @@ else TEST_DIR=. fi -ifBTYACC=`grep -F -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` +: "${FGREP:=grep -F}" +ifBTYACC=`$FGREP -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc diff --git a/test/run_make.sh b/test/run_make.sh index eec6bbe..a09e603 100755 --- a/test/run_make.sh +++ b/test/run_make.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_make.sh,v 1.20 2022/01/01 20:53:16 tom Exp $ +# $Id: run_make.sh,v 1.21 2022/11/06 20:57:33 tom Exp $ # vi:ts=4 sw=4: # do a test-compile on each of the ".c" files in the test-directory @@ -16,7 +16,8 @@ else fi THIS_DIR=`pwd` -ifBTYACC=`grep -F -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` +: "${FGREP:=grep -F}" +ifBTYACC=`$FGREP -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?` if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc @@ -99,7 +100,7 @@ then case $input in ${TEST_DIR}/pure_*) - if test -z "`grep -F -i -l '%pure-parser' "$input"`" + if test -z "`$FGREP -i -l '%pure-parser' "$input"`" then echo "%pure-parser" >>run_make.y fi @@ -160,11 +161,11 @@ then continue; ;; *) - if grep -F -i '%pure-parser' "$input" >/dev/null || - grep -F -i '%parse-param' "$input" >/dev/null || - grep -F -i '%lex-param' "$input" >/dev/null || - grep -F -i '%token-table' "$input" >/dev/null || - grep -F 'YYLEX_PARAM' "$input" >/dev/null + if $FGREP -i '%pure-parser' "$input" >/dev/null || + $FGREP -i '%parse-param' "$input" >/dev/null || + $FGREP -i '%lex-param' "$input" >/dev/null || + $FGREP -i '%token-table' "$input" >/dev/null || + $FGREP 'YYLEX_PARAM' "$input" >/dev/null then echo "... skipping $input" continue; diff --git a/test/run_test.sh b/test/run_test.sh index 7acbcfd..def26e3 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: run_test.sh,v 1.35 2022/01/01 22:28:17 tom Exp $ +# $Id: run_test.sh,v 1.37 2022/11/06 21:55:25 tom Exp $ # vi:ts=4 sw=4: errors=0 @@ -39,7 +39,7 @@ test_diffs() { rm -f "$CMP" else echo "...diff $REF" - diff -u "$REF" "$CMP" + diff -c "$REF" "$CMP" errors=1 fi fi @@ -127,7 +127,8 @@ YACC_escaped=`echo "$PROG_DIR/yacc" | sed -e 's/\./\\\./g'` tmpfile=temp$$ -ifBTYACC=`grep -F -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?` +: "${FGREP:=grep -F}" +ifBTYACC=`$FGREP -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?` if test "$ifBTYACC" = 0; then REF_DIR=${TEST_DIR}/yacc diff --git a/yacc.1 b/yacc.1 index c21518d..afed39e 100644 --- a/yacc.1 +++ b/yacc.1 @@ -1,4 +1,4 @@ -.\" $Id: yacc.1,v 1.38 2021/08/02 23:55:03 tom Exp $ +.\" $Id: yacc.1,v 1.42 2022/11/06 17:07:16 tom Exp $ .\" .\" .TH YACC 1 "July\ 15,\ 1990" .\" .UC 6 @@ -27,7 +27,7 @@ .ie n .IP \(bu 4 .el .IP \(bu 2 .. -.TH YACC 1 "August 2, 2021" "Berkeley Yacc" "User Commands" +.TH YACC 1 "November 6, 2022" "Berkeley Yacc" "User Commands" .SH NAME \*N \- an LALR(1) parser generator .SH SYNOPSIS @@ -54,7 +54,7 @@ normally writes the parse tables and the driver routine to the file .PP The following options are available: .TP 5 -\fB\-b \fP\fIfile_prefix\fR +\fB\-b \fIfile_prefix\fR The .B \-b option changes the prefix prepended to the output file names to @@ -73,9 +73,9 @@ to be written. It contains #define's for the token identifiers. .TP .B \-h -print a usage message. +print a usage message to the standard error. .TP -\fB\-H \fP\fIdefines_file\fR +\fB\-H \fIdefines_file\fR causes #define's for the token identifiers to be written to the given \fIdefines_file\fP rather than the \fBy.tab.h\fP file used by the \fB\-d\fP option. @@ -120,13 +120,13 @@ will not insert the \fI#line\fP directives. enable position processing, e.g., \*(``%locations\*('' (compile-time configuration for \fBbtyacc\fP). .TP -\fB\-o \fP\fIoutput_file\fR +\fB\-o \fIoutput_file\fR specify the filename for the parser file. If this option is not given, the output filename is the file prefix concatenated with the file suffix, e.g., \fBy.tab.c\fP. This overrides the \fB\-b\fP option. .TP -\fB\-p \fP\fIsymbol_prefix\fR +\fB\-p \fIsymbol_prefix\fR The .B \-p option changes the prefix prepended to yacc-generated symbols to @@ -155,7 +155,7 @@ suppress \*(``\fB#define\fP\*('' statements generated for string literals in a \*(``\fB%token\fP\*('' statement, to more closely match original \fByacc\fP behavior. .IP -Normally when \fByacc\fP sees a line such as +Normally when \fB\*n\fP sees a line such as .Ex %token OP_ADD "ADD" .Ee @@ -183,6 +183,11 @@ The option changes the preprocessor directives generated by .B \*n so that debugging statements will be incorporated in the compiled code. +.IP +\fB\*N\fR sends debugging output to the standard output +(compatible with both the original \fByacc\fP and \fBbtyacc\fP), +while \fBbtyacc\fP writes debugging output to the standard error +(like \fBbison\fP). .TP .B \-v The @@ -195,11 +200,11 @@ be written to the file print the version number to the standard output. .TP .B \-y -\fByacc\fP ignores this option, +\fB\*n\fP ignores this option, which bison supports for ostensible POSIX compatibility. .PP The \fIfilename\fP parameter is not optional. -However, \fByacc\fP accepts a single \*(``\-\*('' to read the grammar +However, \fB\*n\fP accepts a single \*(``\-\*('' to read the grammar from the standard input. A double \*(``\-\-\*('' marker denotes the end of options. A single \fIfilename\fP parameter is expected after a \*(``\-\-\*('' marker. @@ -238,6 +243,9 @@ Multiple \fB%code\fP directives may be given; \fB\*n\fP inserts those into the corresponding code- or defines-file in the order that they appear in the source file. .TP +\fB %debug\fP +This has the same effect as the \*(``\-t\*('' command-line option. +.TP \fB %destructor\fP { \fIcode\fP } \fIsymbol+\fP defines code that is invoked when a symbol is automatically discarded during error recovery. @@ -256,7 +264,7 @@ pointers to dynamically allocated memory. The bracketed \fIcode\fP is invoked whenever the parser discards one of the symbols. Within \fIcode\fP, \*(``\fB$$\fP\*('' or -\*(``\fB$<\fP\fItag\fP\fB>$\fP\*('' designates the semantic value associated with the +\*(``\fB$<\fItag\fB>$\fR\*('' designates the semantic value associated with the discarded symbol, and \*(``\fB@$\fP\*('' designates its location (see \fB%locations\fP directive). .IP @@ -280,22 +288,25 @@ the code for \*(``\fB<>\fP\*('' is used for grammar symbols that have no declared semantic type tag. .RE .TP +\fB %empty\fP +ignored by \fB\*n\fP. +.TP \fB %expect\fP \fInumber\fP -tells \fByacc\fP the expected number of shift/reduce conflicts. +tells \fB\*n\fP the expected number of shift/reduce conflicts. That makes it only report the number if it differs. .TP \fB %expect\-rr\fP \fInumber\fP -tell \fByacc\fP the expected number of reduce/reduce conflicts. +tell \fB\*n\fP the expected number of reduce/reduce conflicts. That makes it only report the number if it differs. This is (unlike bison) allowable in LALR parsers. .TP \fB %locations\fP -tells \fByacc\fP to enable management of position information associated +tells \fB\*n\fP to enable management of position information associated with each token, provided by the lexer in the global variable \fByylloc\fP, similar to management of semantic value information provided in \fByylval\fP. .IP As for semantic values, locations can be referenced within actions using -\fB@$\fP to refer to the location of the left hand side symbol, and \fB@\fP\fIN\fP +\fB@$\fP to refer to the location of the left hand side symbol, and \fB@\fIN\fR (\fIN\fP an integer) to refer to the location of one of the right hand side symbols. Also as for semantic values, when a rule is matched, a default @@ -386,7 +397,7 @@ yyerror without providing prototypes. Bison's support for \*(``%expect\*('' is broken in more than one release. For best results using bison, delete that directive. .bP -Bison has no equivalent for some of \fByacc\fP's command-line options, +Bison has no equivalent for some of \fB\*n\fP's command-line options, relying on directives embedded in the grammar file. .bP Bison's \*(``\fB\-y\fP\*('' option does not affect bison's lack of support for @@ -402,7 +413,7 @@ with \fB%lex\-param\fP and \fB%parse\-param\fP in two forms Bison accepts the latter (though undocumented), but depending on the release may generate bad code. .bP -Like bison, \fByacc\fP will add parameters specified via \fB%parse\-param\fP +Like bison, \fB\*n\fP will add parameters specified via \fB%parse\-param\fP to \fByyparse\fP, \fByyerror\fP and (if configured for back-tracking) to the destructor declared using \fB%destructor\fP. Bison puts the additional parameters \fIfirst\fP for