diff --git a/MANIFEST b/MANIFEST index 32adf3a..758066f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for mawk, version t20091213i +MANIFEST for mawk, version t20091213j -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGMENT acknowledgements diff --git a/aclocal.m4 b/aclocal.m4 index 9f40e79..6f0e73f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $MawkId: aclocal.m4,v 1.40 2009/12/19 18:19:46 tom Exp $ +dnl $MawkId: aclocal.m4,v 1.43 2009/12/20 17:51:48 tom Exp $ dnl custom mawk macros for autoconf dnl dnl The symbols beginning "CF_MAWK_" were originally written by Mike Brennan, @@ -838,12 +838,12 @@ int main() return 0 ; }]])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAWK_RUN_FPE_TESTS version: 10 updated: 2009/12/19 13:18:53 +dnl CF_MAWK_RUN_FPE_TESTS version: 11 updated: 2009/12/20 12:50:49 dnl --------------------- dnl These are mawk's dreaded FPE tests. AC_DEFUN([CF_MAWK_RUN_FPE_TESTS], [ -AC_CHECK_FUNCS(isnan nanf sigaction) +AC_CHECK_FUNCS(isnan sigaction) test "$ac_cv_func_sigaction" = yes && sigaction=1 AC_CHECK_HEADERS(siginfo.h) @@ -930,6 +930,11 @@ case $cf_status in rm -f conftest$ac_exeext CPPFLAGS="$CPPFLAGS -DUSE_IEEEFP_H" + + cat >conftest.$ac_ext < +CF_EOF + if AC_TRY_EVAL(ac_link); then echo "FPE_CHECK 3:check_strtod_ovf" >&AC_FD_CC if ./conftest phoney_arg phoney_arg 2>/dev/null @@ -939,6 +944,8 @@ case $cf_status in AC_MSG_RESULT([buggy -- will use work around]) AC_DEFINE_UNQUOTED([HAVE_STRTOD_OVF_BUG],1) fi + else + AC_MSG_RESULT([$cf_FPE_SRCS failed to compile]) fi else if test $cf_status != 4 ; then diff --git a/config_h.in b/config_h.in index 8629a45..3279a1c 100644 --- a/config_h.in +++ b/config_h.in @@ -1,5 +1,5 @@ /* - * $MawkId: config_h.in,v 1.13 2009/12/19 16:36:24 tom Exp $ + * $MawkId: config_h.in,v 1.15 2009/12/20 17:31:58 tom Exp $ * vile:cmode * template for config.h */ @@ -13,6 +13,7 @@ #undef GCC_SCANFLIKE #undef GCC_UNUSED #undef HAVE_FORK +#undef HAVE_ISNAN #undef HAVE_PIPE #undef HAVE_REAL_PIPES #undef HAVE_REGEXPR_H_FUNCS diff --git a/configure b/configure index bc4f5f8..9fde2bb 100755 --- a/configure +++ b/configure @@ -4505,7 +4505,7 @@ done rm -f conftest.out fi -for ac_func in isnan nanf sigaction +for ac_func in isnan sigaction do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:4511: checking for $ac_func" >&5 @@ -5068,24 +5068,32 @@ echo $ECHO_N "checking strtod bug on overflow... $ECHO_C" >&6 rm -f conftest$ac_exeext CPPFLAGS="$CPPFLAGS -DUSE_IEEEFP_H" - if { (eval echo "$as_me:5071: \"$ac_link\"") >&5 + + cat >conftest.$ac_ext < +CF_EOF + + if { (eval echo "$as_me:5076: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5074: \$? = $ac_status" >&5 + echo "$as_me:5079: \$? = $ac_status" >&5 (exit $ac_status); }; then echo "FPE_CHECK 3:check_strtod_ovf" >&5 if ./conftest phoney_arg phoney_arg 2>/dev/null then - echo "$as_me:5079: result: no bug" >&5 + echo "$as_me:5084: result: no bug" >&5 echo "${ECHO_T}no bug" >&6 else - echo "$as_me:5082: result: buggy -- will use work around" >&5 + echo "$as_me:5087: result: buggy -- will use work around" >&5 echo "${ECHO_T}buggy -- will use work around" >&6 cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_FPE_SRCS failed to compile" >&6 fi else if test $cf_status != 4 ; then @@ -5095,13 +5103,13 @@ EOF if test "x$cf_cv_use_sv_siginfo" = "xno" then - echo "$as_me:5098: checking for sigvec" >&5 + echo "$as_me:5106: checking for sigvec" >&5 echo $ECHO_N "checking for sigvec... $ECHO_C" >&6 if test "${ac_cv_func_sigvec+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5104 "configure" +#line 5112 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sigvec (); below. */ @@ -5132,16 +5140,16 @@ f = sigvec; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5135: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5143: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5138: \$? = $ac_status" >&5 + echo "$as_me:5146: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5141: \"$ac_try\"") >&5 + { (eval echo "$as_me:5149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5144: \$? = $ac_status" >&5 + echo "$as_me:5152: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_sigvec=yes else @@ -5151,7 +5159,7 @@ ac_cv_func_sigvec=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5154: result: $ac_cv_func_sigvec" >&5 +echo "$as_me:5162: result: $ac_cv_func_sigvec" >&5 echo "${ECHO_T}$ac_cv_func_sigvec" >&6 if test $ac_cv_func_sigvec = yes; then cf_have_sigvec=1 @@ -5296,7 +5304,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:5299: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:5307: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -5469,7 +5477,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:5472: error: ambiguous option: $1 + { { echo "$as_me:5480: 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;} @@ -5488,7 +5496,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:5491: error: unrecognized option: $1 + -*) { { echo "$as_me:5499: 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;} @@ -5525,7 +5533,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:5528: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:5536: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -5749,7 +5757,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:5752: creating $ac_file" >&5 + { echo "$as_me:5760: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5767,7 +5775,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:5770: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5778: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5780,7 +5788,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5783: error: cannot find input file: $f" >&5 + { { echo "$as_me:5791: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5846,7 +5854,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:5849: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:5857: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -5857,7 +5865,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:5860: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5868: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5870,7 +5878,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5873: error: cannot find input file: $f" >&5 + { { echo "$as_me:5881: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5988,7 +5996,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:5991: $ac_file is unchanged" >&5 + { echo "$as_me:5999: $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/fpe_check.c b/fpe_check.c index 69d3331..0624b07 100644 --- a/fpe_check.c +++ b/fpe_check.c @@ -3,7 +3,7 @@ */ /* - * $MawkId: fpe_check.c,v 1.12 2009/12/18 10:36:19 tom Exp $ + * $MawkId: fpe_check.c,v 1.13 2009/12/20 17:33:18 tom Exp $ * @Log: fpe_check.c,v @ * Revision 1.7 1996/08/30 00:07:14 mike * Modifications to the test and implementation of the bug fix for @@ -112,11 +112,7 @@ check_fpe_traps(void) if (traps == 0) { double maybe_nan; -#ifdef HAVE_NANF - maybe_nan = nanf("NAN"); -#else - maybe_nan = log(-8.0); -#endif + maybe_nan = sqrt(-8.0); if (is_nan(maybe_nan)) { message("math library supports ieee754"); } else {