diff options
| author | JinWang An <jinwang.an@samsung.com> | 2023-01-10 13:20:09 +0900 |
|---|---|---|
| committer | JinWang An <jinwang.an@samsung.com> | 2023-01-10 13:20:09 +0900 |
| commit | 42d4b66f3bb0af73c25939a9302fb4c95a5f87c0 (patch) | |
| tree | 8db4368bf32b3c893685e040c0320d6c374f188a | |
| parent | 3b4178a276f2ac76b7230c014bfd600b83710d26 (diff) | |
| download | byacc-42d4b66f3bb0af73c25939a9302fb4c95a5f87c0.tar.gz byacc-42d4b66f3bb0af73c25939a9302fb4c95a5f87c0.tar.bz2 byacc-42d4b66f3bb0af73c25939a9302fb4c95a5f87c0.zip | |
Imported Upstream version 20211224upstream/20211224
| -rw-r--r-- | CHANGES | 224 | ||||
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 67 | ||||
| -rwxr-xr-x | config.guess | 7 | ||||
| -rwxr-xr-x | config.sub | 26 | ||||
| -rwxr-xr-x | configure | 707 | ||||
| -rw-r--r-- | package/byacc.spec | 4 | ||||
| -rw-r--r-- | package/debian/changelog | 6 | ||||
| -rw-r--r-- | package/debian/control | 9 | ||||
| -rw-r--r-- | package/debian/copyright | 2 | ||||
| -rw-r--r-- | package/debian/docs | 1 | ||||
| -rwxr-xr-x | package/debian/rules | 24 | ||||
| -rw-r--r-- | package/mingw-byacc.spec | 4 | ||||
| -rw-r--r-- | package/pkgsrc/Makefile | 2 |
15 files changed, 753 insertions, 334 deletions
@@ -1,3 +1,183 @@ +2021-12-24 Thomas E. Dickey <dickey@invisible-island.net> + + * package/debian/rules: fixes from Debian package for lintian warnings + + * package/debian/control: updates for Debian standard + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + + * package/debian/docs, package/debian/copyright, package/debian/control: + errata from Debian package + + * config.sub: 2021-12-24 + From: Dmitry V. Levin <ldv@altlinux.org> + config.sub: alias aarch64le to aarch64 + + Apparently, QNX reports aarch64 as aarch64le on little-endian machines. + + * config.sub (aarch64le-*): Set cpu to aarch64. + (timestamp): Update. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data (aarch64le-qnx): New test. + + Reported-by: Elad Lahav <e2lahav@gmail.com> + Link: https://lists.gnu.org/archive/html/config-patches/2021-12/msg00009.html + +2021-12-16 Thomas E. Dickey <dickey@invisible-island.net> + + * configure: regen + + * aclocal.m4: resync with my-autoconf + +2021-12-13 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-10-27 + From: Dmitry V. Levin <ldv@altlinux.org> + config.sub: fix typo in timestamp + + * config.sub: Fix timestamp. + * doc/config.sub.1: Regenerate. + + Reported-by: Jordi Sanfeliu <jordi@fibranet.cat> + Fixes: a013aac61edfa2a03727521508286480010e7bf3 + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-11-30 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-11-30 + From: Andreas F. Borchert <github@andreas-borchert.de> + config.guess: x86_64-pc-solaris2.11 is not properly recognized + + config.guess guesses Solaris 11 to run on a 32-bit platform + despite Solaris 11 no longer supporting any 32-bit platform. + + See the following code at lines 434 to 445: + + | SUN_ARCH=i386 + | # If there is a compiler, see if it is configured for 64-bit objects. + | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + | # This test works for both compilers. + | if test "$CC_FOR_BUILD" != no_compiler_found; then + | if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + | grep IS_64BIT_ARCH >/dev/null + | then + | SUN_ARCH=x86_64 + | fi + | fi + + If "cc" is installed, i.e. the Oracle Studio compiler, this one is + chosen for $CC_FOR_BUILD. This compiler, the gcc provided by Oracle + and also gcc bootstrapped from sources on that platform with a default + configuration will by default generate 32-bit binaries -- even on + a 64-bit platform. And __amd64 will not be defined for compilations + targeting a 32-bit platform. This is different from the corresponding + behaviour on GNU/Linux systems where the local platform is targeted by + default. + + Thus, as long as you do not add "-m64" or if you have a custom-built + gcc which defaults to 64 bit, you will get 32-bit binaries on Solaris + despite living on a 64-bit platform. + + * config.guess (i86pc:SunOS:5.*:* || i86xen:SunOS:5.*:*): Adapt the + test by adding the "-m64" flag. This will work properly for Solaris + 10 as well (the last Solaris release that supported x86 32-bit + platforms). + * doc/config.guess.1: Regenerate. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-10-27 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2021-10-27 + From: Jordi Sanfeliu <jordi@fibranet.cat> + Recognize Fiwix + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (137 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (882 tests) + PASS: config.sub idempotency checks (819 tests) + PASS: config.sub canonicalise each config.guess testcase (137 tests) + + * config.guess (i*86:Fiwix:*:*): Recognize. + * config.sub (fiwix*): Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + * testsuite/config-guess.data: Add a test case for Fiwix. + * testsuite/config-sub.data (i386-fiwix): New test. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + + * config.sub: 2021-20-27 + From: Jordi Sanfeliu <jordi@fibranet.cat> + Recognize Fiwix + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (137 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (882 tests) + PASS: config.sub idempotency checks (819 tests) + PASS: config.sub canonicalise each config.guess testcase (137 tests) + + * config.guess (i*86:Fiwix:*:*): Recognize. + * config.sub (fiwix*): Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + * testsuite/config-guess.data: Add a test case for Fiwix. + * testsuite/config-sub.data (i386-fiwix): New test. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-10-18 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-08-14 + From: Kinshuk Dua <kinshukdua@gmail.com> + config.sub: Fix typo in comment + + Fixes: 5e531d391852a54e7fab2d8ff55625fca514b305 + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + +2021-08-14 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-08-14 + From: Nick Bowler <nbowler@draconx.ca> + config.sub: work around command assignment bug in some shells + + When combining variable assignments with a shell command, some older + shells (notably heirloom-sh and presumably also Solaris 10 /bin/sh) + have a bug which causes the assignment to alter the current execution + environment whenever the command is a shell built-in. For example: + + % dash -c 'x=good; x=bad echo >/dev/null; echo $x' + good + + % jsh -c 'x=good; x=bad echo >/dev/null; echo $x' + bad + + The config.sub script contains a few commands of the form: + + IFS=- read ... + + which triggers this bug, causing the IFS assignment to persist for the + remainder of the script. This can cause misbehaviour in certain cases, + for example: + + % jsh config.sub i386-linux-gnu + config.sub: test: unknown operator gnu + + % jsh config.sub i386-gnu/linux + sed: can't read s|gnu/linux|gnu|: No such file or directory + Invalid configuration `i386-gnu/linux': OS `' not recognized + + * config.sub: Save and restore IFS explicitly to avoid shell bugs. + * doc/config.sub.1: Regenerate. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-08-08 Thomas E. Dickey <dickey@invisible-island.net> * reader.c: @@ -16,6 +196,26 @@ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump +2021-08-04 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-08-04 + From: Jeremy Soller <jackpot51@gmail.com> + config.sub: add Linux Relibc Target + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (136 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (881 tests) + PASS: config.sub idempotency checks (818 tests) + PASS: config.sub canonicalise each config.guess testcase (136 tests) + + * config.sub (relibc*): Recognize. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data (x86_64-linux-relibc): New test. + + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-08-02 Thomas E. Dickey <dickey@invisible-island.net> * main.c, yacc.1: add "-h" option @@ -83,6 +283,30 @@ ... this splits up "\nbreak;\n" output to put #line directives after first "\n" +2021-07-06 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2021-07-06 + From: Stephanos Ioannidis <root@stephanos.io> + config.sub: add Zephyr RTOS support + + This adds the Zephyr RTOS targets in preparation for implementing the + Zephyr RTOS-specific toolchain support. + + $ make check + cd testsuite && bash config-guess.sh && rm uname + PASS: config.guess checks (136 tests) + cd testsuite && bash config-sub.sh + PASS: config.sub checks (880 tests) + PASS: config.sub idempotency checks (817 tests) + PASS: config.sub canonicalise each config.guess testcase (136 tests) + + * config.sub (zephyr*): Recognize. + * doc/config.sub.1: Regenerate. + * testsuite/config-sub.data: Add testcases for *-zephyr. + + Signed-off-by: Stephanos Ioannidis <root@stephanos.io> + Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> + 2021-07-03 Thomas E. Dickey <dickey@invisible-island.net> * config.sub: 2021-07-03 @@ -1,4 +1,4 @@ -MANIFEST for byacc-20210808, version t20210808 +MANIFEST for byacc-20211224, version t20211224 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 @@ -1 +1 @@ -20210808 +20211224 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.55 2021/06/19 23:17:30 tom Exp $ +dnl $Id: aclocal.m4,v 1.56 2021/12/16 23:22:31 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2020,2021 Thomas E. Dickey @@ -143,6 +143,25 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Use CF_ADD_CFLAGS after first checking for potential redefinitions. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. +define([CF_APPEND_CFLAGS], +[ +for cf_add_cflags in $1 +do + case "x$cf_add_cflags" in + (x-[[DU]]*) + CF_REMOVE_CFLAGS($cf_add_cflags,CFLAGS,[$2]) + CF_REMOVE_CFLAGS($cf_add_cflags,CPPFLAGS,[$2]) + ;; + esac + CF_ADD_CFLAGS([$cf_add_cflags],[$2]) +done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55 dnl -------------- dnl use this macro for appending text without introducing an extra blank at @@ -454,9 +473,9 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57 +dnl CF_DISABLE_ECHO version: 14 updated: 2021/09/04 06:35:04 dnl --------------- -dnl You can always use "make -n" to see the actual options, but it's hard to +dnl You can always use "make -n" to see the actual options, but it is hard to dnl pick out/analyze warning messages when the compile-line is long. dnl dnl Sets: @@ -546,7 +565,7 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20 +dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31 dnl --------------- dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc. Any of gcc's dnl "-Werror" flags can interfere with configure-checks. Those go into @@ -558,11 +577,13 @@ if test "$GCC" = yes || test "$GXX" = yes then case [$]$1 in (*-Werror=*) - CF_VERBOSE(repairing $1: [$]$1) cf_temp_flags= for cf_temp_scan in [$]$1 do case "x$cf_temp_scan" in + (x-Werror=format*) + CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan) + ;; (x-Werror=*) CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan) ;; @@ -571,9 +592,13 @@ then ;; esac done - $1="$cf_temp_flags" - CF_VERBOSE(... fixed [$]$1) - CF_VERBOSE(... extra $EXTRA_CFLAGS) + if test "x[$]$1" != "x$cf_temp_flags" + then + CF_VERBOSE(repairing $1: [$]$1) + $1="$cf_temp_flags" + CF_VERBOSE(... fixed [$]$1) + CF_VERBOSE(... extra $EXTRA_CFLAGS) + fi ;; esac fi @@ -1437,6 +1462,24 @@ esac AC_SUBST(LINT_OPTS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Remove a given option from CFLAGS/CPPFLAGS +dnl $1 = option to remove +dnl $2 = variable to update +dnl $3 = nonempty to allow verbose message +define([CF_REMOVE_CFLAGS], +[ +cf_tmp_cflag=`echo "x$1" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x[$]$2" | sed -e 's/^.//' -e 's/[[ ]][[ ]]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[[^ ]][[^ ]]*\\)\?%%" -e 's/^[[ ]]*//' -e 's%[[ ]][[ ]]*-D% -D%g' -e 's%[[ ]][[ ]]*-I% -I%g'` + test "[$]$2" != "$cf_old_cflag" || break + ifelse([$3],,,[CF_VERBOSE(removing old option $1 from $2)]) + $2="$cf_old_cflag" +done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 dnl ---------------- dnl Remove all -U and -D options that refer to the given symbol from a list @@ -1454,7 +1497,7 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13 +dnl CF_TRY_XOPEN_SOURCE version: 3 updated: 2021/08/28 15:20:37 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. @@ -1489,7 +1532,7 @@ if test "$cf_cv_xopen_source" != no ; then CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) + CF_APPEND_CFLAGS($cf_temp_xopen_source) fi ]) dnl --------------------------------------------------------------------------- @@ -1736,7 +1779,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 58 updated: 2021/05/01 17:49:36 +dnl CF_XOPEN_SOURCE version: 59 updated: 2021/08/28 15:20:37 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, @@ -1841,7 +1884,7 @@ case "$host_os" in esac if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source,true) + CF_APPEND_CFLAGS($cf_xopen_source,true) fi dnl In anything but the default case, we may have system-specific setting diff --git a/config.guess b/config.guess index e81d3ae..1105a74 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-06-03' +timestamp='2021-11-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -437,7 +437,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -1522,6 +1522,9 @@ EOF i*86:rdos:*:*) GUESS=$UNAME_MACHINE-pc-rdos ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; *:AROS:*:*) GUESS=$UNAME_MACHINE-unknown-aros ;; @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-07-03' +timestamp='2021-12-24' # 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 @@ -121,9 +121,11 @@ esac # Split fields of configuration type # shellcheck disable=SC2162 +saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <<EOF $1 EOF +IFS=$saved_IFS # Separate into logical components for further validation case $1 in @@ -172,6 +174,10 @@ case $1 in basic_machine=$field1 basic_os=$field2 ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ @@ -931,9 +937,11 @@ case $basic_machine in *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read cpu vendor <<EOF $basic_machine EOF + IFS=$saved_IFS ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -1113,7 +1121,7 @@ case $cpu-$vendor in xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - arm64-*) + arm64-* | aarch64le-*) cpu=aarch64 ;; @@ -1296,7 +1304,7 @@ esac if test x$basic_os != x then -# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. case $basic_os in gnu/linux*) @@ -1313,9 +1321,11 @@ case $basic_os in ;; *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read kernel os <<EOF $basic_os EOF + IFS=$saved_IFS ;; # Default OS when just kernel was specified nto*) @@ -1697,7 +1707,7 @@ fi # Now, validate our (potentially fixed-up) OS. case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | uclibc*) + musl* | newlib* | relibc* | uclibc*) ;; # Likewise for "kernel-abi" eabi* | gnueabi*) @@ -1738,7 +1748,8 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1755,11 +1766,12 @@ esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -uclibc* ) + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 @@ -3795,12 +3795,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -3893,6 +3919,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi if test "$cf_cv_posix_visible" = no; then @@ -3910,16 +3938,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:3913: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3941: 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}:3919: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3947: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3922 "configure" +#line 3950 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3934,16 +3962,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3937: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3965: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3940: \$? = $ac_status" >&5 + echo "$as_me:3968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3943: \"$ac_try\"") >&5 + { (eval echo "$as_me:3971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3946: \$? = $ac_status" >&5 + echo "$as_me:3974: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -3964,7 +3992,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3967 "configure" +#line 3995 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3979,16 +4007,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3985: \$? = $ac_status" >&5 + echo "$as_me:4013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3988: \"$ac_try\"") >&5 + { (eval echo "$as_me:4016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3991: \$? = $ac_status" >&5 + echo "$as_me:4019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -3999,7 +4027,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4002: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4030: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4007,10 +4035,10 @@ echo "${as_me:-configure}:4002: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4010: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4038: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4013 "configure" +#line 4041 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4025,16 +4053,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4028: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4056: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4031: \$? = $ac_status" >&5 + echo "$as_me:4059: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4034: \"$ac_try\"") >&5 + { (eval echo "$as_me:4062: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4037: \$? = $ac_status" >&5 + echo "$as_me:4065: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4050,7 +4078,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4053: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4081: 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 @@ -4164,12 +4192,44 @@ esac if test -n "$cf_xopen_source" ; then +for cf_add_cflags in $cf_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + 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 + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + 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 + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -4244,7 +4304,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}:4247: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4307: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4254,7 +4314,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}:4257: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4317: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4264,20 +4324,22 @@ 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}:4267: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4327: 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" fi +done + fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4277: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4339: 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 4280 "configure" +#line 4342 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4292,16 +4354,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4295: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4298: \$? = $ac_status" >&5 + echo "$as_me:4360: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4301: \"$ac_try\"") >&5 + { (eval echo "$as_me:4363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4304: \$? = $ac_status" >&5 + echo "$as_me:4366: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4310,12 +4372,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:4313: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4375: 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 4318 "configure" +#line 4380 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4330,16 +4392,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4333: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4395: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4336: \$? = $ac_status" >&5 + echo "$as_me:4398: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4339: \"$ac_try\"") >&5 + { (eval echo "$as_me:4401: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4342: \$? = $ac_status" >&5 + echo "$as_me:4404: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4350,19 +4412,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:4353: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { 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:4358: checking if we should define _XOPEN_SOURCE" >&5 +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 4365 "configure" +#line 4427 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4381,16 +4443,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4384: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4387: \$? = $ac_status" >&5 + echo "$as_me:4449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4390: \"$ac_try\"") >&5 + { (eval echo "$as_me:4452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4393: \$? = $ac_status" >&5 + echo "$as_me:4455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4402,7 +4464,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4405 "configure" +#line 4467 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4421,16 +4483,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4424: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4486: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4427: \$? = $ac_status" >&5 + echo "$as_me:4489: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4430: \"$ac_try\"") >&5 + { (eval echo "$as_me:4492: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4433: \$? = $ac_status" >&5 + echo "$as_me:4495: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4445,7 +4507,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4448: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4510: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4460,12 +4522,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -4558,6 +4646,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi @@ -4568,7 +4658,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:4571: checking for $ac_word" >&5 +echo "$as_me:4661: 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 @@ -4583,7 +4673,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:4586: found $ac_dir/$ac_word" >&5 +echo "$as_me:4676: found $ac_dir/$ac_word" >&5 break done @@ -4591,10 +4681,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:4594: result: $GREP" >&5 + echo "$as_me:4684: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:4597: result: no" >&5 + echo "$as_me:4687: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4602,7 +4692,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:4605: checking for egrep" >&5 +echo "$as_me:4695: 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 @@ -4614,7 +4704,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:4617: checking for $ac_word" >&5 +echo "$as_me:4707: 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 @@ -4631,7 +4721,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:4634: found $ac_dir/$ac_word" >&5 + echo "$as_me:4724: found $ac_dir/$ac_word" >&5 break fi done @@ -4642,10 +4732,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:4645: result: $EGREP" >&5 + echo "$as_me:4735: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:4648: result: no" >&5 + echo "$as_me:4738: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4653,12 +4743,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4656: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4746: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:4661: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:4751: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -4668,7 +4758,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:4671: checking how to run the C preprocessor" >&5 +echo "$as_me:4761: 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 @@ -4689,18 +4779,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 4692 "configure" +#line 4782 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4697: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4787: \"$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:4703: \$? = $ac_status" >&5 + echo "$as_me:4793: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4723,17 +4813,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 4726 "configure" +#line 4816 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4730: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4820: \"$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:4736: \$? = $ac_status" >&5 + echo "$as_me:4826: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4770,7 +4860,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:4773: result: $CPP" >&5 +echo "$as_me:4863: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4780,18 +4870,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 4783 "configure" +#line 4873 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:4788: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4878: \"$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:4794: \$? = $ac_status" >&5 + echo "$as_me:4884: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4814,17 +4904,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 4817 "configure" +#line 4907 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:4821: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4911: \"$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:4827: \$? = $ac_status" >&5 + echo "$as_me:4917: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4852,7 +4942,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:4855: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:4945: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -4867,23 +4957,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:4870: checking for $ac_header" >&5 +echo "$as_me:4960: 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 4876 "configure" +#line 4966 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4880: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4970: \"$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:4886: \$? = $ac_status" >&5 + echo "$as_me:4976: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4902,7 +4992,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:4995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -4917,23 +5007,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4920: checking for $ac_header" >&5 +echo "$as_me:5010: 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 4926 "configure" +#line 5016 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4930: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5020: \"$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:4936: \$? = $ac_status" >&5 + echo "$as_me:5026: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4952,7 +5042,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5045: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -4962,7 +5052,7 @@ EOF fi done -echo "$as_me:4965: checking for working mkstemp" >&5 +echo "$as_me:5055: 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 @@ -4973,7 +5063,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4976 "configure" +#line 5066 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5014,15 +5104,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5020: \$? = $ac_status" >&5 + echo "$as_me:5110: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5022: \"$ac_try\"") >&5 + { (eval echo "$as_me:5112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5025: \$? = $ac_status" >&5 + echo "$as_me:5115: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -5037,16 +5127,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:5040: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:5130: 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:5043: checking for mkstemp" >&5 + echo "$as_me:5133: 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 5049 "configure" +#line 5139 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5077,16 +5167,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5080: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5170: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5083: \$? = $ac_status" >&5 + echo "$as_me:5173: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5086: \"$ac_try\"") >&5 + { (eval echo "$as_me:5176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5089: \$? = $ac_status" >&5 + echo "$as_me:5179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -5096,7 +5186,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5099: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:5189: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -5111,23 +5201,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:5114: checking for $ac_header" >&5 +echo "$as_me:5204: 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 5120 "configure" +#line 5210 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5124: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5214: \"$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:5130: \$? = $ac_status" >&5 + echo "$as_me:5220: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5146,7 +5236,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5149: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5239: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -5156,7 +5246,7 @@ EOF fi done -echo "$as_me:5159: checking for header declaring getopt variables" >&5 +echo "$as_me:5249: 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 @@ -5166,7 +5256,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 5169 "configure" +#line 5259 "configure" #include "confdefs.h" #include <$cf_header> @@ -5179,16 +5269,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5272: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5185: \$? = $ac_status" >&5 + echo "$as_me:5275: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5188: \"$ac_try\"") >&5 + { (eval echo "$as_me:5278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5191: \$? = $ac_status" >&5 + echo "$as_me:5281: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -5200,7 +5290,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5203: result: $cf_cv_getopt_header" >&5 +echo "$as_me:5293: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -5220,13 +5310,13 @@ fi for ac_func in getopt vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5223: checking for $ac_func" >&5 +echo "$as_me:5313: 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 5229 "configure" +#line 5319 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5257,16 +5347,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5260: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5263: \$? = $ac_status" >&5 + echo "$as_me:5353: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5266: \"$ac_try\"") >&5 + { (eval echo "$as_me:5356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5269: \$? = $ac_status" >&5 + echo "$as_me:5359: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -5276,7 +5366,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5279: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:5369: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -5286,7 +5376,7 @@ EOF fi done -echo "$as_me:5289: checking for maximum table size" >&5 +echo "$as_me:5379: 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. @@ -5296,12 +5386,12 @@ if test "${with_max_table_size+set}" = set; then fi; if test -n "$with_max_table_size" then - echo "$as_me:5299: result: $with_max_table_size" >&5 + echo "$as_me:5389: 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:5304: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 + { { echo "$as_me:5394: 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 @@ -5311,11 +5401,11 @@ cat >>confdefs.h <<EOF EOF else - echo "$as_me:5314: result: default" >&5 + echo "$as_me:5404: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:5318: checking if backtracking extension is wanted" >&5 +echo "$as_me:5408: 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. @@ -5323,7 +5413,7 @@ if test "${enable_btyacc+set}" = set; then enableval="$enable_btyacc" fi; -echo "$as_me:5326: result: $enable_btyacc" >&5 +echo "$as_me:5416: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "yes"; then @@ -5336,7 +5426,7 @@ else SKELETON=yaccpar fi -echo "$as_me:5339: checking for fgrep" >&5 +echo "$as_me:5429: 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 @@ -5348,7 +5438,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:5351: checking for $ac_word" >&5 +echo "$as_me:5441: 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 @@ -5365,7 +5455,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:5368: found $ac_dir/$ac_word" >&5 + echo "$as_me:5458: found $ac_dir/$ac_word" >&5 break fi done @@ -5376,10 +5466,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:5379: result: $FGREP" >&5 + echo "$as_me:5469: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:5382: result: no" >&5 + echo "$as_me:5472: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5387,16 +5477,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5390: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5480: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:5395: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:5485: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:5399: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:5489: 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. @@ -5413,17 +5503,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:5416: result: $enable_stdnoreturn" >&5 +echo "$as_me:5506: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:5420: checking for C11 _Noreturn feature" >&5 +echo "$as_me:5510: 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 5426 "configure" +#line 5516 "configure" #include "confdefs.h" #include <stdio.h> @@ -5440,16 +5530,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5446: \$? = $ac_status" >&5 + echo "$as_me:5536: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5449: \"$ac_try\"") >&5 + { (eval echo "$as_me:5539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5452: \$? = $ac_status" >&5 + echo "$as_me:5542: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -5460,7 +5550,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5463: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:5553: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -5488,14 +5578,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:5493: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -5510,15 +5602,22 @@ echo "${as_me:-configure}:5493: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:5609: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:5516: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5614: testing ... fixed $CFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5520: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5618: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -5527,14 +5626,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:5532: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -5549,15 +5650,22 @@ echo "${as_me:-configure}:5532: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:5657: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5555: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5662: testing ... fixed $CPPFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5559: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5666: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -5566,14 +5674,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:5571: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -5588,20 +5698,27 @@ echo "${as_me:-configure}:5571: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + 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}:5594: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:5710: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:5598: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:5714: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:5604: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:5721: 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. @@ -5618,14 +5735,14 @@ else enable_warnings=no fi; -echo "$as_me:5621: result: $enable_warnings" >&5 +echo "$as_me:5738: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then if test "x$have_x" = xyes; then echo "skipping X-const check"; fi cat > "conftest.$ac_ext" <<EOF -#line 5628 "${as_me:-configure}" +#line 5745 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF if test "$INTEL_COMPILER" = yes @@ -5641,7 +5758,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:5644: checking for $CC warning options..." >&5 + { echo "$as_me:5761: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -5657,12 +5774,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:5660: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5777: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5663: \$? = $ac_status" >&5 + echo "$as_me:5780: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5665: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5782: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -5670,7 +5787,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:5673: checking for $CC warning options..." >&5 + { echo "$as_me:5790: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -5693,12 +5810,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:5696: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5813: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5699: \$? = $ac_status" >&5 + echo "$as_me:5816: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5701: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5818: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -5706,7 +5823,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}:5709: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5826: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5716,7 +5833,7 @@ echo "${as_me:-configure}:5709: 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}:5719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5836: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5749,10 +5866,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:5752: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:5869: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <<EOF -#line 5755 "${as_me:-configure}" +#line 5872 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -5801,12 +5918,12 @@ EOF ;; esac - if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5807: \$? = $ac_status" >&5 + echo "$as_me:5924: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5809: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:5926: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -5867,7 +5984,7 @@ fi fi -echo "$as_me:5870: checking if you want to see long compiling messages" >&5 +echo "$as_me:5987: 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. @@ -5901,10 +6018,10 @@ else ECHO_CC='' fi; -echo "$as_me:5904: result: $enableval" >&5 +echo "$as_me:6021: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:5907: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:6024: 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. @@ -5926,7 +6043,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:5929: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:6046: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6040,23 +6157,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6043: checking for dmalloc.h" >&5 + echo "$as_me:6160: 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 6049 "configure" +#line 6166 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:6053: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6170: \"$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:6059: \$? = $ac_status" >&5 + echo "$as_me:6176: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6075,11 +6192,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6078: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6195: 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:6082: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6199: 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 @@ -6087,7 +6204,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6090 "configure" +#line 6207 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6106,16 +6223,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6109: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6226: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6112: \$? = $ac_status" >&5 + echo "$as_me:6229: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6115: \"$ac_try\"") >&5 + { (eval echo "$as_me:6232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6118: \$? = $ac_status" >&5 + echo "$as_me:6235: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6126,7 +6243,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6129: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6246: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <<EOF @@ -6141,7 +6258,7 @@ fi fi -echo "$as_me:6144: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:6261: 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. @@ -6163,7 +6280,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:6166: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6283: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6277,23 +6394,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6280: checking for dbmalloc.h" >&5 + echo "$as_me:6397: 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 6286 "configure" +#line 6403 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:6290: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6407: \"$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:6296: \$? = $ac_status" >&5 + echo "$as_me:6413: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6312,11 +6429,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6315: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6432: 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:6319: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6436: 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 @@ -6324,7 +6441,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6327 "configure" +#line 6444 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6343,16 +6460,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6346: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6463: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6349: \$? = $ac_status" >&5 + echo "$as_me:6466: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6352: \"$ac_try\"") >&5 + { (eval echo "$as_me:6469: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6355: \$? = $ac_status" >&5 + echo "$as_me:6472: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6363,7 +6480,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6366: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6483: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <<EOF @@ -6378,7 +6495,7 @@ fi fi -echo "$as_me:6381: checking if you want to use valgrind for testing" >&5 +echo "$as_me:6498: 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. @@ -6400,7 +6517,7 @@ EOF else with_valgrind= fi; -echo "$as_me:6403: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6520: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -6513,7 +6630,7 @@ fi ;; esac -echo "$as_me:6516: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6633: 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. @@ -6524,7 +6641,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:6527: result: $with_no_leaks" >&5 +echo "$as_me:6644: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -6541,7 +6658,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:6544: checking for $ac_word" >&5 +echo "$as_me:6661: 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 @@ -6558,7 +6675,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:6561: found $ac_dir/$ac_word" >&5 + echo "$as_me:6678: found $ac_dir/$ac_word" >&5 break fi done @@ -6570,10 +6687,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6573: result: $GROFF_PATH" >&5 + echo "$as_me:6690: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6576: result: no" >&5 + echo "$as_me:6693: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6581,7 +6698,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:6584: checking for $ac_word" >&5 +echo "$as_me:6701: 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 @@ -6598,7 +6715,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:6601: found $ac_dir/$ac_word" >&5 + echo "$as_me:6718: found $ac_dir/$ac_word" >&5 break fi done @@ -6609,10 +6726,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:6612: result: $NROFF_PATH" >&5 + echo "$as_me:6729: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:6615: result: no" >&5 + echo "$as_me:6732: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6622,7 +6739,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:6625: checking for $ac_word" >&5 +echo "$as_me:6742: 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 @@ -6639,7 +6756,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:6642: found $ac_dir/$ac_word" >&5 + echo "$as_me:6759: found $ac_dir/$ac_word" >&5 break fi done @@ -6651,10 +6768,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:6654: result: $TBL_PATH" >&5 + echo "$as_me:6771: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:6657: result: no" >&5 + echo "$as_me:6774: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6674,7 +6791,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:6677: checking for $ac_word" >&5 +echo "$as_me:6794: 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 @@ -6691,7 +6808,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:6694: found $ac_dir/$ac_word" >&5 + echo "$as_me:6811: found $ac_dir/$ac_word" >&5 break fi done @@ -6703,16 +6820,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6706: result: $cf_man2html" >&5 + echo "$as_me:6823: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6709: result: no" >&5 + echo "$as_me:6826: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:6715: checking for the modified Earl Hood script" >&5 + echo "$as_me:6832: 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 @@ -6721,7 +6838,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:6724: result: $cf_man2html_ok" >&5 + echo "$as_me:6841: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6730,7 +6847,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6733: checking for program to convert manpage to html" >&5 +echo "$as_me:6850: 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. @@ -6745,11 +6862,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6748: result: man2html" >&5 + echo "$as_me:6865: 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:6752: checking for $ac_word" >&5 +echo "$as_me:6869: 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 @@ -6766,7 +6883,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:6769: found $ac_dir/$ac_word" >&5 + echo "$as_me:6886: found $ac_dir/$ac_word" >&5 break fi done @@ -6778,10 +6895,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6781: result: $cf_man2html" >&5 + echo "$as_me:6898: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6784: result: no" >&5 + echo "$as_me:6901: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6789,11 +6906,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6792: result: $cf_man2html" >&5 + echo "$as_me:6909: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6796: result: $cf_man2html" >&5 + echo "$as_me:6913: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6834,12 +6951,12 @@ else # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:6837: checking if nroff is really groff" >&5 + echo "$as_me:6954: 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:6842: result: $cf_check_groff" >&5 + echo "$as_me:6959: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -6870,14 +6987,14 @@ case ".$cf_man2html" in cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6873: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:6990: 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:6880: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:6997: 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 @@ -6895,10 +7012,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:6898: result: $cf_man2html_top_bot" >&5 + echo "$as_me:7015: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:6901: checking for pagesize to use" >&5 + echo "$as_me:7018: 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 @@ -6923,7 +7040,7 @@ CF_EOF test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:6926: result: $cf_man2html_page" >&5 + echo "$as_me:7043: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <<CF_EOF @@ -6942,13 +7059,13 @@ fi chmod 700 $MAN2HTML_TEMP -echo "$as_me:6945: checking for ANSI C header files" >&5 +echo "$as_me:7062: 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 6951 "configure" +#line 7068 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6956,13 +7073,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:6959: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7076: \"$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:6965: \$? = $ac_status" >&5 + echo "$as_me:7082: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6984,7 +7101,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 6987 "configure" +#line 7104 "configure" #include "confdefs.h" #include <string.h> @@ -7002,7 +7119,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 7005 "configure" +#line 7122 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7023,7 +7140,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 7026 "configure" +#line 7143 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -7049,15 +7166,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7055: \$? = $ac_status" >&5 + echo "$as_me:7172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7057: \"$ac_try\"") >&5 + { (eval echo "$as_me:7174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7060: \$? = $ac_status" >&5 + echo "$as_me:7177: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7070,7 +7187,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:7073: result: $ac_cv_header_stdc" >&5 +echo "$as_me:7190: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -7086,28 +7203,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:7089: checking for $ac_header" >&5 +echo "$as_me:7206: 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 7095 "configure" +#line 7212 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7101: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7218: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7104: \$? = $ac_status" >&5 + echo "$as_me:7221: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7107: \"$ac_try\"") >&5 + { (eval echo "$as_me:7224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7110: \$? = $ac_status" >&5 + echo "$as_me:7227: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -7117,7 +7234,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7120: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7237: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -7127,13 +7244,13 @@ EOF fi done -echo "$as_me:7130: checking for mode_t" >&5 +echo "$as_me:7247: 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 7136 "configure" +#line 7253 "configure" #include "confdefs.h" $ac_includes_default int @@ -7148,16 +7265,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7154: \$? = $ac_status" >&5 + echo "$as_me:7271: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7157: \"$ac_try\"") >&5 + { (eval echo "$as_me:7274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7160: \$? = $ac_status" >&5 + echo "$as_me:7277: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -7167,7 +7284,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7170: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:7287: 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 : @@ -7260,7 +7377,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:7263: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7380: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -7436,7 +7553,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7439: error: ambiguous option: $1 + { { echo "$as_me:7556: 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;} @@ -7455,7 +7572,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7458: error: unrecognized option: $1 + -*) { { echo "$as_me:7575: 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;} @@ -7492,7 +7609,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:7495: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:7612: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7762,7 +7879,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7765: creating $ac_file" >&5 + { echo "$as_me:7882: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7780,7 +7897,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7783: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7900: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7793,7 +7910,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7796: error: cannot find input file: $f" >&5 + { { echo "$as_me:7913: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7809,7 +7926,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:7812: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:7929: 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;} @@ -7818,7 +7935,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:7821: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:7938: 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;} @@ -7855,7 +7972,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:7858: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:7975: 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;} @@ -7866,7 +7983,7 @@ $ac_seen" >&2;} ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:7869: WARNING: Some variables may not be substituted: + { echo "$as_me:7986: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -7915,7 +8032,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:7918: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:8035: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -7926,7 +8043,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7929: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8046: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7939,7 +8056,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:7942: error: cannot find input file: $f" >&5 + { { echo "$as_me:8059: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8057,7 +8174,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:8060: $ac_file is unchanged" >&5 + { echo "$as_me:8177: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/package/byacc.spec b/package/byacc.spec index 525378b..36f1d62 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,9 +1,9 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc %define AltProgram btyacc -%define AppVersion 20210808 +%define AppVersion 20211224 %define UseProgram yacc -# $Id: byacc.spec,v 1.59 2021/08/08 19:26:10 tom Exp $ +# $Id: byacc.spec,v 1.60 2021/12/25 00:13:22 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index f9ecf53..84f3ee6 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +byacc (20211224) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 24 Dec 2021 19:13:22 -0500 + byacc (20210808) unstable; urgency=low * maintenance updates diff --git a/package/debian/control b/package/debian/control index fccd907..a6b8644 100644 --- a/package/debian/control +++ b/package/debian/control @@ -2,12 +2,14 @@ Source: byacc Maintainer: Thomas E. Dickey <dickey@invisible-island.net> Section: devel Priority: optional -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5) -Homepage: http://invisible-island.net/byacc/ +Standards-Version: 4.3.0 +Build-Depends: debhelper (>= 11) +Homepage: https://invisible-island.net/byacc/ +Vcs-Git: https://salsa.debian.org/dickey/byacc Package: byacc Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: public domain Berkeley LALR Yacc parser generator This package provides a parser generator utility that reads a grammar @@ -18,6 +20,7 @@ Description: public domain Berkeley LALR Yacc parser generator Package: btyacc Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: public domain Berkeley LALR Yacc parser generator This package provides a parser generator utility that reads a grammar diff --git a/package/debian/copyright b/package/debian/copyright index 80d467a..073020c 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -96,7 +96,7 @@ Licence: other-BSD from scratch. It can only install one file at a time, a restriction shared with many OS's install programs. -Files: debian/* +Files: package/debian/* Copyright: 2012-2020,2021 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its diff --git a/package/debian/docs b/package/debian/docs index cbda209..1985e68 100644 --- a/package/debian/docs +++ b/package/debian/docs @@ -1,4 +1,5 @@ README +README.BTYACC ACKNOWLEDGEMENTS NEW_FEATURES NOTES diff --git a/package/debian/rules b/package/debian/rules index 0ce508e..b71dc19 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# $Id: rules,v 1.5 2021/05/20 23:48:03 tom Exp $ +# $Id: rules,v 1.6 2021/12/25 01:55:41 tom Exp $ # # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -48,14 +48,16 @@ configure = \ all: build config: config-arch -build: build-arch +build: build-indep build-arch install: install-arch -binary: binary-arch +binary: binary-indep binary-arch config-arch: $(PACKAGES.arch:%=config-%-stamp) build-arch: $(PACKAGES.arch:%=build-%-stamp) install-arch: $(PACKAGES.arch:%=install-%-stamp) +build-indep: + config-byacc-stamp: dh_testdir @@ -97,6 +99,7 @@ install-byacc-stamp: build-byacc-stamp dh_installdirs cd $(BYACC_TMP); $(MAKE) install DESTDIR=$(BYACC_DIR) + sed -i '/- an LALR/s,^..N,byacc,' $(BYACC_DIR)/usr/share/man/man1/byacc.1 touch $@ @@ -106,6 +109,7 @@ install-btyacc-stamp: build-btyacc-stamp dh_installdirs cd $(BTYACC_TMP); $(MAKE) install DESTDIR=$(BTYACC_DIR) + sed -i '/- an LALR/s,^..N,btyacc,' $(BTYACC_DIR)/usr/share/man/man1/btyacc.1 touch $@ @@ -117,6 +121,15 @@ clean: rm -rf t +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_lintian $(verbose) $(PACKAGES.arch:%=-p%) + dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%) + dh_installexamples $(verbose) $(PACKAGES.arch:%=-p%) + dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) CHANGES + # Build architecture-dependent files here. binary-arch: build install ifneq ($(PACKAGES.arch),) @@ -124,9 +137,6 @@ ifneq ($(PACKAGES.arch),) dh_testdir dh_testroot dh_lintian $(verbose) $(PACKAGES.arch:%=-p%) - dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%) - dh_installexamples $(verbose) $(PACKAGES.arch:%=-p%) - dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) CHANGES dh_strip $(verbose) $(PACKAGES.arch:%=-p%) dh_compress $(verbose) $(PACKAGES.arch:%=-p%) dh_fixperms $(verbose) $(PACKAGES.arch:%=-p%) @@ -137,4 +147,4 @@ ifneq ($(PACKAGES.arch),) dh_builddeb $(verbose) $(PACKAGES.arch:%=-p%) endif -.PHONY: build clean config config-arch binary binary-arch install install-arch +.PHONY: build clean config config-arch binary binary-indep binary-arch install install-arch diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index bd5616c..d7281c5 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,8 +1,8 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc -%define AppVersion 20210808 +%define AppVersion 20211224 %define UseProgram yacc -# $Id: mingw-byacc.spec,v 1.37 2021/08/08 19:26:10 tom Exp $ +# $Id: mingw-byacc.spec,v 1.38 2021/12/25 00:13:22 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index 58cb531..09e9310 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $ # -DISTNAME= byacc-20210808 +DISTNAME= byacc-20211224 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.invisible-island.net/byacc/ |