From e2328dabf95b67931ded1436d4f84074e769e457 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 21 May 2023 19:59:32 +0000 Subject: [PATCH] snapshot of project "byacc", label t20230521 --- CHANGES | 63 ++ MANIFEST | 2 +- VERSION | 2 +- aclocal.m4 | 343 ++++++++- configure | 1417 +++++++++++++++++++++++--------------- configure.in | 6 +- defs.h | 51 +- error.c | 64 +- makefile.in | 8 +- output.c | 16 +- package/byacc.spec | 4 +- package/debian/changelog | 2 +- package/mingw-byacc.spec | 4 +- package/pkgsrc/Makefile | 2 +- reader.c | 183 +++-- 15 files changed, 1467 insertions(+), 700 deletions(-) diff --git a/CHANGES b/CHANGES index 31dd7d8..48a2007 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,62 @@ +2023-05-21 Thomas E. Dickey + + * VERSION, package/byacc.spec, package/debian/changelog, + package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + + * configure: regen + + * aclocal.m4: + updates for CF_INSTALL_MAN from reflex, which needs the symbolic link feature + + * aclocal.m4: + improve install-man by adding sed commands for --program-transform-name + +2023-05-19 Thomas E. Dickey + + * makefile.in: use CF_INSTALL_MAN + + * aclocal.m4: + add CF_INSTALL_MAN, to begin refactoring install rule for manpage + + * configure: regen + + * configure.in: use CF_INSTALL_MAN + +2023-05-18 Thomas E. Dickey + + * error.c, defs.h, reader.c: + allow @1 or $@ with a warning if no %locations was given + +2023-05-17 Thomas E. Dickey + + * reader.c: clear pointer in end_ainfo() after freeing it. + +2023-05-16 Thomas E. Dickey + + * reader.c: report errors in %define as "unexpected value" + + * reader.c: + add/use macros begin_ainfo() and end_ainfo() to reduce clutter + + * defs.h, error.c: add function unexpected_value() + + * reader.c: + recognize bison's "%define api.pure" as an alternative to "%pure-parser" + + * reader.c: + add %nterm as an alias for %type, since bison made that confusion. + + * reader.c: + ensure that filler_buf and prefix_buf are initialized for the special case + where they are empty (report by Martin Jansa, cf: 20230219) + + * output.c: + make test-differences smaller when compiling with YY_NO_LEAKS by replacing + a blank line with the generated #define rather than adding 3 lines. + + * reader.c: gcc-warnings + 2023-05-15 Thomas E. Dickey * VERSION, package/byacc.spec, package/debian/changelog, @@ -21,6 +80,10 @@ * defs.h: rename no_space() to on_error() +2023-04-03 Thomas E. Dickey + + * aclocal.m4: resync with my-autoconf: CF_GCC_VERSION CF_XOPEN_SOURCE + 2023-02-26 Thomas E. Dickey * mstring.c, reader.c: yak-indent diff --git a/MANIFEST b/MANIFEST index fc17d71..18f5e7b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for byacc, version t20230515 +MANIFEST for byacc, version t20230521 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 diff --git a/VERSION b/VERSION index 0bf2258..7b10b7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20230515 +20230521 diff --git a/aclocal.m4 b/aclocal.m4 index 17ff518..2dec1ee 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.60 2023/02/20 16:15:46 tom Exp $ +dnl $Id: aclocal.m4,v 1.64 2023/05/21 19:57:27 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- dnl Copyright 2004-2022,2023 Thomas E. Dickey @@ -717,7 +717,7 @@ rm -rf ./conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 +dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13 dnl -------------- dnl Find version of gcc, and (because icc/clang pretend to be gcc without being dnl compatible), attempt to determine if icc/clang is actually used. @@ -726,7 +726,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -985,6 +985,151 @@ if test x$cf_cv_gnu_library = xyes; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_MAN version: 5 updated: 2023/05/21 15:53:07 +dnl -------------- +dnl Call this to generate a script "install-man" which uses the detected +dnl manpage-format to compress the resulting manpage. Providing this as a +dnl macro simplifies including the script in different programs. +dnl +dnl The generated script assumes that the program can be renamed, using two +dnl symbols in the manpage, e.g., +dnl .ds N Yacc +dnl .ds n yacc +dnl which are later used as \*N and \*n, as well as a special case in the +dnl synopsis to work around limitations of makewhatis. +dnl +dnl Script parameters: +dnl $1 = input file +dnl $2 = output filename +dnl +dnl or (uninstall): +dnl $1 = output filename +AC_DEFUN([CF_INSTALL_MAN], +[ +AC_REQUIRE([AC_ARG_PROGRAM]) +AC_REQUIRE([AC_PROG_INSTALL]) +AC_REQUIRE([AC_LN_S]) +AC_REQUIRE([CF_MANPAGE_FORMAT]) +cf_install_man=install-man +ac_config_files="$ac_config_files $cf_install_man" +cf_install_man=$cf_install_man.in +echo [$]as_me: creating $cf_install_man +cat >[$]cf_install_man <<"CF_EOF" +#!/bin/sh +# generated by CF_INSTALL_MAN + +LANG=C; export LANG +LC_ALL=C; export LC_ALL +LC_CTYPE=C; export LC_CTYPE +LANGUAGE=C; export LANGUAGE + +INSTALL="@INSTALL@" +INSTALL_DATA="@INSTALL_DATA@" + +usage() { + cat <&2 + exit 1 +} + +test [$]# != 0 || usage +OPTS= +case "x[$]1" in +(x-l) + OPTS="link" + shift + ;; +(x-*) + usage + ;; +esac + +source= +if test [$]# = 2 ; then + source=[$]1; shift + target=[$]1 +elif test [$]# = 1 ; then + test -n "$OPTS" && usage + target=[$]1 +else + usage +fi + +origin_name=`echo "$source" |sed -e 's%^.*/%%' -e 's%\..*%%'` +actual_name=`echo "$origin_name" |sed '@program_transform_name@'` +leading_cap=`echo "$actual_name" | sed -e 's%^\(.\).*$%\1%' | tr a-z A-Z``echo "$actual_name" | sed -e 's%^.%%'` +capitalized=`echo "$actual_name" | tr a-z A-Z` + +cf_tmpdir=`mktemp -d` +trap 'rm -rf "$cf_tmpdir"; exit 1' 1 2 3 15 +trap 'rm -rf "$cf_tmpdir"; exit 0' 0 + +if test -n "$source" ; then + suffix= + test -n "@cf_manpage_so_strip" && suffix=".@cf_manpage_so_strip@" + if test "x$OPTS" = xlink ; then + source_dir=`echo "$source" | sed -e "s%/[[^/]]*$%%"` + target_dir=`echo "$target" | sed -e "s%/[[^/]]*$%%"` + sourcelink="${source}${suffix}" + targetfile="${target}${suffix}" + targetlink="${target_dir}/${sourcelink}" + if test ! -d "$target_dir" ; then + failed "target directory does not exist: $target_dir" + elif test ! -f "$targetfile" ; then + failed "target file does not exist: $targetfile" + elif test "$source" != "$source_dir" ; then + failed "unexpected directory for source-link: $source_dir" + fi + test -f "$targetlink" && failed "already exists $targetlink" + ( cd "$target_dir" && @LN_S@ "`echo "$targetfile" | sed -e 's%^.*/%%'`" "$sourcelink" ) + test -f "$targetlink" || failed "cannot create $targetlink" + target="$targetlink" + else + echo "** installing $source to $target" + interim="$cf_tmpdir"/"`basename $source`" + if test "x$origin_name" != "x$actual_name" ; then + sed \ + -e "/^.ds N/s%N.*%N $leading_cap%" \ + -e "/^.ds n/s%n.*%n $actual_name%" \ + -e "/^\.TH/s%[[ ]][[ ]]*[[^ ]][[^ ]]*% $capitalized%" \ + -e "/^\.SH[[ ]][[ ]]*NAME/,/[[ ]]\\\\-[[ ]]/s%^\\\\\\*[[Nn]]%$actual_name%" \ + "$source" >"$interim" || exit 1 + diff -c "$source" "$interim" + else + cp "$source" "$interim" || exit 1 + fi + if test -n "@cf_manpage_compress@" ; then + @cf_manpage_compress@ "$interim" + source="${interim}${suffix}" + fi + if test -d "$target" ; then + target="$target"/"$source" + else + test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@" + fi + $INSTALL_DATA "$source" "$target" || exit 1 + fi + echo "...installed $target" +else + echo "** removing $target" + test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@" + if test -f "$target" ; then + rm -f "$target" + echo "...removed $target" + else + echo "...not found" + fi +fi +exit 0 +CF_EOF +])dnl +dnl --------------------------------------------------------------------------- dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It @@ -1123,6 +1268,162 @@ AC_SUBST(ETAGS) AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02 +dnl ----------------- +dnl Option to allow user to override automatic configuration of manpage format. +dnl There are several special cases: +dnl +dnl compress - man checks for, can display compressed files +dnl bzip2 - man checks for, can display bzip2'd files +dnl gzip - man checks for, can display gzip'd files +dnl xz - man checks for, can display xz'd files +dnl +dnl BSDI - files in the cat-directories are suffixed ".0" +dnl formatted - installer should format (put files in cat-directory) +dnl catonly - installer should only format, e.g., for a turnkey system. +dnl +dnl There are other configurations which this macro does not test, e.g., HPUX's +dnl compressed manpages (but uncompressed manpages are fine, and HPUX's naming +dnl convention would not match our use). +AC_DEFUN([CF_MANPAGE_FORMAT], +[ +AC_REQUIRE([CF_PATHSEP]) +AC_MSG_CHECKING(format of man-pages) + +AC_ARG_WITH(manpage-format, + [ --with-manpage-format specify manpage-format: gzip/compress/bzip2/xz, + BSDI/normal and optionally formatted/catonly, + e.g., gzip,formatted], + [MANPAGE_FORMAT=$withval], + [MANPAGE_FORMAT=unknown]) + +test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown +MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` + +cf_unknown= + +case "$MANPAGE_FORMAT" in +(unknown) + if test -z "$MANPATH" ; then + MANPATH="/usr/man:/usr/share/man" + fi + + # look for the 'date' man-page (it is most likely to be installed!) + MANPAGE_FORMAT= + cf_preform="no" + cf_catonly="yes" + cf_example="date" + + IFS="${IFS:- }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for cf_dir in $MANPATH; do + test -z "$cf_dir" && cf_dir=/usr/man + for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example + do + cf_test=`echo "$cf_name" | sed -e 's/*//'` + if test "x$cf_test" = "x$cf_name" ; then + + case "$cf_name" in + (*.bz2) MANPAGE_FORMAT="$MANPAGE_FORMAT bzip2";; + (*.xz) MANPAGE_FORMAT="$MANPAGE_FORMAT xz";; + (*.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";; + (*.Z) MANPAGE_FORMAT="$MANPAGE_FORMAT compress";; + (*.0) MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";; + (*) MANPAGE_FORMAT="$MANPAGE_FORMAT normal";; + esac + + case "$cf_name" in + ($cf_dir/man*) + cf_catonly=no + ;; + ($cf_dir/cat*) + cf_preform=yes + ;; + esac + break + fi + + # if we found a match in either man* or cat*, stop looking + if test -n "$MANPAGE_FORMAT" ; then + cf_found=no + test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted" + test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly" + case "$cf_name" in + ($cf_dir/cat*) + cf_found=yes + ;; + esac + test "$cf_found" = yes && break + fi + done + # only check the first directory in $MANPATH where we find manpages + if test -n "$MANPAGE_FORMAT" ; then + break + fi + done + # if we did not find the example, just assume it is normal + test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal + IFS="$ac_save_ifs" + ;; +(*) + for cf_option in $MANPAGE_FORMAT; do + case "$cf_option" in + (xz|bzip2|gzip|compress|BSDI|normal|formatted|catonly) + ;; + (*) + cf_unknown="$cf_unknown $cf_option" + ;; + esac + done + ;; +esac + +AC_MSG_RESULT($MANPAGE_FORMAT) +if test -n "$cf_unknown" ; then + AC_MSG_WARN(Unexpected manpage-format $cf_unknown) +fi + +cf_manpage_format=no +cf_manpage_inboth=no +cf_manpage_so_strip= +cf_manpage_compress= + +for cf_item in $MANPAGE_FORMAT +do +case "$cf_item" in +(catonly) + cf_manpage_format=yes + cf_manpage_inboth=no + ;; +(formatted) + cf_manpage_format=yes + cf_manpage_inboth=yes + ;; +(compress) + cf_manpage_so_strip="Z" + cf_manpage_compress=compress + ;; +(gzip) + cf_manpage_so_strip="gz" + cf_manpage_compress=gzip + ;; +(bzip2) + cf_manpage_so_strip="bz2" + cf_manpage_compress=bzip2 + ;; +(xz) + cf_manpage_so_strip="xz" + cf_manpage_compress=xz + ;; +esac +done + +AC_SUBST(cf_manpage_format) +AC_SUBST(cf_manpage_inboth) +AC_SUBST(cf_manpage_so_strip) +AC_SUBST(cf_manpage_compress) + ])dnl dnl --------------------------------------------------------------------------- dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59 @@ -1254,6 +1555,22 @@ case ".$with_cflags" in esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PATHSEP version: 8 updated: 2021/01/01 13:31:04 +dnl ---------- +dnl Provide a value for the $PATH and similar separator (or amend the value +dnl as provided in autoconf 2.5x). +AC_DEFUN([CF_PATHSEP], +[ + AC_MSG_CHECKING(for PATH separator) + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac +ifelse([$1],,,[$1=$PATH_SEPARATOR]) + AC_SUBST(PATH_SEPARATOR) + AC_MSG_RESULT($PATH_SEPARATOR) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it @@ -1760,7 +2077,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25 +dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19: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, @@ -1769,6 +2086,18 @@ dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE +dnl +dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the +dnl implementation predefines it, because X/Open and most implementations agree +dnl that the latter is a legacy or "aligned" value. +dnl +dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns +dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly. +dnl +dnl References: +dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html +dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html +dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html AC_DEFUN([CF_XOPEN_SOURCE],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([CF_POSIX_VISIBLE]) @@ -1808,7 +2137,7 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; (minix*) @@ -1860,8 +2189,8 @@ case "$host_os" in cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes) + if test "$cf_cv_xopen_source" = no ; then + CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) diff --git a/configure b/configure index d12c1a1..d80b5b8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.28 . +# From configure.in Revision: 1.29 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20230114. # @@ -711,6 +711,9 @@ Optional Features: --with-dbmalloc test: use Conor Cahill's dbmalloc library --with-valgrind test: use valgrind --disable-leaks test: free permanent memory, analyze leaks + --with-manpage-format specify manpage-format: gzip/compress/bzip2/xz, + BSDI/normal and optionally formatted/catonly, + e.g., gzip,formatted --with-man2html=XXX use XXX rather than groff Some influential environment variables: @@ -906,7 +909,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:909: loading site script $ac_site_file" >&5 + { echo "$as_me:912: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -917,7 +920,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:920: loading cache $cache_file" >&5 + { echo "$as_me:923: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -925,7 +928,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:928: creating cache $cache_file" >&5 + { echo "$as_me:931: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -941,21 +944,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:944: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:947: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:948: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:951: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:954: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:957: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:956: former value: $ac_old_val" >&5 + { echo "$as_me:959: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:958: current value: $ac_new_val" >&5 + { echo "$as_me:961: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -974,9 +977,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:977: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:980: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:979: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:982: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1005,10 +1008,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1008: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1011: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1011: \$? = $ac_status" >&5 + echo "$as_me:1014: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1036,7 +1039,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1039: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1042: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1046,11 +1049,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1049: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1052: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1053: checking build system type" >&5 +echo "$as_me:1056: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1059,23 +1062,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1062: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1065: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1066: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1069: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1071: result: $ac_cv_build" >&5 +echo "$as_me:1074: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1078: checking host system type" >&5 +echo "$as_me:1081: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1084,12 +1087,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1087: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1090: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1092: result: $ac_cv_host" >&5 +echo "$as_me:1095: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1097,7 +1100,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1100: checking target system type" >&5 + echo "$as_me:1103: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1106,12 +1109,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1109: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1112: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1114: result: $ac_cv_target" >&5 +echo "$as_me:1117: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1143,13 +1146,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1146: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1149: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1150: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1153: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1152: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1155: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1176,7 +1179,7 @@ ac_main_return="return" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1179: checking for $ac_word" >&5 +echo "$as_me:1182: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1191,7 +1194,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1194: found $ac_dir/$ac_word" >&5 +echo "$as_me:1197: found $ac_dir/$ac_word" >&5 break done @@ -1199,10 +1202,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1202: result: $CC" >&5 + echo "$as_me:1205: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1205: result: no" >&5 + echo "$as_me:1208: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1211,7 +1214,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1214: checking for $ac_word" >&5 +echo "$as_me:1217: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1226,7 +1229,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1229: found $ac_dir/$ac_word" >&5 +echo "$as_me:1232: found $ac_dir/$ac_word" >&5 break done @@ -1234,10 +1237,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1237: result: $ac_ct_CC" >&5 + echo "$as_me:1240: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1240: result: no" >&5 + echo "$as_me:1243: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1250,7 +1253,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1253: checking for $ac_word" >&5 +echo "$as_me:1256: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1265,7 +1268,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1268: found $ac_dir/$ac_word" >&5 +echo "$as_me:1271: found $ac_dir/$ac_word" >&5 break done @@ -1273,10 +1276,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1276: result: $CC" >&5 + echo "$as_me:1279: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1279: result: no" >&5 + echo "$as_me:1282: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1285,7 +1288,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1288: checking for $ac_word" >&5 +echo "$as_me:1291: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1300,7 +1303,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1303: found $ac_dir/$ac_word" >&5 +echo "$as_me:1306: found $ac_dir/$ac_word" >&5 break done @@ -1308,10 +1311,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1311: result: $ac_ct_CC" >&5 + echo "$as_me:1314: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1314: result: no" >&5 + echo "$as_me:1317: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1324,7 +1327,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1327: checking for $ac_word" >&5 +echo "$as_me:1330: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1344,7 +1347,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1347: found $ac_dir/$ac_word" >&5 +echo "$as_me:1350: found $ac_dir/$ac_word" >&5 break done @@ -1366,10 +1369,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1369: result: $CC" >&5 + echo "$as_me:1372: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1372: result: no" >&5 + echo "$as_me:1375: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1380,7 +1383,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1383: checking for $ac_word" >&5 +echo "$as_me:1386: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1395,7 +1398,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1398: found $ac_dir/$ac_word" >&5 +echo "$as_me:1401: found $ac_dir/$ac_word" >&5 break done @@ -1403,10 +1406,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1406: result: $CC" >&5 + echo "$as_me:1409: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1409: result: no" >&5 + echo "$as_me:1412: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1419,7 +1422,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1422: checking for $ac_word" >&5 +echo "$as_me:1425: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1434,7 +1437,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1437: found $ac_dir/$ac_word" >&5 +echo "$as_me:1440: found $ac_dir/$ac_word" >&5 break done @@ -1442,10 +1445,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1445: result: $ac_ct_CC" >&5 + echo "$as_me:1448: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1448: result: no" >&5 + echo "$as_me:1451: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1457,32 +1460,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1460: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1463: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1465:" \ +echo "$as_me:1468:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1468: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1471: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1471: \$? = $ac_status" >&5 + echo "$as_me:1474: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1473: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1476: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1476: \$? = $ac_status" >&5 + echo "$as_me:1479: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1478: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1481: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1481: \$? = $ac_status" >&5 + echo "$as_me:1484: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1485 "configure" +#line 1488 "configure" #include "confdefs.h" int @@ -1498,13 +1501,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1501: checking for C compiler default output" >&5 +echo "$as_me:1504: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1504: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1507: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1507: \$? = $ac_status" >&5 + echo "$as_me:1510: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1527,34 +1530,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1530: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1533: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1536: result: $ac_file" >&5 +echo "$as_me:1539: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1541: checking whether the C compiler works" >&5 +echo "$as_me:1544: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1547: \"$ac_try\"") >&5 + { (eval echo "$as_me:1550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1550: \$? = $ac_status" >&5 + echo "$as_me:1553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1557: error: cannot run C compiled programs. + { { echo "$as_me:1560: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1562,24 +1565,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1565: result: yes" >&5 +echo "$as_me:1568: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1572: checking whether we are cross compiling" >&5 +echo "$as_me:1575: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1574: result: $cross_compiling" >&5 +echo "$as_me:1577: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1577: checking for executable suffix" >&5 +echo "$as_me:1580: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1582: \$? = $ac_status" >&5 + echo "$as_me:1585: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1595,25 +1598,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1598: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1601: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1604: result: $ac_cv_exeext" >&5 +echo "$as_me:1607: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1610: checking for object suffix" >&5 +echo "$as_me:1613: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1616 "configure" +#line 1619 "configure" #include "confdefs.h" int @@ -1625,10 +1628,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1628: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1631: \$? = $ac_status" >&5 + echo "$as_me:1634: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1640,24 +1643,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1643: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1646: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1650: result: $ac_cv_objext" >&5 +echo "$as_me:1653: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1654: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1657: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1660 "configure" +#line 1663 "configure" #include "confdefs.h" int @@ -1672,16 +1675,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1675: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1678: \$? = $ac_status" >&5 + echo "$as_me:1681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1681: \"$ac_try\"") >&5 + { (eval echo "$as_me:1684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1684: \$? = $ac_status" >&5 + echo "$as_me:1687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1693,19 +1696,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1696: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1699: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1702: checking whether $CC accepts -g" >&5 +echo "$as_me:1705: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1708 "configure" +#line 1711 "configure" #include "confdefs.h" int @@ -1717,16 +1720,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1720: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1723: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1723: \$? = $ac_status" >&5 + echo "$as_me:1726: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1726: \"$ac_try\"") >&5 + { (eval echo "$as_me:1729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1729: \$? = $ac_status" >&5 + echo "$as_me:1732: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1736,7 +1739,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1739: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1742: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1763,16 +1766,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1769: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1769: \$? = $ac_status" >&5 + echo "$as_me:1772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1772: \"$ac_try\"") >&5 + { (eval echo "$as_me:1775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1775: \$? = $ac_status" >&5 + echo "$as_me:1778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1784,7 +1787,7 @@ if { (eval echo "$as_me:1766: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1787 "configure" +#line 1790 "configure" #include "confdefs.h" #include $ac_declaration @@ -1797,16 +1800,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1803: \$? = $ac_status" >&5 + echo "$as_me:1806: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1806: \"$ac_try\"") >&5 + { (eval echo "$as_me:1809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1809: \$? = $ac_status" >&5 + echo "$as_me:1812: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1816,7 +1819,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1819 "configure" +#line 1822 "configure" #include "confdefs.h" $ac_declaration int @@ -1828,16 +1831,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1834: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1834: \$? = $ac_status" >&5 + echo "$as_me:1837: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1837: \"$ac_try\"") >&5 + { (eval echo "$as_me:1840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1840: \$? = $ac_status" >&5 + echo "$as_me:1843: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1867,11 +1870,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1870: checking version of $CC" >&5 + echo "$as_me:1873: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1874: result: $GCC_VERSION" >&5 + echo "$as_me:1877: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1880,12 +1883,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1883: checking if this is really Intel C compiler" >&5 + echo "$as_me:1886: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 1888 "configure" +#line 1891 "configure" #include "confdefs.h" int @@ -1902,16 +1905,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1908: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1908: \$? = $ac_status" >&5 + echo "$as_me:1911: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1911: \"$ac_try\"") >&5 + { (eval echo "$as_me:1914: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1914: \$? = $ac_status" >&5 + echo "$as_me:1917: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1922,7 +1925,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1925: result: $INTEL_COMPILER" >&5 + echo "$as_me:1928: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1931,11 +1934,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1934: checking if this is really Clang C compiler" >&5 + echo "$as_me:1937: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 1938 "configure" +#line 1941 "configure" #include "confdefs.h" int @@ -1952,16 +1955,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1958: \$? = $ac_status" >&5 + echo "$as_me:1961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1961: \"$ac_try\"") >&5 + { (eval echo "$as_me:1964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1964: \$? = $ac_status" >&5 + echo "$as_me:1967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -1971,7 +1974,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1974: result: $CLANG_COMPILER" >&5 + echo "$as_me:1977: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1980,30 +1983,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:1983: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:1986: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:1990: checking version of $CC" >&5 + echo "$as_me:1993: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:1994: result: $CLANG_VERSION" >&5 + echo "$as_me:1997: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:2001: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2004: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2006 "configure" +#line 2009 "configure" #include "confdefs.h" #include @@ -2017,16 +2020,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2020: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2023: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2023: \$? = $ac_status" >&5 + echo "$as_me:2026: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2026: \"$ac_try\"") >&5 + { (eval echo "$as_me:2029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2029: \$? = $ac_status" >&5 + echo "$as_me:2032: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2037,13 +2040,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2040: result: $cf_clang_optok" >&5 + echo "$as_me:2043: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2046: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2049: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2052,7 +2055,7 @@ echo "${as_me:-configure}:2046: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2055: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2058: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2060,7 +2063,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2063 "configure" +#line 2066 "configure" #include "confdefs.h" #include #include @@ -2107,16 +2110,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2110: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2113: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2113: \$? = $ac_status" >&5 + echo "$as_me:2116: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2116: \"$ac_try\"") >&5 + { (eval echo "$as_me:2119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2119: \$? = $ac_status" >&5 + echo "$as_me:2122: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2133,10 +2136,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2136: result: none needed" >&5 + echo "$as_me:2139: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2139: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2142: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2144,13 +2147,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2147: checking \$CFLAGS variable" >&5 +echo "$as_me:2150: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2151: result: broken" >&5 + echo "$as_me:2154: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2156: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2258,18 +2261,18 @@ fi done ;; (*) - echo "$as_me:2261: result: ok" >&5 + echo "$as_me:2264: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2266: checking \$CC variable" >&5 +echo "$as_me:2269: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2270: result: broken" >&5 + echo "$as_me:2273: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2275: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2386,24 +2389,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2392: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2396: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2400: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2401: result: ok" >&5 + echo "$as_me:2404: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2409: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2423,11 +2426,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2426: result: yes" >&5 + echo "$as_me:2429: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2430: result: no" >&5 + echo "$as_me:2433: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2444,7 +2447,7 @@ fi # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2447: checking for a BSD compatible install" >&5 +echo "$as_me:2450: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2493,7 +2496,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2496: result: $INSTALL" >&5 +echo "$as_me:2499: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2504,7 +2507,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2507: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2510: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2531,7 +2534,7 @@ else fi fi -echo "$as_me:2534: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2537: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2542,7 +2545,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2545: checking for $ac_word" >&5 +echo "$as_me:2548: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2557,7 +2560,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:2560: found $ac_dir/$ac_word" >&5 +echo "$as_me:2563: found $ac_dir/$ac_word" >&5 break done @@ -2565,10 +2568,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2568: result: $CTAGS" >&5 + echo "$as_me:2571: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2571: result: no" >&5 + echo "$as_me:2574: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2579,7 +2582,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2582: checking for $ac_word" >&5 +echo "$as_me:2585: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2594,7 +2597,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:2597: found $ac_dir/$ac_word" >&5 +echo "$as_me:2600: found $ac_dir/$ac_word" >&5 break done @@ -2602,10 +2605,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2605: result: $ETAGS" >&5 + echo "$as_me:2608: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2608: result: no" >&5 + echo "$as_me:2611: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2614,7 +2617,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2617: checking for $ac_word" >&5 +echo "$as_me:2620: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2629,7 +2632,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:2632: found $ac_dir/$ac_word" >&5 +echo "$as_me:2635: found $ac_dir/$ac_word" >&5 break done @@ -2638,17 +2641,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2641: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2644: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2644: result: no" >&5 + echo "$as_me:2647: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2651: checking for $ac_word" >&5 +echo "$as_me:2654: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2663,7 +2666,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:2666: found $ac_dir/$ac_word" >&5 +echo "$as_me:2669: found $ac_dir/$ac_word" >&5 break done @@ -2672,10 +2675,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2675: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2678: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2678: result: no" >&5 + echo "$as_me:2681: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2699,7 +2702,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2702: checking for $ac_word" >&5 +echo "$as_me:2705: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2714,7 +2717,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2717: found $ac_dir/$ac_word" >&5 +echo "$as_me:2720: found $ac_dir/$ac_word" >&5 break done @@ -2722,17 +2725,17 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2725: result: $AWK" >&5 + echo "$as_me:2728: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2728: result: no" >&5 + echo "$as_me:2731: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2735: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:2738: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } @@ -2740,7 +2743,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2743: checking for $ac_word" >&5 +echo "$as_me:2746: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2755,7 +2758,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2758: found $ac_dir/$ac_word" >&5 +echo "$as_me:2761: found $ac_dir/$ac_word" >&5 break done @@ -2763,10 +2766,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2766: result: $LINT" >&5 + echo "$as_me:2769: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2769: result: no" >&5 + echo "$as_me:2772: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2779,14 +2782,14 @@ case "x$LINT" in ;; esac -echo "$as_me:2782: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:2785: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 2789 "configure" +#line 2792 "configure" #include "confdefs.h" #include int @@ -2805,16 +2808,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2808: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2811: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2811: \$? = $ac_status" >&5 + echo "$as_me:2814: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2814: \"$ac_try\"") >&5 + { (eval echo "$as_me:2817: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2817: \$? = $ac_status" >&5 + echo "$as_me:2820: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -2825,7 +2828,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:2828: result: $cf_cv_posix_visible" >&5 +echo "$as_me:2831: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -2863,18 +2866,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:2870: checking if this is the GNU C library" >&5 +echo "$as_me:2873: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 2877 "configure" +#line 2880 "configure" #include "confdefs.h" #include int @@ -2893,16 +2896,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2896: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2899: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2899: \$? = $ac_status" >&5 + echo "$as_me:2902: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2902: \"$ac_try\"") >&5 + { (eval echo "$as_me:2905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2905: \$? = $ac_status" >&5 + echo "$as_me:2908: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -2913,7 +2916,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:2916: result: $cf_cv_gnu_library" >&5 +echo "$as_me:2919: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -2921,7 +2924,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:2924: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:2927: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2933,7 +2936,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 2936 "configure" +#line 2939 "configure" #include "confdefs.h" #include int @@ -2952,16 +2955,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2958: \$? = $ac_status" >&5 + echo "$as_me:2961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2961: \"$ac_try\"") >&5 + { (eval echo "$as_me:2964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2964: \$? = $ac_status" >&5 + echo "$as_me:2967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -2973,12 +2976,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:2976: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:2979: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:2981: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:2984: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3083,7 +3086,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 3086 "configure" +#line 3089 "configure" #include "confdefs.h" #include @@ -3103,16 +3106,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3106: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3109: \$? = $ac_status" >&5 + echo "$as_me:3112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3112: \"$ac_try\"") >&5 + { (eval echo "$as_me:3115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3115: \$? = $ac_status" >&5 + echo "$as_me:3118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -3123,7 +3126,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3126: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:3129: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -3132,14 +3135,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:3135: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:3138: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3142 "configure" +#line 3145 "configure" #include "confdefs.h" #include int @@ -3154,16 +3157,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3157: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3160: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3160: \$? = $ac_status" >&5 + echo "$as_me:3163: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3163: \"$ac_try\"") >&5 + { (eval echo "$as_me:3166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3166: \$? = $ac_status" >&5 + echo "$as_me:3169: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -3270,7 +3273,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 3273 "configure" +#line 3276 "configure" #include "confdefs.h" #include int @@ -3285,16 +3288,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3291: \$? = $ac_status" >&5 + echo "$as_me:3294: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3294: \"$ac_try\"") >&5 + { (eval echo "$as_me:3297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3297: \$? = $ac_status" >&5 + echo "$as_me:3300: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -3309,12 +3312,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3312: result: $cf_cv_gnu_source" >&5 +echo "$as_me:3315: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:3317: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:3320: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3324,7 +3327,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 3327 "configure" +#line 3330 "configure" #include "confdefs.h" #include int @@ -3339,16 +3342,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3342: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3345: \$? = $ac_status" >&5 + echo "$as_me:3348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3348: \"$ac_try\"") >&5 + { (eval echo "$as_me:3351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3351: \$? = $ac_status" >&5 + echo "$as_me:3354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -3359,7 +3362,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3362: result: $cf_cv_default_source" >&5 +echo "$as_me:3365: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -3396,16 +3399,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:3399: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3402: 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}:3405: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3408: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3408 "configure" +#line 3411 "configure" #include "confdefs.h" #include int @@ -3420,16 +3423,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3423: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3426: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3426: \$? = $ac_status" >&5 + echo "$as_me:3429: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3429: \"$ac_try\"") >&5 + { (eval echo "$as_me:3432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3432: \$? = $ac_status" >&5 + echo "$as_me:3435: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -3450,7 +3453,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3453 "configure" +#line 3456 "configure" #include "confdefs.h" #include int @@ -3465,16 +3468,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3471: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3471: \$? = $ac_status" >&5 + echo "$as_me:3474: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3474: \"$ac_try\"") >&5 + { (eval echo "$as_me:3477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3477: \$? = $ac_status" >&5 + echo "$as_me:3480: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -3485,7 +3488,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:3488: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3491: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3493,10 +3496,10 @@ echo "${as_me:-configure}:3488: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:3496: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3499: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3499 "configure" +#line 3502 "configure" #include "confdefs.h" #include int @@ -3511,16 +3514,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3514: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3517: \$? = $ac_status" >&5 + echo "$as_me:3520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3520: \"$ac_try\"") >&5 + { (eval echo "$as_me:3523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3523: \$? = $ac_status" >&5 + echo "$as_me:3526: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -3536,7 +3539,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3539: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3542: 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 @@ -3653,7 +3656,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:3656: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:3659: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -3685,14 +3688,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:3688: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3691: 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 3695 "configure" +#line 3698 "configure" #include "confdefs.h" $ac_includes_default @@ -3710,16 +3713,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3713: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3716: \$? = $ac_status" >&5 + echo "$as_me:3719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3719: \"$ac_try\"") >&5 + { (eval echo "$as_me:3722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3722: \$? = $ac_status" >&5 + echo "$as_me:3725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3731,7 +3734,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 3734 "configure" +#line 3737 "configure" #include "confdefs.h" $ac_includes_default @@ -3749,16 +3752,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3755: \$? = $ac_status" >&5 + echo "$as_me:3758: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3758: \"$ac_try\"") >&5 + { (eval echo "$as_me:3761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3761: \$? = $ac_status" >&5 + echo "$as_me:3764: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -3773,7 +3776,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3776: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3779: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3933,16 +3936,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3936: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3939: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3942: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3945: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 3945 "configure" +#line 3948 "configure" #include "confdefs.h" #include int @@ -3957,16 +3960,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3960: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3963: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3963: \$? = $ac_status" >&5 + echo "$as_me:3966: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3966: \"$ac_try\"") >&5 + { (eval echo "$as_me:3969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3969: \$? = $ac_status" >&5 + echo "$as_me:3972: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -3987,7 +3990,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3990 "configure" +#line 3993 "configure" #include "confdefs.h" #include int @@ -4002,16 +4005,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4005: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4008: \$? = $ac_status" >&5 + echo "$as_me:4011: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4011: \"$ac_try\"") >&5 + { (eval echo "$as_me:4014: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4014: \$? = $ac_status" >&5 + echo "$as_me:4017: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4022,7 +4025,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4025: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4028: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4030,10 +4033,10 @@ echo "${as_me:-configure}:4025: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4033: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4036: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4036 "configure" +#line 4039 "configure" #include "confdefs.h" #include int @@ -4048,16 +4051,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4054: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4054: \$? = $ac_status" >&5 + echo "$as_me:4057: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4057: \"$ac_try\"") >&5 + { (eval echo "$as_me:4060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4060: \$? = $ac_status" >&5 + echo "$as_me:4063: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4073,7 +4076,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4076: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4079: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4183,13 +4186,13 @@ fi fi # cf_cv_posix_visible # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 -echo "${as_me:-configure}:4189: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 +echo "${as_me:-configure}:4192: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4192 "configure" +#line 4195 "configure" #include "confdefs.h" $ac_includes_default @@ -4207,23 +4210,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4210: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4213: \$? = $ac_status" >&5 + echo "$as_me:4216: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4216: \"$ac_try\"") >&5 + { (eval echo "$as_me:4219: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4219: \$? = $ac_status" >&5 + echo "$as_me:4222: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:4226: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:4229: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} CPPFLAGS="$cf_save_xopen_cppflags" fi @@ -4246,7 +4249,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:4249: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:4252: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -4258,7 +4261,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:4261: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:4264: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -4346,7 +4349,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:4349: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4352: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4356,7 +4359,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:4359: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4362: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4366,7 +4369,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:4369: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4372: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -4378,10 +4381,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4381: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4384: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 4384 "configure" +#line 4387 "configure" #include "confdefs.h" #include int @@ -4396,16 +4399,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4399: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4402: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4402: \$? = $ac_status" >&5 + echo "$as_me:4405: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4405: \"$ac_try\"") >&5 + { (eval echo "$as_me:4408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4408: \$? = $ac_status" >&5 + echo "$as_me:4411: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4414,12 +4417,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:4417: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4420: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 4422 "configure" +#line 4425 "configure" #include "confdefs.h" #include int @@ -4434,16 +4437,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4440: \$? = $ac_status" >&5 + echo "$as_me:4443: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4443: \"$ac_try\"") >&5 + { (eval echo "$as_me:4446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4446: \$? = $ac_status" >&5 + echo "$as_me:4449: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4454,19 +4457,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:4457: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:4460: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4462: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4465: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4469 "configure" +#line 4472 "configure" #include "confdefs.h" $ac_includes_default @@ -4484,16 +4487,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4487: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4490: \$? = $ac_status" >&5 + echo "$as_me:4493: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4493: \"$ac_try\"") >&5 + { (eval echo "$as_me:4496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4496: \$? = $ac_status" >&5 + echo "$as_me:4499: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4505,7 +4508,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4508 "configure" +#line 4511 "configure" #include "confdefs.h" $ac_includes_default @@ -4523,16 +4526,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4529: \$? = $ac_status" >&5 + echo "$as_me:4532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4532: \"$ac_try\"") >&5 + { (eval echo "$as_me:4535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4535: \$? = $ac_status" >&5 + echo "$as_me:4538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4547,7 +4550,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4550: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4553: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4698,7 +4701,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4701: checking for $ac_word" >&5 +echo "$as_me:4704: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4713,7 +4716,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:4716: found $ac_dir/$ac_word" >&5 +echo "$as_me:4719: found $ac_dir/$ac_word" >&5 break done @@ -4721,10 +4724,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:4724: result: $GREP" >&5 + echo "$as_me:4727: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:4727: result: no" >&5 + echo "$as_me:4730: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4732,7 +4735,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:4735: checking for egrep" >&5 +echo "$as_me:4738: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4744,7 +4747,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4747: checking for $ac_word" >&5 +echo "$as_me:4750: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4761,7 +4764,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:4764: found $ac_dir/$ac_word" >&5 + echo "$as_me:4767: found $ac_dir/$ac_word" >&5 break fi done @@ -4772,10 +4775,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:4775: result: $EGREP" >&5 + echo "$as_me:4778: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:4778: result: no" >&5 + echo "$as_me:4781: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4783,12 +4786,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4786: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:4789: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:4791: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:4794: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -4798,7 +4801,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:4801: checking how to run the C preprocessor" >&5 +echo "$as_me:4804: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -4819,18 +4822,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 4822 "configure" +#line 4825 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:4827: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4830: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4833: \$? = $ac_status" >&5 + echo "$as_me:4836: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4853,17 +4856,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 4856 "configure" +#line 4859 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4860: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4863: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4866: \$? = $ac_status" >&5 + echo "$as_me:4869: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4900,7 +4903,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:4903: result: $CPP" >&5 +echo "$as_me:4906: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -4910,18 +4913,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 4913 "configure" +#line 4916 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:4918: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4921: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4924: \$? = $ac_status" >&5 + echo "$as_me:4927: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4944,17 +4947,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 4947 "configure" +#line 4950 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4951: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4954: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4957: \$? = $ac_status" >&5 + echo "$as_me:4960: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4982,7 +4985,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:4985: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:4988: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -4994,13 +4997,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:4997: checking for ANSI C header files" >&5 +echo "$as_me:5000: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5003 "configure" +#line 5006 "configure" #include "confdefs.h" #include #include @@ -5008,13 +5011,13 @@ else #include _ACEOF -if { (eval echo "$as_me:5011: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5014: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5017: \$? = $ac_status" >&5 + echo "$as_me:5020: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5036,7 +5039,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 5039 "configure" +#line 5042 "configure" #include "confdefs.h" #include @@ -5054,7 +5057,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 5057 "configure" +#line 5060 "configure" #include "confdefs.h" #include @@ -5075,7 +5078,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 5078 "configure" +#line 5081 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -5101,15 +5104,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5107: \$? = $ac_status" >&5 + echo "$as_me:5110: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5109: \"$ac_try\"") >&5 + { (eval echo "$as_me:5112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5112: \$? = $ac_status" >&5 + echo "$as_me:5115: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5122,7 +5125,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:5125: result: $ac_cv_header_stdc" >&5 +echo "$as_me:5128: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -5138,28 +5141,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5141: checking for $ac_header" >&5 +echo "$as_me:5144: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5147 "configure" +#line 5150 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5153: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5156: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5156: \$? = $ac_status" >&5 + echo "$as_me:5159: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5159: \"$ac_try\"") >&5 + { (eval echo "$as_me:5162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5162: \$? = $ac_status" >&5 + echo "$as_me:5165: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -5169,7 +5172,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5172: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:5185: checking whether exit is declared" >&5 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5188 "configure" +#line 5191 "configure" #include "confdefs.h" $ac_includes_default int @@ -5200,16 +5203,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5203: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5206: \$? = $ac_status" >&5 + echo "$as_me:5209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5209: \"$ac_try\"") >&5 + { (eval echo "$as_me:5212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5212: \$? = $ac_status" >&5 + echo "$as_me:5215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -5219,29 +5222,29 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5222: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:5225: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 for ac_header in fcntl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5228: checking for $ac_header" >&5 +echo "$as_me:5231: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5234 "configure" +#line 5237 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5238: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5241: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5244: \$? = $ac_status" >&5 + echo "$as_me:5247: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5260,7 +5263,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:5281: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5284 "configure" +#line 5287 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5288: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5291: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5294: \$? = $ac_status" >&5 + echo "$as_me:5297: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5310,7 +5313,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5313: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5316: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:5326: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5331,7 +5334,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 5334 "configure" +#line 5337 "configure" #include "confdefs.h" $ac_includes_default @@ -5366,15 +5369,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5369: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5372: \$? = $ac_status" >&5 + echo "$as_me:5375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5374: \"$ac_try\"") >&5 + { (eval echo "$as_me:5377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5377: \$? = $ac_status" >&5 + echo "$as_me:5380: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -5389,16 +5392,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:5392: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:5395: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:5395: checking for mkstemp" >&5 + echo "$as_me:5398: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5401 "configure" +#line 5404 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5429,16 +5432,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5435: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5435: \$? = $ac_status" >&5 + echo "$as_me:5438: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5438: \"$ac_try\"") >&5 + { (eval echo "$as_me:5441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5441: \$? = $ac_status" >&5 + echo "$as_me:5444: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -5448,7 +5451,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5451: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:5454: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -5463,23 +5466,23 @@ fi for ac_header in unistd.h getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5466: checking for $ac_header" >&5 +echo "$as_me:5469: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5472 "configure" +#line 5475 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5476: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5479: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5482: \$? = $ac_status" >&5 + echo "$as_me:5485: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5498,7 +5501,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5501: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:5514: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5518,7 +5521,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5521 "configure" +#line 5524 "configure" #include "confdefs.h" #include <$cf_header> @@ -5531,16 +5534,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5534: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5537: \$? = $ac_status" >&5 + echo "$as_me:5540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5540: \"$ac_try\"") >&5 + { (eval echo "$as_me:5543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5543: \$? = $ac_status" >&5 + echo "$as_me:5546: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -5552,7 +5555,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5555: result: $cf_cv_getopt_header" >&5 +echo "$as_me:5558: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -5572,13 +5575,13 @@ fi for ac_func in getopt vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5575: checking for $ac_func" >&5 +echo "$as_me:5578: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5581 "configure" +#line 5584 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5609,16 +5612,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5615: \$? = $ac_status" >&5 + echo "$as_me:5618: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5618: \"$ac_try\"") >&5 + { (eval echo "$as_me:5621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5621: \$? = $ac_status" >&5 + echo "$as_me:5624: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -5628,7 +5631,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5631: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:5634: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:5644: checking for maximum table size" >&5 echo $ECHO_N "checking for maximum table size... $ECHO_C" >&6 # Check whether --with-max-table-size or --without-max-table-size was given. @@ -5648,12 +5651,12 @@ if test "${with_max_table_size+set}" = set; then fi; if test -n "$with_max_table_size" then - echo "$as_me:5651: result: $with_max_table_size" >&5 + echo "$as_me:5654: result: $with_max_table_size" >&5 echo "${ECHO_T}$with_max_table_size" >&6 check=`expr "$with_max_table_size" + 0` if test "x$check" != "x$with_max_table_size" then - { { echo "$as_me:5656: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 + { { echo "$as_me:5659: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 echo "$as_me: error: invalid value for --with-max-table-size: $with_max_table_size" >&2;} { (exit 1); exit 1; }; } fi @@ -5663,11 +5666,11 @@ cat >>confdefs.h <&5 + echo "$as_me:5669: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:5670: checking if backtracking extension is wanted" >&5 +echo "$as_me:5673: checking if backtracking extension is wanted" >&5 echo $ECHO_N "checking if backtracking extension is wanted... $ECHO_C" >&6 # Check whether --enable-btyacc or --disable-btyacc was given. @@ -5684,7 +5687,7 @@ else enable_btyacc=yes fi; -echo "$as_me:5687: result: $enable_btyacc" >&5 +echo "$as_me:5690: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "no"; then SKELETON=yaccpar @@ -5697,7 +5700,7 @@ EOF SKELETON=btyaccpar fi -echo "$as_me:5700: checking for fgrep" >&5 +echo "$as_me:5703: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5709,7 +5712,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5712: checking for $ac_word" >&5 +echo "$as_me:5715: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5726,7 +5729,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:5729: found $ac_dir/$ac_word" >&5 + echo "$as_me:5732: found $ac_dir/$ac_word" >&5 break fi done @@ -5737,10 +5740,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:5740: result: $FGREP" >&5 + echo "$as_me:5743: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:5743: result: no" >&5 + echo "$as_me:5746: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5748,16 +5751,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5751: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:5754: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:5756: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:5759: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:5760: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:5763: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -5774,17 +5777,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:5777: result: $enable_stdnoreturn" >&5 +echo "$as_me:5780: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:5781: checking for C11 _Noreturn feature" >&5 +echo "$as_me:5784: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5787 "configure" +#line 5790 "configure" #include "confdefs.h" $ac_includes_default @@ -5800,16 +5803,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5806: \$? = $ac_status" >&5 + echo "$as_me:5809: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5809: \"$ac_try\"") >&5 + { (eval echo "$as_me:5812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5812: \$? = $ac_status" >&5 + echo "$as_me:5815: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -5820,7 +5823,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5823: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:5826: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -5876,16 +5879,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:5879: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5882: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:5884: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5887: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5888: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5891: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5924,16 +5927,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5927: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5930: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5932: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5935: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5936: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5939: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5972,23 +5975,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5975: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5978: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5980: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5983: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5984: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5987: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:5991: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:5994: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -6005,14 +6008,14 @@ else enable_warnings=no fi; -echo "$as_me:6008: result: $enable_warnings" >&5 +echo "$as_me:6011: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then if test "x$have_x" = xyes; then echo "skipping X-const check"; fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:6034: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -6044,12 +6047,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:6047: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6050: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6050: \$? = $ac_status" >&5 + echo "$as_me:6053: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:6052: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:6055: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -6057,7 +6060,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:6060: checking for $CC warning options..." >&5 + { echo "$as_me:6063: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -6080,12 +6083,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wwrite-strings do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:6083: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6086: \$? = $ac_status" >&5 + echo "$as_me:6089: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:6088: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:6091: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -6093,7 +6096,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:6096: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:6099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -6103,7 +6106,7 @@ echo "${as_me:-configure}:6096: 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}:6106: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:6109: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -6136,10 +6139,10 @@ cat > conftest.i <&5 + { echo "$as_me:6142: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -6189,12 +6192,12 @@ EOF ;; esac - if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6195: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6195: \$? = $ac_status" >&5 + echo "$as_me:6198: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:6197: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:6200: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -6255,7 +6258,7 @@ fi fi -echo "$as_me:6258: checking if you want to see long compiling messages" >&5 +echo "$as_me:6261: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -6289,10 +6292,10 @@ else ECHO_CC='' fi; -echo "$as_me:6292: result: $enableval" >&5 +echo "$as_me:6295: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:6295: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:6298: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -6314,7 +6317,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:6317: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:6320: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6428,23 +6431,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6431: checking for dmalloc.h" >&5 + echo "$as_me:6434: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6437 "configure" +#line 6440 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6441: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6444: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6447: \$? = $ac_status" >&5 + echo "$as_me:6450: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6463,11 +6466,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6466: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6469: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:6470: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6473: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6475,7 +6478,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6478 "configure" +#line 6481 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6494,16 +6497,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6497: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6500: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6500: \$? = $ac_status" >&5 + echo "$as_me:6503: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6503: \"$ac_try\"") >&5 + { (eval echo "$as_me:6506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6506: \$? = $ac_status" >&5 + echo "$as_me:6509: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6514,7 +6517,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6517: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6520: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6535: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -6551,7 +6554,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:6554: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6557: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6665,23 +6668,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6668: checking for dbmalloc.h" >&5 + echo "$as_me:6671: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6674 "configure" +#line 6677 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6678: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6681: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6684: \$? = $ac_status" >&5 + echo "$as_me:6687: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6700,11 +6703,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6703: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6706: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:6707: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6710: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6712,7 +6715,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6715 "configure" +#line 6718 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6731,16 +6734,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6734: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6737: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6737: \$? = $ac_status" >&5 + echo "$as_me:6740: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6740: \"$ac_try\"") >&5 + { (eval echo "$as_me:6743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6743: \$? = $ac_status" >&5 + echo "$as_me:6746: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6751,7 +6754,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6754: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6757: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6772: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -6788,7 +6791,7 @@ EOF else with_valgrind= fi; -echo "$as_me:6791: result: ${with_valgrind:-no}" >&5 +echo "$as_me:6794: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -6901,7 +6904,7 @@ fi ;; esac -echo "$as_me:6904: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:6907: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -6912,7 +6915,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:6915: result: $with_no_leaks" >&5 +echo "$as_me:6918: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -6927,9 +6930,282 @@ EOF fi + echo "$as_me:6933: checking for PATH separator" >&5 +echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + + echo "$as_me:6940: result: $PATH_SEPARATOR" >&5 +echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +echo "$as_me:6943: checking format of man-pages" >&5 +echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 + +# Check whether --with-manpage-format or --without-manpage-format was given. +if test "${with_manpage_format+set}" = set; then + withval="$with_manpage_format" + MANPAGE_FORMAT=$withval +else + MANPAGE_FORMAT=unknown +fi; + +test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown +MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` + +cf_unknown= + +case "$MANPAGE_FORMAT" in +(unknown) + if test -z "$MANPATH" ; then + MANPATH="/usr/man:/usr/share/man" + fi + + # look for the 'date' man-page (it is most likely to be installed!) + MANPAGE_FORMAT= + cf_preform="no" + cf_catonly="yes" + cf_example="date" + + IFS="${IFS:- }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for cf_dir in $MANPATH; do + test -z "$cf_dir" && cf_dir=/usr/man + for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example + do + cf_test=`echo "$cf_name" | sed -e 's/*//'` + if test "x$cf_test" = "x$cf_name" ; then + + case "$cf_name" in + (*.bz2) MANPAGE_FORMAT="$MANPAGE_FORMAT bzip2";; + (*.xz) MANPAGE_FORMAT="$MANPAGE_FORMAT xz";; + (*.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";; + (*.Z) MANPAGE_FORMAT="$MANPAGE_FORMAT compress";; + (*.0) MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";; + (*) MANPAGE_FORMAT="$MANPAGE_FORMAT normal";; + esac + + case "$cf_name" in + ($cf_dir/man*) + cf_catonly=no + ;; + ($cf_dir/cat*) + cf_preform=yes + ;; + esac + break + fi + + # if we found a match in either man* or cat*, stop looking + if test -n "$MANPAGE_FORMAT" ; then + cf_found=no + test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted" + test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly" + case "$cf_name" in + ($cf_dir/cat*) + cf_found=yes + ;; + esac + test "$cf_found" = yes && break + fi + done + # only check the first directory in $MANPATH where we find manpages + if test -n "$MANPAGE_FORMAT" ; then + break + fi + done + # if we did not find the example, just assume it is normal + test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal + IFS="$ac_save_ifs" + ;; +(*) + for cf_option in $MANPAGE_FORMAT; do + case "$cf_option" in + (xz|bzip2|gzip|compress|BSDI|normal|formatted|catonly) + ;; + (*) + cf_unknown="$cf_unknown $cf_option" + ;; + esac + done + ;; +esac + +echo "$as_me:7034: result: $MANPAGE_FORMAT" >&5 +echo "${ECHO_T}$MANPAGE_FORMAT" >&6 +if test -n "$cf_unknown" ; then + { echo "$as_me:7037: WARNING: Unexpected manpage-format $cf_unknown" >&5 +echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} +fi + +cf_manpage_format=no +cf_manpage_inboth=no +cf_manpage_so_strip= +cf_manpage_compress= + +for cf_item in $MANPAGE_FORMAT +do +case "$cf_item" in +(catonly) + cf_manpage_format=yes + cf_manpage_inboth=no + ;; +(formatted) + cf_manpage_format=yes + cf_manpage_inboth=yes + ;; +(compress) + cf_manpage_so_strip="Z" + cf_manpage_compress=compress + ;; +(gzip) + cf_manpage_so_strip="gz" + cf_manpage_compress=gzip + ;; +(bzip2) + cf_manpage_so_strip="bz2" + cf_manpage_compress=bzip2 + ;; +(xz) + cf_manpage_so_strip="xz" + cf_manpage_compress=xz + ;; +esac +done + +echo "$as_me:7076: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:7080: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:7083: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 +fi + +cf_install_man=install-man +ac_config_files="$ac_config_files $cf_install_man" +cf_install_man=$cf_install_man.in +echo $as_me: creating $cf_install_man +cat >$cf_install_man <<"CF_EOF" +#!/bin/sh +# generated by CF_INSTALL_MAN + +LANG=C; export LANG +LC_ALL=C; export LC_ALL +LC_CTYPE=C; export LC_CTYPE +LANGUAGE=C; export LANGUAGE + +INSTALL="@INSTALL@" +INSTALL_DATA="@INSTALL_DATA@" + +usage() { + cat <&2 + exit 1 +} + +test $# != 0 || usage +OPTS= +case "x$1" in +(x-l) + OPTS="link" + shift + ;; +(x-*) + usage + ;; +esac + +source= +if test $# = 2 ; then + source=$1; shift + target=$1 +elif test $# = 1 ; then + test -n "$OPTS" && usage + target=$1 +else + usage +fi + +origin_name=`echo "$source" |sed -e 's%^.*/%%' -e 's%\..*%%'` +actual_name=`echo "$origin_name" |sed '@program_transform_name@'` +leading_cap=`echo "$actual_name" | sed -e 's%^\(.\).*$%\1%' | tr a-z A-Z``echo "$actual_name" | sed -e 's%^.%%'` +capitalized=`echo "$actual_name" | tr a-z A-Z` + +cf_tmpdir=`mktemp -d` +trap 'rm -rf "$cf_tmpdir"; exit 1' 1 2 3 15 +trap 'rm -rf "$cf_tmpdir"; exit 0' 0 + +if test -n "$source" ; then + suffix= + test -n "@cf_manpage_so_strip" && suffix=".@cf_manpage_so_strip@" + if test "x$OPTS" = xlink ; then + source_dir=`echo "$source" | sed -e "s%/[^/]*$%%"` + target_dir=`echo "$target" | sed -e "s%/[^/]*$%%"` + sourcelink="${source}${suffix}" + targetfile="${target}${suffix}" + targetlink="${target_dir}/${sourcelink}" + if test ! -d "$target_dir" ; then + failed "target directory does not exist: $target_dir" + elif test ! -f "$targetfile" ; then + failed "target file does not exist: $targetfile" + elif test "$source" != "$source_dir" ; then + failed "unexpected directory for source-link: $source_dir" + fi + test -f "$targetlink" && failed "already exists $targetlink" + ( cd "$target_dir" && @LN_S@ "`echo "$targetfile" | sed -e 's%^.*/%%'`" "$sourcelink" ) + test -f "$targetlink" || failed "cannot create $targetlink" + target="$targetlink" + else + echo "** installing $source to $target" + interim="$cf_tmpdir"/"`basename $source`" + if test "x$origin_name" != "x$actual_name" ; then + sed \ + -e "/^.ds N/s%N.*%N $leading_cap%" \ + -e "/^.ds n/s%n.*%n $actual_name%" \ + -e "/^\.TH/s%[ ][ ]*[^ ][^ ]*% $capitalized%" \ + -e "/^\.SH[ ][ ]*NAME/,/[ ]\\\\-[ ]/s%^\\\\\\*[Nn]%$actual_name%" \ + "$source" >"$interim" || exit 1 + diff -c "$source" "$interim" + else + cp "$source" "$interim" || exit 1 + fi + if test -n "@cf_manpage_compress@" ; then + @cf_manpage_compress@ "$interim" + source="${interim}${suffix}" + fi + if test -d "$target" ; then + target="$target"/"$source" + else + test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@" + fi + $INSTALL_DATA "$source" "$target" || exit 1 + fi + echo "...installed $target" +else + echo "** removing $target" + test -n "@cf_manpage_compress@" && target="${target}.@cf_manpage_so_strip@" + if test -f "$target" ; then + rm -f "$target" + echo "...removed $target" + else + echo "...not found" + fi +fi +exit 0 +CF_EOF + # Extract the first word of "groff", so it can be a program name with args. set dummy groff; ac_word=$2 -echo "$as_me:6932: checking for $ac_word" >&5 +echo "$as_me:7208: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6946,7 +7222,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:6949: found $ac_dir/$ac_word" >&5 + echo "$as_me:7225: found $ac_dir/$ac_word" >&5 break fi done @@ -6958,10 +7234,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:6961: result: $GROFF_PATH" >&5 + echo "$as_me:7237: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:6964: result: no" >&5 + echo "$as_me:7240: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6969,7 +7245,7 @@ for ac_prog in nroff mandoc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:6972: checking for $ac_word" >&5 +echo "$as_me:7248: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6986,7 +7262,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:6989: found $ac_dir/$ac_word" >&5 + echo "$as_me:7265: found $ac_dir/$ac_word" >&5 break fi done @@ -6997,10 +7273,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:7000: result: $NROFF_PATH" >&5 + echo "$as_me:7276: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:7003: result: no" >&5 + echo "$as_me:7279: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7010,7 +7286,7 @@ test -n "$NROFF_PATH" || NROFF_PATH="no" # Extract the first word of "tbl", so it can be a program name with args. set dummy tbl; ac_word=$2 -echo "$as_me:7013: checking for $ac_word" >&5 +echo "$as_me:7289: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TBL_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7027,7 +7303,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TBL_PATH="$ac_dir/$ac_word" - echo "$as_me:7030: found $ac_dir/$ac_word" >&5 + echo "$as_me:7306: found $ac_dir/$ac_word" >&5 break fi done @@ -7039,10 +7315,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:7042: result: $TBL_PATH" >&5 + echo "$as_me:7318: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:7045: result: no" >&5 + echo "$as_me:7321: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7062,7 +7338,7 @@ case "x${with_man2html}" in (x|xyes) # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:7065: checking for $ac_word" >&5 +echo "$as_me:7341: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7079,7 +7355,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:7082: found $ac_dir/$ac_word" >&5 + echo "$as_me:7358: found $ac_dir/$ac_word" >&5 break fi done @@ -7091,16 +7367,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:7094: result: $cf_man2html" >&5 + echo "$as_me:7370: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:7097: result: no" >&5 + echo "$as_me:7373: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:7103: checking for the modified Earl Hood script" >&5 + echo "$as_me:7379: checking for the modified Earl Hood script" >&5 echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at the end' >/dev/null ) then @@ -7109,7 +7385,7 @@ echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 cf_man2html=no cf_man2html_ok=no fi - echo "$as_me:7112: result: $cf_man2html_ok" >&5 + echo "$as_me:7388: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -7118,7 +7394,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:7121: checking for program to convert manpage to html" >&5 +echo "$as_me:7397: checking for program to convert manpage to html" >&5 echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6 # Check whether --with-man2html or --without-man2html was given. @@ -7133,11 +7409,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:7136: result: man2html" >&5 + echo "$as_me:7412: result: man2html" >&5 echo "${ECHO_T}man2html" >&6 # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:7140: checking for $ac_word" >&5 +echo "$as_me:7416: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7154,7 +7430,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:7157: found $ac_dir/$ac_word" >&5 + echo "$as_me:7433: found $ac_dir/$ac_word" >&5 break fi done @@ -7166,10 +7442,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:7169: result: $cf_man2html" >&5 + echo "$as_me:7445: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:7172: result: no" >&5 + echo "$as_me:7448: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7177,11 +7453,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:7180: result: $cf_man2html" >&5 + echo "$as_me:7456: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:7184: result: $cf_man2html" >&5 + echo "$as_me:7460: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -7222,12 +7498,12 @@ else # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:7225: checking if nroff is really groff" >&5 + echo "$as_me:7501: checking if nroff is really groff" >&5 echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6 cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`" test -n "$cf_check_groff" && cf_check_groff=yes test -n "$cf_check_groff" || cf_check_groff=no - echo "$as_me:7230: result: $cf_check_groff" >&5 + echo "$as_me:7506: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -7258,14 +7534,14 @@ case ".$cf_man2html" in cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:7261: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:7537: error: expected a pathname, not \"$cf_man2html\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;} { (exit 1); exit 1; }; } ;; esac MAN2HTML_PATH="$cf_man2html" - echo "$as_me:7268: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:7544: checking for $cf_man2html top/bottom margins" >&5 echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6 # for this example, expect 3 lines of content, the remainder is head/foot @@ -7283,10 +7559,10 @@ CF_EOF cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"` cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot" - echo "$as_me:7286: result: $cf_man2html_top_bot" >&5 + echo "$as_me:7562: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:7289: checking for pagesize to use" >&5 + echo "$as_me:7565: checking for pagesize to use" >&5 echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6 for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do @@ -7311,7 +7587,7 @@ CF_EOF test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:7314: result: $cf_man2html_page" >&5 + echo "$as_me:7590: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <&5 +echo "$as_me:7609: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7339 "configure" +#line 7615 "configure" #include "confdefs.h" $ac_includes_default int @@ -7351,16 +7627,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7354: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7357: \$? = $ac_status" >&5 + echo "$as_me:7633: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7360: \"$ac_try\"") >&5 + { (eval echo "$as_me:7636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7363: \$? = $ac_status" >&5 + echo "$as_me:7639: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -7370,7 +7646,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7373: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:7649: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test "$ac_cv_type_mode_t" = yes; then : @@ -7463,7 +7739,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:7466: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7742: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -7641,7 +7917,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7644: error: ambiguous option: $1 + { { echo "$as_me:7920: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -7660,7 +7936,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7663: error: unrecognized option: $1 + -*) { { echo "$as_me:7939: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -7697,7 +7973,7 @@ do # Handling of arguments. "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; - *) { { echo "$as_me:7700: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:7976: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7827,6 +8103,11 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t +s,@cf_manpage_format@,$cf_manpage_format,;t t +s,@cf_manpage_inboth@,$cf_manpage_inboth,;t t +s,@cf_manpage_so_strip@,$cf_manpage_so_strip,;t t +s,@cf_manpage_compress@,$cf_manpage_compress,;t t +s,@LN_S@,$LN_S,;t t s,@GROFF_PATH@,$GROFF_PATH,;t t s,@NROFF_PATH@,$NROFF_PATH,;t t s,@TBL_PATH@,$TBL_PATH,;t t @@ -7968,7 +8249,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7971: creating $ac_file" >&5 + { echo "$as_me:8252: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -7986,7 +8267,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7989: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8270: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -7999,7 +8280,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:8002: error: cannot find input file: $f" >&5 + { { echo "$as_me:8283: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8015,7 +8296,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:8018: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:8299: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -8024,7 +8305,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:8027: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:8308: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -8069,7 +8350,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:8072: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:8353: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -8080,7 +8361,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:8083: WARNING: Some variables may not be substituted: + { echo "$as_me:8364: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -8129,7 +8410,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:8132: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:8413: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -8140,7 +8421,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:8143: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8424: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -8153,7 +8434,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:8156: error: cannot find input file: $f" >&5 + { { echo "$as_me:8437: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8271,7 +8552,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:8274: $ac_file is unchanged" >&5 + { echo "$as_me:8555: $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/configure.in b/configure.in index 165f059..4b59b2d 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 1.28 2023/02/02 00:14:51 tom Exp $ +dnl $Id: configure.in,v 1.29 2023/05/19 07:58:43 tom Exp $ AC_PREREQ(2.52.20200802) -AC_REVISION($Revision: 1.28 $) +AC_REVISION($Revision: 1.29 $) AC_INIT(main.c) AC_CONFIG_HEADER(config.h:config_h.in) @@ -60,6 +60,8 @@ AC_SUBST(SKELETON) CF_ENABLE_WARNINGS(Wwrite-strings,yes) CF_DISABLE_ECHO CF_DISABLE_LEAKS +CF_MANPAGE_FORMAT +CF_INSTALL_MAN CF_WITH_MAN2HTML AC_TYPE_MODE_T diff --git a/defs.h b/defs.h index 0aa98ec..5e0fd01 100644 --- a/defs.h +++ b/defs.h @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.72 2023/05/11 07:43:15 tom Exp $ */ +/* $Id: defs.h,v 1.74 2023/05/18 21:28:05 tom Exp $ */ #ifdef HAVE_CONFIG_H #include @@ -122,6 +122,7 @@ typedef enum ,NONPOSIX_DEBUG /* other bison "extensions", some useful */ + ,HACK_DEFINE ,ERROR_VERBOSE ,EXPECT ,EXPECT_RR @@ -470,41 +471,45 @@ struct ainfo char *a_cptr; }; -extern void arg_number_disagree_warning(int a_lineno, char *a_name); -extern void arg_type_disagree_warning(int a_lineno, int i, char *a_name); -extern GCC_NORETURN void at_error(int a_lineno, char *a_line, char *a_cptr); +extern void arg_number_disagree_warning(int a_lineno, const char *a_name); +extern void arg_type_disagree_warning(int a_lineno, int i, const char *a_name); +extern GCC_NORETURN void at_error(int a_lineno, const char *a_line, const char *a_cptr); extern void at_warning(int a_lineno, int i); extern GCC_NORETURN void bad_formals(void); -extern void default_action_warning(char *s); +extern void default_action_warning(const char *s); extern void destructor_redeclared_warning(const struct ainfo *); -extern GCC_NORETURN void dollar_error(int a_lineno, char *a_line, char *a_cptr); +extern void dislocations_warning(void); +extern GCC_NORETURN void dollar_error(int a_lineno, const char *a_line, const char *a_cptr); extern void dollar_warning(int a_lineno, int i); extern GCC_NORETURN void fatal(const char *msg); -extern GCC_NORETURN void illegal_character(char *c_cptr); -extern GCC_NORETURN void illegal_tag(int t_lineno, char *t_line, char *t_cptr); +extern GCC_NORETURN void illegal_character(const char *c_cptr); +extern GCC_NORETURN void illegal_tag(int t_lineno, const char *t_line, const char *t_cptr); extern GCC_NORETURN void missing_brace(void); extern GCC_NORETURN void no_grammar(void); extern GCC_NORETURN void on_error(void); extern GCC_NORETURN void open_error(const char *filename); -extern GCC_NORETURN void over_unionized(char *u_cptr); +extern GCC_NORETURN void over_unionized(const char *u_cptr); extern void prec_redeclared(void); -extern void reprec_warning(char *s); +extern void reprec_warning(const char *s); extern void restarted_warning(void); -extern void retyped_warning(char *s); -extern void revalued_warning(char *s); -extern void start_requires_args(char *a_name); -extern GCC_NORETURN void syntax_error(int st_lineno, char *st_line, char *st_cptr); +extern void retyped_warning(const char *s); +extern void revalued_warning(const char *s); +extern void start_requires_args(const char *a_name); +extern GCC_NORETURN void syntax_error(int st_lineno, const char *st_line, const char *st_cptr); extern GCC_NORETURN void terminal_lhs(int s_lineno); -extern GCC_NORETURN void terminal_start(char *s); -extern GCC_NORETURN void tokenized_start(char *s); -extern GCC_NORETURN void undefined_goal(char *s); -extern void undefined_symbol_warning(char *s); +extern GCC_NORETURN void terminal_start(const char *s); +extern GCC_NORETURN void tokenized_start(const char *s); +extern GCC_NORETURN void undefined_goal(const char *s); +extern void undefined_symbol_warning(const char *s); extern GCC_NORETURN void unexpected_EOF(void); -extern void unknown_arg_warning(int d_lineno, const char *dlr_opt, - const char *d_arg, const char *d_line, +extern void unknown_arg_warning(int d_lineno, + const char *dlr_opt, + const char *d_arg, + const char *d_line, const char *d_cptr); extern GCC_NORETURN void unknown_rhs(int i); extern void unsupported_flag_warning(const char *flag, const char *details); +extern GCC_NORETURN void unexpected_value(const struct ainfo *); extern GCC_NORETURN void unterminated_action(const struct ainfo *); extern GCC_NORETURN void unterminated_comment(const struct ainfo *); extern GCC_NORETURN void unterminated_string(const struct ainfo *); @@ -512,11 +517,11 @@ extern GCC_NORETURN void unterminated_text(const struct ainfo *); extern GCC_NORETURN void unterminated_union(const struct ainfo *); extern void untyped_arg_warning(int a_lineno, const char *dlr_opt, const char *a_name); extern GCC_NORETURN void untyped_lhs(void); -extern GCC_NORETURN void untyped_rhs(int i, char *s); -extern GCC_NORETURN void used_reserved(char *s); +extern GCC_NORETURN void untyped_rhs(int i, const char *s); +extern GCC_NORETURN void used_reserved(const char *s); extern GCC_NORETURN void unterminated_arglist(const struct ainfo *); extern void wrong_number_args_warning(const char *which, const char *a_name); -extern void wrong_type_for_arg_warning(int i, char *a_name); +extern void wrong_type_for_arg_warning(int i, const char *a_name); /* graph.c */ extern void graph(void); diff --git a/error.c b/error.c index 557ad67..ceb45ca 100644 --- a/error.c +++ b/error.c @@ -1,4 +1,4 @@ -/* $Id: error.c,v 1.15 2023/05/11 07:45:34 tom Exp $ */ +/* $Id: error.c,v 1.17 2023/05/18 21:38:35 tom Exp $ */ /* routines for printing error messages */ @@ -71,7 +71,7 @@ print_pos(const char *st_line, const char *st_cptr) } void -syntax_error(int st_lineno, char *st_line, char *st_cptr) +syntax_error(int st_lineno, const char *st_line, const char *st_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", syntax error\n", myname, st_lineno, input_file_name); @@ -79,6 +79,15 @@ syntax_error(int st_lineno, char *st_line, char *st_cptr) done(1); } +void +unexpected_value(const struct ainfo *a) +{ + fprintf(stderr, "%s: e - line %d of \"%s\", unexpected value\n", + myname, a->a_lineno, input_file_name); + print_pos(a->a_line, a->a_cptr); + done(1); +} + void unterminated_comment(const struct ainfo *a) { @@ -116,7 +125,7 @@ declaration\n", myname, a->a_lineno, input_file_name); } void -over_unionized(char *u_cptr) +over_unionized(const char *u_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", too many %%union \ declarations\n", myname, lineno, input_file_name); @@ -125,7 +134,7 @@ declarations\n", myname, lineno, input_file_name); } void -illegal_tag(int t_lineno, char *t_line, char *t_cptr) +illegal_tag(int t_lineno, const char *t_line, const char *t_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", illegal tag\n", myname, t_lineno, input_file_name); @@ -134,7 +143,7 @@ illegal_tag(int t_lineno, char *t_line, char *t_cptr) } void -illegal_character(char *c_cptr) +illegal_character(const char *c_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", illegal character\n", myname, lineno, input_file_name); @@ -143,7 +152,7 @@ illegal_character(char *c_cptr) } void -used_reserved(char *s) +used_reserved(const char *s) { fprintf(stderr, "%s: e - line %d of \"%s\", illegal use of reserved symbol \ @@ -152,7 +161,7 @@ used_reserved(char *s) } void -tokenized_start(char *s) +tokenized_start(const char *s) { fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s cannot be \ @@ -161,14 +170,14 @@ declared to be a token\n", myname, lineno, input_file_name, s); } void -retyped_warning(char *s) +retyped_warning(const char *s) { fprintf(stderr, "%s: w - line %d of \"%s\", the type of %s has been \ redeclared\n", myname, lineno, input_file_name, s); } void -reprec_warning(char *s) +reprec_warning(const char *s) { fprintf(stderr, "%s: w - line %d of \"%s\", the precedence of %s has been \ @@ -176,14 +185,14 @@ redeclared\n", myname, lineno, input_file_name, s); } void -revalued_warning(char *s) +revalued_warning(const char *s) { fprintf(stderr, "%s: w - line %d of \"%s\", the value of %s has been \ redeclared\n", myname, lineno, input_file_name, s); } void -terminal_start(char *s) +terminal_start(const char *s) { fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s is a \ token\n", myname, lineno, input_file_name, s); @@ -237,7 +246,7 @@ end of the current rule\n", myname, a_lineno, input_file_name, i); } void -dollar_error(int a_lineno, char *a_line, char *a_cptr) +dollar_error(int a_lineno, const char *a_line, const char *a_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", illegal $-name\n", myname, a_lineno, input_file_name); @@ -245,6 +254,13 @@ dollar_error(int a_lineno, char *a_line, char *a_cptr) done(1); } +void +dislocations_warning(void) +{ + fprintf(stderr, "%s: e - line %d of \"%s\", expected %%locations\n", + myname, lineno, input_file_name); +} + void untyped_lhs(void) { @@ -254,7 +270,7 @@ untyped_lhs(void) } void -untyped_rhs(int i, char *s) +untyped_rhs(int i, const char *s) { fprintf(stderr, "%s: e - line %d of \"%s\", $%d (%s) is untyped\n", myname, lineno, input_file_name, i, s); @@ -270,7 +286,7 @@ unknown_rhs(int i) } void -default_action_warning(char *s) +default_action_warning(const char *s) { fprintf(stderr, "%s: w - line %d of \"%s\", the default action for %s assigns an \ @@ -279,14 +295,14 @@ undefined value to $$\n", } void -undefined_goal(char *s) +undefined_goal(const char *s) { fprintf(stderr, "%s: e - the start symbol %s is undefined\n", myname, s); done(1); } void -undefined_symbol_warning(char *s) +undefined_symbol_warning(const char *s) { fprintf(stderr, "%s: w - the symbol %s is undefined\n", myname, s); } @@ -309,7 +325,7 @@ end of the current rule\n", myname, a_lineno, input_file_name, i); } void -at_error(int a_lineno, char *a_line, char *a_cptr) +at_error(int a_lineno, const char *a_line, const char *a_cptr) { fprintf(stderr, "%s: e - line %d of \"%s\", illegal @$ or @N reference\n", @@ -329,7 +345,7 @@ unterminated_arglist(const struct ainfo *a) } void -arg_number_disagree_warning(int a_lineno, char *a_name) +arg_number_disagree_warning(int a_lineno, const char *a_name) { fprintf(stderr, "%s: w - line %d of \"%s\", number of arguments of %s " "doesn't agree with previous declaration\n", @@ -346,7 +362,7 @@ bad_formals(void) } void -arg_type_disagree_warning(int a_lineno, int i, char *a_name) +arg_type_disagree_warning(int a_lineno, int i, const char *a_name) { fprintf(stderr, "%s: w - line %d of \"%s\", type of argument %d " "to %s doesn't agree with previous declaration\n", @@ -354,8 +370,10 @@ arg_type_disagree_warning(int a_lineno, int i, char *a_name) } void -unknown_arg_warning(int d_lineno, const char *dlr_opt, const char *d_arg, const char - *d_line, const char *d_cptr) +unknown_arg_warning(int d_lineno, const char *dlr_opt, + const char *d_arg, + const char *d_line, + const char *d_cptr) { fprintf(stderr, "%s: w - line %d of \"%s\", unknown argument %s%s\n", myname, d_lineno, input_file_name, dlr_opt, d_arg); @@ -379,7 +397,7 @@ wrong_number_args_warning(const char *which, const char *a_name) } void -wrong_type_for_arg_warning(int i, char *a_name) +wrong_type_for_arg_warning(int i, const char *a_name) { fprintf(stderr, "%s: w - line %d of \"%s\", wrong type for default argument %d to %s\n", @@ -388,7 +406,7 @@ wrong_type_for_arg_warning(int i, char *a_name) } void -start_requires_args(char *a_name) +start_requires_args(const char *a_name) { fprintf(stderr, "%s: w - line %d of \"%s\", start symbol %s requires arguments\n", diff --git a/makefile.in b/makefile.in index 62d4eb7..7092b87 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.25 2022/11/06 21:03:11 tom Exp $ +# $Id: makefile.in,v 1.26 2023/05/19 23:16:31 tom Exp $ # # UNIX template-makefile for Berkeley Yacc @@ -99,7 +99,7 @@ all : $(THIS)$x install: all installdirs $(INSTALL_PROGRAM) $(THIS)$x $(bindir)/$(actual_bin) - - $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(mandir)/$(actual_man) + @ $(SHELL) ./install-man $(srcdir)/$(THIS).1 $(mandir)/$(actual_man) installdirs: mkdir -p $(bindir) @@ -107,7 +107,7 @@ installdirs: uninstall: - rm -f $(bindir)/$(actual_bin) - - rm -f $(mandir)/$(actual_man) + @ $(SHELL) ./install-man $(mandir)/$(actual_man) ################################################################################ .SUFFIXES : .c $o .i .skel @@ -135,7 +135,7 @@ clean :: mostlyclean - rm -f $(THIS)$x distclean :: clean - - rm -f config.log config.cache config.status config.h makefile man2html.tmp + - rm -f config.log config.cache config.status config.h makefile man2html.tmp install-man* - rm -f $(testdir)/yacc/test-* $(testdir)/btyacc/test-* realclean :: distclean diff --git a/output.c b/output.c index cd2f5aa..fa9689b 100644 --- a/output.c +++ b/output.c @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.100 2022/01/09 18:03:56 tom Exp $ */ +/* $Id: output.c,v 1.101 2023/05/16 21:19:48 tom Exp $ */ #include "defs.h" @@ -1623,21 +1623,14 @@ output_pure_parser(FILE * fp) if (fp == code_file) ++outline; fprintf(fp, "#define YYPURE %d\n", pure_parser); - putc_code(fp, '\n'); -} - #if defined(YY_NO_LEAKS) -static void -output_no_leaks(FILE * fp) -{ - putc_code(fp, '\n'); - if (fp == code_file) ++outline; fputs("#define YY_NO_LEAKS 1\n", fp); +#else putc_code(fp, '\n'); -} #endif +} static void output_trailing_text(void) @@ -2092,9 +2085,6 @@ output(void) output_prefix(fp); output_pure_parser(fp); -#if defined(YY_NO_LEAKS) - output_no_leaks(fp); -#endif output_stored_text(fp); output_stype(fp); #if defined(YYBTYACC) diff --git a/package/byacc.spec b/package/byacc.spec index 058911a..6cba6ee 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,12 +1,12 @@ Summary: public domain Berkeley LALR Yacc parser generator %global AppVersion 2.0 -%global AppPatched 20230515 +%global AppPatched 20230521 %global AltProgram byacc2 %global UseProgram yacc -# $Id: byacc.spec,v 1.73 2023/05/15 23:34:59 tom Exp $ +# $Id: byacc.spec,v 1.74 2023/05/21 19:59:32 tom Exp $ Name: byacc Version: %{AppVersion}.%{AppPatched} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index 119923d..27be116 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -byacc (1:2.0.20230515) unstable; urgency=low +byacc (1:2.0.20230521) unstable; urgency=low * maintenance updates diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index 59888e8..aa65a71 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,11 +1,11 @@ Summary: public domain Berkeley LALR Yacc parser generator %global AppVersion 2.0 -%global AppPatched 20230515 +%global AppPatched 20230521 %global UseProgram yacc -# $Id: mingw-byacc.spec,v 1.50 2023/05/15 23:34:59 tom Exp $ +# $Id: mingw-byacc.spec,v 1.51 2023/05/21 19:59:32 tom Exp $ Name: byacc Version: %{AppVersion}.%{AppPatched} Release: 1 diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index 22efa46..f080fac 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $ # -DISTNAME= byacc-20230515 +DISTNAME= byacc-20230521 CATEGORIES= devel MASTER_SITES= https://invisible-mirror.net/archives/byacc/ DIST_SUBDIR= byacc-20220101 diff --git a/reader.c b/reader.c index bc8747a..49e90de 100644 --- a/reader.c +++ b/reader.c @@ -1,4 +1,4 @@ -/* $Id: reader.c,v 1.96 2023/05/15 23:34:53 tom Exp $ */ +/* $Id: reader.c,v 1.104 2023/05/18 21:18:17 tom Exp $ */ #include "defs.h" @@ -32,6 +32,17 @@ fprintf_lineno(f, 1, ""); \ fprintf(f, "break;\n") +#define begin_ainfo(data, offset) do { \ + data.a_lineno = lineno; \ + data.a_line = dup_line(); \ + data.a_cptr = data.a_line + (cptr - line - offset); \ + } while (0) + +#define end_ainfo(data) do { \ + FREE(data.a_line); \ + memset(&data, 0, sizeof(data)); \ + } while (0) + static void start_rule(bucket *bp, int s_lineno); #if defined(YYBTYACC) static void copy_initial_action(void); @@ -52,7 +63,7 @@ char unionized; char *line; /* current input-line */ char *cptr; /* position within current input-line */ -static int linesize; /* length of current input-line */ +static size_t linesize; /* length of current input-line */ typedef struct { @@ -290,7 +301,7 @@ save_line(void) if (!must_save) { must_save = 1; - save_area.line_used = (cptr - line); + save_area.line_used = (size_t)(cptr - line); } } @@ -323,7 +334,7 @@ get_line(void) if (must_save > 0) { save_area.line_data = TMALLOC(char, linesize); - save_area.line_used = (cptr - line); + save_area.line_used = (size_t)(cptr - line); save_area.line_size = linesize; NO_SPACE(save_area.line_data); memcpy(save_area.line_data, line, linesize); @@ -335,7 +346,7 @@ get_line(void) do { int c; - int i; + size_t i; if (saw_eof || (c = getc(f)) == EOF) { @@ -411,9 +422,8 @@ skip_comment(void) { char *s; struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line); + + begin_ainfo(a, 0); s = cptr + 2; for (;;) @@ -421,7 +431,7 @@ skip_comment(void) if (*s == '*' && s[1] == '/') { cptr = s + 2; - FREE(a.a_line); + end_ainfo(a); return; } if (*s == '\n') @@ -523,6 +533,7 @@ keywords[] = { { "binary", NONASSOC }, { "code", XCODE }, { "debug", NONPOSIX_DEBUG }, + { "define", HACK_DEFINE }, #if defined(YYBTYACC) { "destructor", DESTRUCTOR }, #endif @@ -539,6 +550,7 @@ keywords[] = { { "locations", LOCATIONS }, #endif { "nonassoc", NONASSOC }, + { "nterm", TYPE }, { "parse-param", PARSE_PARAM }, { "pure-parser", PURE_PARSER }, { "right", RIGHT }, @@ -661,9 +673,8 @@ copy_string(int quote) { struct mstring *temp = msnew(); struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line - 1); + + begin_ainfo(a, 1); for (;;) { @@ -672,7 +683,7 @@ copy_string(int quote) mputc(temp, c); if (c == quote) { - FREE(a.a_line); + end_ainfo(a); return msdone(temp); } if (c == '\n') @@ -713,9 +724,8 @@ copy_comment(void) else if (c == '*') { struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line - 1); + + begin_ainfo(a, 1); mputc(temp, c); ++cptr; @@ -727,7 +737,7 @@ copy_comment(void) { mputc(temp, '/'); ++cptr; - FREE(a.a_line); + end_ainfo(a); return msdone(temp); } if (c == '\n') @@ -880,9 +890,8 @@ copy_text(void) FILE *f = text_file; int need_newline = 0; struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line - 2); + + begin_ainfo(a, 2); if (*cptr == '\n') { @@ -932,7 +941,7 @@ copy_text(void) if (need_newline) putc('\n', f); ++cptr; - FREE(a.a_line); + end_ainfo(a); return; } /* FALLTHRU */ @@ -975,9 +984,10 @@ copy_union(void) size_t filler_len = 0; int in_prefix = 1; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line - 6); + prefix_buf[0] = '\0'; + filler_buf[0] = '\0'; + + begin_ainfo(a, 6); if (unionized) over_unionized(cptr - 6); @@ -1059,7 +1069,7 @@ copy_union(void) puts_both(" YYSTYPE;\n"); } puts_both("#endif /* !YYSTYPE_IS_DECLARED */\n"); - FREE(a.a_line); + end_ainfo(a); return; } goto loop; @@ -1426,9 +1436,8 @@ get_literal(void) char *s; bucket *bp; struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line); + + begin_ainfo(a, 0); quote = *cptr++; cinc = 0; @@ -1521,7 +1530,7 @@ get_literal(void) } cachec(c); } - FREE(a.a_line); + end_ainfo(a); n = cinc; s = TMALLOC(char, n); @@ -1888,6 +1897,82 @@ declare_argtypes(bucket *bp) } #endif +static int +scan_blanks(void) +{ + int c; + + do + { + c = next_inline(); + if (c == '\n') + { + ++cptr; + return 0; + } + else if (c == ' ' || c == '\t') + ++cptr; + else + break; + } + while (c == ' ' || c == '\t'); + + return 1; +} + +static int +scan_ident(void) +{ + int c; + + cinc = 0; + for (c = *cptr; IS_IDENT(c); c = *++cptr) + cachec(c); + cachec(NUL); + + return cinc; +} + +static void +hack_defines(void) +{ + struct ainfo a; + + if (!scan_blanks()) + return; + + begin_ainfo(a, 0); + if (!scan_ident()) + { + end_ainfo(a); + } + + if (!strcmp(cache, "api.pure")) + { + end_ainfo(a); + scan_blanks(); + begin_ainfo(a, 0); + scan_ident(); + + if (!strcmp(cache, "false")) + pure_parser = 0; + else if (!strcmp(cache, "true") + || !strcmp(cache, "full") + || *cache == 0) + pure_parser = 1; + else + unexpected_value(&a); + end_ainfo(a); + } + else + { + unexpected_value(&a); + } + + while (next_inline() != '\n') + ++cptr; +} + static void declare_types(void) { @@ -2046,6 +2131,10 @@ read_declarations(void) tflag = 1; break; + case HACK_DEFINE: + hack_defines(); + break; + case POSIX_YACC: /* noop for bison compatibility. byacc is already designed to be posix * yacc compatible. */ @@ -2129,9 +2218,7 @@ copy_args(int *alen) char c, quote = 0; struct ainfo a; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line - 1); + begin_ainfo(a, 1); while ((c = *cptr++) != R_PAREN || depth || quote) { @@ -2175,7 +2262,7 @@ copy_args(int *alen) } if (alen) *alen = len; - FREE(a.a_line); + end_ainfo(a); return msdone(s); } @@ -2827,9 +2914,7 @@ copy_action(void) Value_t *offsets = NULL, maxoffset; bucket **rhs; - a.a_lineno = lineno; - a.a_line = dup_line(); - a.a_cptr = a.a_line + (cptr - line); + begin_ainfo(a, 0); if (last_was_action) insert_empty_rule(); @@ -3023,10 +3108,8 @@ copy_action(void) { if (!locations) { - int l_lineno = lineno; - char *l_line = dup_line(); - char *l_cptr = l_line + (cptr - line); - syntax_error(l_lineno, l_line, l_cptr); + dislocations_warning(); + locations = 1; } if (cptr[1] == '$') { @@ -3095,7 +3178,7 @@ copy_action(void) goto loop; } end_case(f); - FREE(a.a_line); + end_ainfo(a); if (maxoffset > 0) FREE(offsets); return; @@ -3115,7 +3198,7 @@ copy_action(void) if (depth > 0) goto loop; end_case(f); - free(a.a_line); + end_ainfo(a); if (maxoffset > 0) FREE(offsets); return; @@ -3157,7 +3240,7 @@ copy_action(void) } #endif end_case(f); - free(a.a_line); + end_ainfo(a); if (maxoffset > 0) FREE(offsets); return; @@ -3203,9 +3286,7 @@ get_code(struct ainfo *a, const char *loc) else syntax_error(lineno, line, cptr); - a->a_lineno = lineno; - a->a_line = dup_line(); - a->a_cptr = a->a_line + (cptr - line); + begin_ainfo((*a), 0); depth = 0; loop: @@ -3243,10 +3324,8 @@ get_code(struct ainfo *a, const char *loc) { if (!locations) { - int l_lineno = lineno; - char *l_line = dup_line(); - char *l_cptr = l_line + (cptr - line); - syntax_error(l_lineno, l_line, l_cptr); + dislocations_warning(); + locations = 1; } msprintf(code_mstr, "%s", loc); cptr += 2; @@ -3311,7 +3390,7 @@ copy_initial_action(void) struct ainfo a; initial_action = get_code(&a, "yyloc"); - free(a.a_line); + end_ainfo(a); } static void @@ -3393,7 +3472,7 @@ copy_destructor(void) else break; } - free(a.a_line); + end_ainfo(a); free(code_text); }