From 67ea6645053c80c6eea47a4ff6d9153da83ac2ac Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 16 Jul 2022 22:47:30 +0000 Subject: [PATCH] ncurses 6.3 - patch 20220716 + build-fix for test_mouse.c, for non-standard cfmakeraw. + improve shell-scripts with shellcheck + fix typo in run_tic.in (report/patch by Jan Starke). --- Ada95/gen/adacurses-config.in | 12 +- Ada95/include/MKncurses_def.sh | 6 +- Ada95/src/library-cfg.sh | 10 +- NEWS | 7 +- VERSION | 2 +- c++/edit_cfg.sh | 20 +- dist.mk | 4 +- include/MKkey_defs.sh | 6 +- include/MKncurses_def.sh | 6 +- include/edit_cfg.sh | 14 +- man/MKterminfo.sh | 14 +- man/Makefile.in | 6 +- man/make_sed.sh | 18 +- man/user_caps.5 | 4 +- misc/gen-pkgconfig.in | 6 +- misc/ncurses-config.in | 20 +- misc/run_tic.in | 43 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- progs/capconvert | 40 +- test/configure | 981 ++++++++++++++++--------------- test/configure.in | 3 +- test/listused.sh | 30 +- test/savescreen.sh | 6 +- test/test.priv.h | 38 +- test/test_mouse.c | 15 +- 31 files changed, 684 insertions(+), 649 deletions(-) diff --git a/Ada95/gen/adacurses-config.in b/Ada95/gen/adacurses-config.in index 2b055dc5..a5394170 100644 --- a/Ada95/gen/adacurses-config.in +++ b/Ada95/gen/adacurses-config.in @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: adacurses-config.in,v 1.14 2020/02/02 23:34:34 tom Exp $ +# $Id: adacurses-config.in,v 1.15 2022/07/16 21:16:43 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2022 Thomas E. Dickey # # Copyright 2007-2014,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -45,17 +45,17 @@ CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS" LIBS="-L$ADA_OBJECTS -l@ADA_LIBNAME@" THIS="@ADA_LIBNAME@" -THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config" +THIS_CFG="${THIS}@DFT_ARG_SUFFIX@-config" case "x$1" in x--version) echo @ADA_LIBNAME@ $VERSION ;; x--cflags) - echo $CFLAGS + echo "$CFLAGS" ;; x--libs) - echo $LIBS + echo "$LIBS" ;; x) # if no parameter is given, give what gnatmake needs @@ -77,7 +77,7 @@ If no options are given, echos the full set of flags needed by gnatmake. ENDHELP ;; *) - echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2 + echo "Usage: ${THIS_CFG} [--version | --cflags | --libs]" >&2 exit 1 ;; esac diff --git a/Ada95/include/MKncurses_def.sh b/Ada95/include/MKncurses_def.sh index 4b2ae416..9d802441 100755 --- a/Ada95/include/MKncurses_def.sh +++ b/Ada95/include/MKncurses_def.sh @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: MKncurses_def.sh,v 1.4 2020/02/02 23:34:34 tom Exp $ +# $Id: MKncurses_def.sh,v 1.5 2022/07/16 17:03:59 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2022 Thomas E. Dickey # # Copyright 2003 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -56,7 +56,7 @@ cat <$SCRIPT <&1 >/dev/null) + rm -f "$2".bak + mv "$2" "$2".bak + if ( grep "[ ]${name}[ ]1" "$1" >/dev/null 2>&1) then value=1 - sed -e 's/define '$name'.*$/define '$name' 1/' $2.bak >$2 + sed -e 's/define '"$name"'.*$/define '"$name"' 1/' "$2".bak >"$2" else value=0 - sed -e 's/define '$name'.*$/define '$name' 0/' $2.bak >$2 + sed -e 's/define '"$name"'.*$/define '"$name"' 0/' "$2".bak >"$2" fi - if (cmp -s $2 $2.bak) + if (cmp -s "$2" "$2".bak) then echo '... '$name $value - mv $2.bak $2 + mv "$2".bak "$2" else echo '... '$name $value - rm -f $2.bak + rm -f "$2".bak fi done diff --git a/dist.mk b/dist.mk index 78bec51b..0f350b28 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1491 2022/07/09 12:55:00 tom Exp $ +# $Id: dist.mk,v 1.1492 2022/07/16 10:45:29 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20220709 +NCURSES_PATCH = 20220716 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/MKkey_defs.sh b/include/MKkey_defs.sh index c3deb920..36057002 100755 --- a/include/MKkey_defs.sh +++ b/include/MKkey_defs.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: MKkey_defs.sh,v 1.22 2022/02/05 20:38:31 tom Exp $ +# $Id: MKkey_defs.sh,v 1.23 2022/07/16 16:54:02 tom Exp $ ############################################################################## # Copyright 2019-2020,2022 Thomas E. Dickey # # Copyright 2001-2013,2017 Free Software Foundation, Inc. # @@ -35,7 +35,7 @@ # # Extract function-key definitions from the Caps file # -: ${AWK-awk} +: "${AWK-awk}" test $# = 0 && set Caps @@ -67,7 +67,7 @@ cat >>$data <&1 >$TMP ) + mv "$2" "$BAK" + if ( grep "[ ]${name}[ ]" "$1" >$TMP 2>&1 ) then value=1 else @@ -59,11 +59,11 @@ do -e "s@#define ${name}.*\$@#define $name $value@" \ -e "s@#if $name\$@#if $value /* $name */@" \ -e "s@#if !$name\$@#if $value /* !$name */@" \ - $BAK >$2 - if (cmp -s $2 $BAK) + "$BAK" >"$2" + if (cmp -s "$2" "$BAK") then - mv $BAK $2 + mv "$BAK" "$2" else - rm -f $BAK + rm -f "$BAK" fi done diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh index c79dbd8f..323c525f 100755 --- a/man/MKterminfo.sh +++ b/man/MKterminfo.sh @@ -1,10 +1,10 @@ #!/bin/sh -# $Id: MKterminfo.sh,v 1.18 2020/02/02 23:34:34 tom Exp $ +# $Id: MKterminfo.sh,v 1.19 2022/07/16 17:55:20 tom Exp $ # # MKterminfo.sh -- generate terminfo.5 from Caps tabular data # #*************************************************************************** -# Copyright 2018-2019,2020 Thomas E. Dickey * +# Copyright 2018-2020,2022 Thomas E. Dickey * # Copyright 1998-2003,2017 Free Software Foundation, Inc. * # * # Permission is hereby granted, free of charge, to any person obtaining a * @@ -50,7 +50,7 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi # -head=$1 +head="$1" shift 1 caps= while test $# -gt 1 @@ -58,7 +58,7 @@ do caps="$caps $1" shift 1 done -tail=$1 +tail="$1" cat <../edit_man.sed distclean realclean: clean diff --git a/man/make_sed.sh b/man/make_sed.sh index 0b794f86..a0fdb058 100755 --- a/man/make_sed.sh +++ b/man/make_sed.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: make_sed.sh,v 1.14 2022/02/05 20:38:54 tom Exp $ +# $Id: make_sed.sh,v 1.15 2022/07/16 20:20:00 tom Exp $ ############################################################################## # Copyright 2020-2021,2022 Thomas E. Dickey # # Copyright 1998-2005,2017 Free Software Foundation, Inc. # @@ -48,7 +48,7 @@ RESULT=result$$ rm -f $UPPER $SCRIPT $RESULT trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT; exit 1" 1 2 3 15 trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0 -fgrep -v \# $1 | \ +fgrep -v \# "$1" | \ sed -e 's/[ ][ ]*/ /g' >$INPUT for F in 1 2 3 4 @@ -65,27 +65,29 @@ paste $COL.* | \ sed -e 's/^/s\/\\$UPPER -echo "# Do the TH lines" >>$RESULT +{ +echo "# Do the TH lines" sed -e 's/\//\/TH /' \ -e 's/ / /' \ -e 's/ / ""\/TH /' \ -e 's/ / /' \ -e 's/\/$/ ""\//' \ - $UPPER >>$RESULT + $UPPER -echo "# Do the embedded references" >>$RESULT +echo "# Do the embedded references" sed -e 's/>$RESULT + $UPPER -echo "# Do the \fBxxx\fP references in the .NAME section" >>$RESULT +echo '# Do the \\fBxxx\\fP references in the .NAME section' sed -e 's/\\>$RESULT + $UPPER +} >>$RESULT # Finally, send the result to standard output cat $RESULT diff --git a/man/user_caps.5 b/man/user_caps.5 index f0b100a4..b43e218f 100644 --- a/man/user_caps.5 +++ b/man/user_caps.5 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2018-2020,2021 Thomas E. Dickey * +.\" Copyright 2018-2021,2022 Thomas E. Dickey * .\" Copyright 2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: user_caps.5,v 1.21 2022/07/03 20:01:04 tom Exp $ +.\" $Id: user_caps.5,v 1.22 2022/07/03 20:01:04 tom Exp $ .TH user_caps 5 .ie \n(.g .ds `` \(lq .el .ds `` `` diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index a45dd54f..fa095471 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.52 2021/08/07 21:36:33 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.53 2022/07/16 17:07:38 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2021,2022 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -219,7 +219,7 @@ do echo "** creating ${name}${suffix}.pc" cat >${name}${suffix}.pc <&2 + @SHELL@ "$0" --help 1>&2 exit 1 ;; esac diff --git a/misc/run_tic.in b/misc/run_tic.in index b335b48e..bd11c4c8 100644 --- a/misc/run_tic.in +++ b/misc/run_tic.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: run_tic.in,v 1.38 2020/02/15 15:30:53 tom Exp $ +# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2022 Thomas E. Dickey # # Copyright 2000-2012,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -42,21 +42,20 @@ echo "** Building terminfo database, please wait..." # The script is designed to be run from the misc/Makefile as # make install.data -: ${suffix:=@EXEEXT@} -: ${DESTDIR:=@DESTDIR@} -: ${prefix:=@prefix@} -: ${exec_prefix:=@exec_prefix@} -: ${bindir:=@bindir@} -: ${top_srcdir:=@top_srcdir@} -: ${srcdir:=@srcdir@} -: ${datarootdir:=@datarootdir@} -: ${datadir:=@datadir@} -: ${TIC_PATH:=@TIC@} -: ${ticdir:=@TERMINFO@} -: ${source:=@TERMINFO_SRC@} -: ${LN_S:="@LN_S@"} -: ${cross_compiling:=no} -: ${ext_funcs:=@NCURSES_EXT_FUNCS@} +: "${suffix:=@EXEEXT@}" +: "${DESTDIR:=@DESTDIR@}" +: "${prefix:=@prefix@}" +: "${exec_prefix:=@exec_prefix@}" +: "${bindir:=@bindir@}" +: "${top_srcdir:=@top_srcdir@}" +: "${srcdir:=@srcdir@}" +: "${datarootdir:=@datarootdir@}" +: "${datadir:=@datadir@}" +: "${TIC_PATH:=@TIC@}" +: "${ticdir:=@TERMINFO@}" +: "${source:=@TERMINFO_SRC@}" +: "${cross_compiling:=no}" +: "${ext_funcs:=@NCURSES_EXT_FUNCS@}" test -z "${DESTDIR}" && DESTDIR= @@ -118,7 +117,7 @@ TICDIR=`echo "$TERMINFO" | sed -e 's%/share/\([^/]*\)$%/lib/\1%'` PARENT=`echo "$TERMINFO" | sed -e 's%/[^/]*$%%'` if test -n "$PARENT" then - test -d $PARENT || mkdir -p $PARENT + mkdir -p "$PARENT" fi # Remove the old terminfo stuff; we don't care if it existed before, and it @@ -127,7 +126,7 @@ fi # the directory is actually a symbolic link. if test -d "$TERMINFO" then - ( cd "$TERMINFO" && rm -fr ? 2>/dev/null ) + ( cd "$TERMINFO" && rm -fr ./? 2>/dev/null ) elif test -f "$TERMINFO.db" then ( rm -f "$TERMINFO.db" 2>/dev/null ) @@ -183,9 +182,9 @@ if test "$TICDIR" != "$TERMINFO" ; then ( rm -f "$TICDIR" 2>/dev/null ) if ( cd "$TICDIR" 2>/dev/null ) then - cd "$TICDIR" + cd "$TICDIR" || exit TICDIR=`pwd` - if test "$TICDIR "!= "$TERMINFO "; then + if test "$TICDIR " != "$TERMINFO "; then # Well, we tried. Some systems lie to us, so the # installer will have to double-check. echo "Verify if $TICDIR and $TERMINFO are the same." @@ -193,7 +192,7 @@ if test "$TICDIR" != "$TERMINFO" ; then echo "Otherwise, remove $TICDIR and link it to $TERMINFO." fi else - cd ${DESTDIR}$prefix + cd ${DESTDIR}$prefix || exit # Construct a symbolic link that only assumes $ticdir has the # same $prefix as the other installed directories. RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'` diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index e7d1eabd..49a5357f 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220709) unstable; urgency=low +ncurses6 (6.3+20220716) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 09 Jul 2022 08:55:00 -0400 + -- Thomas E. Dickey Sat, 16 Jul 2022 06:45:29 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index e7d1eabd..49a5357f 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220709) unstable; urgency=low +ncurses6 (6.3+20220716) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 09 Jul 2022 08:55:00 -0400 + -- Thomas E. Dickey Sat, 16 Jul 2022 06:45:29 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 2cd4ba60..6d2c769e 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220709) unstable; urgency=low +ncurses6 (6.3+20220716) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 09 Jul 2022 08:55:00 -0400 + -- Thomas E. Dickey Sat, 16 Jul 2022 06:45:29 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 3515f090..3bab9bae 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.531 2022/07/09 12:55:00 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.532 2022/07/16 10:45:29 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "0709" +!define VERSION_MMDD "0716" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 1b449e82..a1e162f4 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.3 -Release: 20220709 +Release: 20220716 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index ad7da53b..dac8d9ff 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20220709 +Release: 20220716 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index efc86cc9..e83ae9d6 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20220709 +Release: 20220716 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/capconvert b/progs/capconvert index ea76f312..4b5b321a 100755 --- a/progs/capconvert +++ b/progs/capconvert @@ -27,7 +27,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $ +# $Id: capconvert,v 1.12 2022/07/16 21:00:27 tom Exp $ # # capconvert -- automated conversion from termcap to terminfo # @@ -47,7 +47,7 @@ then echo "TERMINFO is already defined in your environment. This means" echo "you already have a local terminfo tree, so you do not need any" echo "conversion." - if test ! -d $TERMINFO ; then + if test ! -d "$TERMINFO" ; then echo "Caution: TERMINFO does not point to a directory!" fi exit; @@ -62,7 +62,7 @@ for p in $TERMINFO \ /usr/local/lib/terminfo \ /usr/local/share/terminfo do - if test -d $p ; then + if test -d "$p" ; then terminfo=yes break fi @@ -111,13 +111,13 @@ TIC= IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for x in $PATH . do - if test $OPT $x/tic + if test "$OPT" "$x"/tic then TIC=$x/tic break fi done -IFS="$ac_save_ifs" +IFS="$save_ifs" if test -n "$TIC" then @@ -140,7 +140,7 @@ echo ""; # # Make the user a terminfo directory -if test -d $HOME/.terminfo +if test -d "$HOME"/.terminfo then echo "It appears you already have a private terminfo directory" echo "at $HOME/.terminfo; this seems odd, because TERMINFO" @@ -150,7 +150,7 @@ then exit; else echo "I am creating your private terminfo directory at $HOME/.terminfo" - mkdir $HOME/.terminfo + mkdir "$HOME"/.terminfo # Ensure that that's where tic's compilation results. # This isn't strictly necessary with a 1.9.7 or later tic. TERMINFO="$HOME/.terminfo"; export TERMINFO @@ -165,8 +165,8 @@ then else # Ooops...looks like we're running from somewhere other than the # progs directory of an ncurses source tree. - master=`find $HOME -name "*terminfo.src" -print` - mcount=`echo $master | wc -l` + master=`find "$HOME" -name "*terminfo.src" -print` + mcount=`find "$HOME" -name "*terminfo.src" | wc -l` case $mcount in 0) echo "I can not find a terminfo source file anywhere under your home directory." @@ -184,12 +184,12 @@ else ;; 2) echo "I see more than one possible terminfo source. Here they are:" - echo $master | sed "/^/s// /"; + echo "$master" | sed "/^/s// /"; while : do echo "Please tell me which one to use:" read master; - if test -f $master + if test -f "$master" then break else @@ -206,13 +206,13 @@ echo "OK, now I will make your private terminfo tree. This may take a bit..." # # Kluge alert: we compile terminfo.src in two pieces because a lot of machines # with < 16MB RAM choke on tic's core-hog habits. -trap "rm -f tsplit$$.*; exit 1" 1 2 3 15 -trap "rm -f tsplit$$.*" 0 -sed -n $master \ +trap 'rm -f tsplit$$.*; exit 1' 1 2 3 15 +trap 'rm -f tsplit$$.*' 0 +sed -n "$master" \ -e '1,/SPLIT HERE/w 'tsplit$$.01 \ -e '/SPLIT HERE/,$w 'tsplit$$.02 \ 2>/dev/null -for x in tsplit$$.*; do eval $TIC $x; done +for x in tsplit$$.*; do eval $TIC "$x"; done rm tsplit$$.* trap EXIT INT QUIT TERM HUP # @@ -232,22 +232,22 @@ fi # we don't actually know what TERM will be nor even if it always has # the same value for this user) we do the following three steps... -if test -f $HOME/.termcap +if test -f "$HOME"/.termcap then - echo 'I see you have a $HOME/.termcap file. I will compile that.' - eval $TIC $HOME/.termcap + echo "I see you have a \$HOME/.termcap file. I will compile that." + eval $TIC "$HOME"/.termcap echo "Done." echo "Note that editing $HOME/.termcap will no longer change the data curses sees." elif test -f "$TERMCAP" then echo "Your TERMCAP names the file $TERMCAP. I will compile that." - eval $TIC $TERMCAP + eval $TIC "$TERMCAP" echo "Done." echo "Note that editing $TERMCAP will no longer change the data curses sees." else echo "Your TERMCAP value appears to be an entry in termcap format." echo "I will compile it." - echo $TERMCAP >myterm$$ + echo "$TERMCAP" >myterm$$ eval $TIC myterm$$ rm myterm$$ echo "Done." diff --git a/test/configure b/test/configure index 7e28d43e..d539d8af 100755 --- a/test/configure +++ b/test/configure @@ -18323,6 +18323,7 @@ EOF fi for ac_func in \ +cfmakeraw \ getopt \ gettimeofday \ snprintf \ @@ -18332,13 +18333,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18335: checking for $ac_func" >&5 +echo "$as_me:18336: 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 18341 "configure" +#line 18342 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18369,16 +18370,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18372: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18375: \$? = $ac_status" >&5 + echo "$as_me:18376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18378: \"$ac_try\"") >&5 + { (eval echo "$as_me:18379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18381: \$? = $ac_status" >&5 + echo "$as_me:18382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18388,7 +18389,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18391: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18392: 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:18403: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18409 "configure" +#line 18410 "configure" #include "confdefs.h" #include @@ -18427,16 +18428,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18430: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18431: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18433: \$? = $ac_status" >&5 + echo "$as_me:18434: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18436: \"$ac_try\"") >&5 + { (eval echo "$as_me:18437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18439: \$? = $ac_status" >&5 + echo "$as_me:18440: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else @@ -18446,7 +18447,7 @@ cf_cv_have_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18449: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:18450: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -18456,14 +18457,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18459: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:18460: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18466 "configure" +#line 18467 "configure" #include "confdefs.h" #include @@ -18484,16 +18485,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18487: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18490: \$? = $ac_status" >&5 + echo "$as_me:18491: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18493: \"$ac_try\"") >&5 + { (eval echo "$as_me:18494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18496: \$? = $ac_status" >&5 + echo "$as_me:18497: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -18503,7 +18504,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18506: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:18507: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -18513,7 +18514,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:18516: error: getopt is required for building programs" >&5 + { { echo "$as_me:18517: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -18532,13 +18533,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18535: checking for $ac_func" >&5 +echo "$as_me:18536: 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 18541 "configure" +#line 18542 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18569,16 +18570,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18572: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18575: \$? = $ac_status" >&5 + echo "$as_me:18576: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18578: \"$ac_try\"") >&5 + { (eval echo "$as_me:18579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18581: \$? = $ac_status" >&5 + echo "$as_me:18582: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18588,7 +18589,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18591: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18592: 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:18604: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18608,7 +18609,7 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 18611 "configure" +#line 18612 "configure" #include "confdefs.h" #include @@ -18640,16 +18641,16 @@ make an error /* prefer to fall-through on the second checks */ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18643: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18644: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18646: \$? = $ac_status" >&5 + echo "$as_me:18647: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18649: \"$ac_try\"") >&5 + { (eval echo "$as_me:18650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18652: \$? = $ac_status" >&5 + echo "$as_me:18653: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -18659,7 +18660,7 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 18662 "configure" +#line 18663 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -18684,16 +18685,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18687: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18688: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18690: \$? = $ac_status" >&5 + echo "$as_me:18691: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18693: \"$ac_try\"") >&5 + { (eval echo "$as_me:18694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18696: \$? = $ac_status" >&5 + echo "$as_me:18697: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -18707,7 +18708,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18710: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:18711: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -18719,7 +18720,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:18722: checking for term.h" >&5 +echo "$as_me:18723: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18740,7 +18741,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18743 "configure" +#line 18744 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18754,16 +18755,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18757: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18758: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18760: \$? = $ac_status" >&5 + echo "$as_me:18761: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18763: \"$ac_try\"") >&5 + { (eval echo "$as_me:18764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18766: \$? = $ac_status" >&5 + echo "$as_me:18767: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18782,7 +18783,7 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18785 "configure" +#line 18786 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18800,16 +18801,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18804: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18806: \$? = $ac_status" >&5 + echo "$as_me:18807: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18809: \"$ac_try\"") >&5 + { (eval echo "$as_me:18810: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18812: \$? = $ac_status" >&5 + echo "$as_me:18813: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18824,7 +18825,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:18827: result: $cf_cv_term_header" >&5 +echo "$as_me:18828: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -18851,7 +18852,7 @@ EOF ;; esac -echo "$as_me:18854: checking for unctrl.h" >&5 +echo "$as_me:18855: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18872,7 +18873,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18875 "configure" +#line 18876 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18886,16 +18887,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18892: \$? = $ac_status" >&5 + echo "$as_me:18893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18895: \"$ac_try\"") >&5 + { (eval echo "$as_me:18896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18898: \$? = $ac_status" >&5 + echo "$as_me:18899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -18908,12 +18909,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18911: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:18912: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:18916: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:18917: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -19006,10 +19007,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19009: checking for ${cf_func}" >&5 + echo "$as_me:19010: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19012: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19013: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19018,7 +19019,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19021 "configure" +#line 19022 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19051,16 +19052,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19054: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19055: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19057: \$? = $ac_status" >&5 + echo "$as_me:19058: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19060: \"$ac_try\"") >&5 + { (eval echo "$as_me:19061: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19063: \$? = $ac_status" >&5 + echo "$as_me:19064: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19076,7 +19077,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19079: result: $cf_result" >&5 + echo "$as_me:19080: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <&5 + echo "$as_me:19095: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19097: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19098: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19103,7 +19104,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19106 "configure" +#line 19107 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19136,16 +19137,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19139: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19142: \$? = $ac_status" >&5 + echo "$as_me:19143: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19145: \"$ac_try\"") >&5 + { (eval echo "$as_me:19146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19148: \$? = $ac_status" >&5 + echo "$as_me:19149: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19161,7 +19162,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19164: result: $cf_result" >&5 + echo "$as_me:19165: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 19188 "configure" +#line 19189 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19205,21 +19206,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19208: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19209: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19211: \$? = $ac_status" >&5 + echo "$as_me:19212: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19214: \"$ac_try\"") >&5 + { (eval echo "$as_me:19215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19217: \$? = $ac_status" >&5 + echo "$as_me:19218: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:19222: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:19223: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:19243: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19249 "configure" +#line 19250 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19261,16 +19262,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19264: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19265: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19267: \$? = $ac_status" >&5 + echo "$as_me:19268: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19270: \"$ac_try\"") >&5 + { (eval echo "$as_me:19271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19273: \$? = $ac_status" >&5 + echo "$as_me:19274: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -19278,7 +19279,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 19281 "configure" +#line 19282 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19303,16 +19304,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19309: \$? = $ac_status" >&5 + echo "$as_me:19310: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19312: \"$ac_try\"") >&5 + { (eval echo "$as_me:19313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19315: \$? = $ac_status" >&5 + echo "$as_me:19316: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -19326,7 +19327,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19329: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:19330: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -19340,11 +19341,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:19343: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:19344: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 19347 "configure" +#line 19348 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19357,16 +19358,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19360: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19363: \$? = $ac_status" >&5 + echo "$as_me:19364: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19366: \"$ac_try\"") >&5 + { (eval echo "$as_me:19367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19369: \$? = $ac_status" >&5 + echo "$as_me:19370: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19375,7 +19376,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 19378 "configure" +#line 19379 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19388,16 +19389,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19391: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19394: \$? = $ac_status" >&5 + echo "$as_me:19395: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19397: \"$ac_try\"") >&5 + { (eval echo "$as_me:19398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19400: \$? = $ac_status" >&5 + echo "$as_me:19401: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -19408,7 +19409,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_cppflags" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:19411: result: $cf_define_xpg5" >&5 + echo "$as_me:19412: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -19417,14 +19418,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:19420: checking for wide-character functions" >&5 + echo "$as_me:19421: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19427 "configure" +#line 19428 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19441,16 +19442,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19444: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19447: \$? = $ac_status" >&5 + echo "$as_me:19448: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19450: \"$ac_try\"") >&5 + { (eval echo "$as_me:19451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19453: \$? = $ac_status" >&5 + echo "$as_me:19454: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -19461,7 +19462,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19464: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:19465: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -19482,14 +19483,14 @@ EOF fi -echo "$as_me:19485: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:19486: checking if $cf_cv_screen library uses pthreads" >&5 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 if test "${cf_cv_use_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19492 "configure" +#line 19493 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19507,16 +19508,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19510: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19513: \$? = $ac_status" >&5 + echo "$as_me:19514: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19516: \"$ac_try\"") >&5 + { (eval echo "$as_me:19517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19519: \$? = $ac_status" >&5 + echo "$as_me:19520: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -19527,21 +19528,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19530: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:19531: result: $cf_cv_use_pthreads" >&5 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF -echo "$as_me:19537: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:19538: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19544 "configure" +#line 19545 "configure" #include "confdefs.h" #include @@ -19561,16 +19562,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19565: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19567: \$? = $ac_status" >&5 + echo "$as_me:19568: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19570: \"$ac_try\"") >&5 + { (eval echo "$as_me:19571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19573: \$? = $ac_status" >&5 + echo "$as_me:19574: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -19582,7 +19583,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19585: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:19586: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -19591,7 +19592,7 @@ EOF # special check for test/ditto.c -echo "$as_me:19594: checking for openpty in -lutil" >&5 +echo "$as_me:19595: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19599,7 +19600,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19602 "configure" +#line 19603 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19618,16 +19619,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19621: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19622: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19624: \$? = $ac_status" >&5 + echo "$as_me:19625: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19627: \"$ac_try\"") >&5 + { (eval echo "$as_me:19628: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19630: \$? = $ac_status" >&5 + echo "$as_me:19631: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -19638,7 +19639,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19641: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19642: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes @@ -19646,7 +19647,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19649: checking for openpty header" >&5 +echo "$as_me:19650: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19673,7 +19674,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19676 "configure" +#line 19677 "configure" #include "confdefs.h" #include <$cf_header> @@ -19690,16 +19691,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19693: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19694: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19696: \$? = $ac_status" >&5 + echo "$as_me:19697: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19699: \"$ac_try\"") >&5 + { (eval echo "$as_me:19700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19702: \$? = $ac_status" >&5 + echo "$as_me:19703: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -19717,7 +19718,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:19720: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19721: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19751,7 +19752,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19754: checking for function curses_version" >&5 +echo "$as_me:19755: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19761,7 +19762,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 19764 "configure" +#line 19765 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19774,15 +19775,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:19777: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19778: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19780: \$? = $ac_status" >&5 + echo "$as_me:19781: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:19782: \"$ac_try\"") >&5 + { (eval echo "$as_me:19783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19785: \$? = $ac_status" >&5 + echo "$as_me:19786: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -19797,14 +19798,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:19800: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:19801: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:19807: checking for alternate character set array" >&5 +echo "$as_me:19808: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19814,7 +19815,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >"conftest.$ac_ext" <<_ACEOF -#line 19817 "configure" +#line 19818 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19830,16 +19831,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19834: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19836: \$? = $ac_status" >&5 + echo "$as_me:19837: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19839: \"$ac_try\"") >&5 + { (eval echo "$as_me:19840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19842: \$? = $ac_status" >&5 + echo "$as_me:19843: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -19850,7 +19851,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19853: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:19854: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19860,7 +19861,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19863: checking for wide alternate character set array" >&5 +echo "$as_me:19864: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19870,7 +19871,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 19873 "configure" +#line 19874 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19886,16 +19887,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19889: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19890: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19892: \$? = $ac_status" >&5 + echo "$as_me:19893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19895: \"$ac_try\"") >&5 + { (eval echo "$as_me:19896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19898: \$? = $ac_status" >&5 + echo "$as_me:19899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -19906,7 +19907,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19909: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:19910: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19914,7 +19915,7 @@ cat >>confdefs.h <&5 +echo "$as_me:19918: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19924,7 +19925,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 19927 "configure" +#line 19928 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19941,16 +19942,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19944: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19945: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19947: \$? = $ac_status" >&5 + echo "$as_me:19948: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19950: \"$ac_try\"") >&5 + { (eval echo "$as_me:19951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19953: \$? = $ac_status" >&5 + echo "$as_me:19954: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19960,7 +19961,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 19963 "configure" +#line 19964 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19976,16 +19977,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19979: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19982: \$? = $ac_status" >&5 + echo "$as_me:19983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19985: \"$ac_try\"") >&5 + { (eval echo "$as_me:19986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19988: \$? = $ac_status" >&5 + echo "$as_me:19989: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19996,7 +19997,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:19999: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20000: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -20006,10 +20007,10 @@ EOF fi -echo "$as_me:20009: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20010: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20012 "configure" +#line 20013 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20027,16 +20028,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20031: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20033: \$? = $ac_status" >&5 + echo "$as_me:20034: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20036: \"$ac_try\"") >&5 + { (eval echo "$as_me:20037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20039: \$? = $ac_status" >&5 + echo "$as_me:20040: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20045,7 +20046,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20048: result: $cf_result" >&5 +echo "$as_me:20049: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20066,14 +20067,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:20069: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20070: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20076 "configure" +#line 20077 "configure" #include "confdefs.h" #include @@ -20091,23 +20092,23 @@ mbstate_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20095: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20097: \$? = $ac_status" >&5 + echo "$as_me:20098: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20100: \"$ac_try\"") >&5 + { (eval echo "$as_me:20101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20103: \$? = $ac_status" >&5 + echo "$as_me:20104: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20110 "configure" +#line 20111 "configure" #include "confdefs.h" #include @@ -20126,16 +20127,16 @@ mbstate_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20129: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20132: \$? = $ac_status" >&5 + echo "$as_me:20133: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20135: \"$ac_try\"") >&5 + { (eval echo "$as_me:20136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20138: \$? = $ac_status" >&5 + echo "$as_me:20139: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -20147,7 +20148,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20150: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:20151: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -20170,14 +20171,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:20173: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:20174: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20180 "configure" +#line 20181 "configure" #include "confdefs.h" #include @@ -20195,23 +20196,23 @@ wchar_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20198: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20201: \$? = $ac_status" >&5 + echo "$as_me:20202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20204: \"$ac_try\"") >&5 + { (eval echo "$as_me:20205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20207: \$? = $ac_status" >&5 + echo "$as_me:20208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20214 "configure" +#line 20215 "configure" #include "confdefs.h" #include @@ -20230,16 +20231,16 @@ wchar_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20233: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20236: \$? = $ac_status" >&5 + echo "$as_me:20237: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20239: \"$ac_try\"") >&5 + { (eval echo "$as_me:20240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20242: \$? = $ac_status" >&5 + echo "$as_me:20243: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -20251,7 +20252,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20254: result: $cf_cv_wchar_t" >&5 +echo "$as_me:20255: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -20274,14 +20275,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:20277: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:20278: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20284 "configure" +#line 20285 "configure" #include "confdefs.h" #include @@ -20299,23 +20300,23 @@ wint_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20305: \$? = $ac_status" >&5 + echo "$as_me:20306: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20308: \"$ac_try\"") >&5 + { (eval echo "$as_me:20309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20311: \$? = $ac_status" >&5 + echo "$as_me:20312: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20318 "configure" +#line 20319 "configure" #include "confdefs.h" #include @@ -20334,16 +20335,16 @@ wint_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20337: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20338: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20340: \$? = $ac_status" >&5 + echo "$as_me:20341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20343: \"$ac_try\"") >&5 + { (eval echo "$as_me:20344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20346: \$? = $ac_status" >&5 + echo "$as_me:20347: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -20355,7 +20356,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20358: result: $cf_cv_wint_t" >&5 +echo "$as_me:20359: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -20379,10 +20380,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:20382: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20383: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20385 "configure" +#line 20386 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20400,16 +20401,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20403: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20404: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20406: \$? = $ac_status" >&5 + echo "$as_me:20407: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20409: \"$ac_try\"") >&5 + { (eval echo "$as_me:20410: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20412: \$? = $ac_status" >&5 + echo "$as_me:20413: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20418,7 +20419,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20421: result: $cf_result" >&5 +echo "$as_me:20422: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20440,10 +20441,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:20443: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20444: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20446 "configure" +#line 20447 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20461,16 +20462,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20464: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20465: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20467: \$? = $ac_status" >&5 + echo "$as_me:20468: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20470: \"$ac_try\"") >&5 + { (eval echo "$as_me:20471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20473: \$? = $ac_status" >&5 + echo "$as_me:20474: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20479,7 +20480,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20482: result: $cf_result" >&5 +echo "$as_me:20483: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20501,10 +20502,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:20504: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20505: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20507 "configure" +#line 20508 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20522,16 +20523,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20526: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20528: \$? = $ac_status" >&5 + echo "$as_me:20529: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20531: \"$ac_try\"") >&5 + { (eval echo "$as_me:20532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20534: \$? = $ac_status" >&5 + echo "$as_me:20535: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20540,7 +20541,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20543: result: $cf_result" >&5 +echo "$as_me:20544: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20569,11 +20570,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:20572: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20573: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20576 "configure" +#line 20577 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20606,16 +20607,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20609: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20610: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20612: \$? = $ac_status" >&5 + echo "$as_me:20613: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20615: \"$ac_try\"") >&5 + { (eval echo "$as_me:20616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20618: \$? = $ac_status" >&5 + echo "$as_me:20619: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20625,7 +20626,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20628: result: $cf_result" >&5 +echo "$as_me:20629: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20637,14 +20638,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:20640: checking for data $cf_data in library" >&5 + echo "$as_me:20641: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >"conftest.$ac_ext" <<_ACEOF -#line 20647 "configure" +#line 20648 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20683,16 +20684,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20689: \$? = $ac_status" >&5 + echo "$as_me:20690: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20692: \"$ac_try\"") >&5 + { (eval echo "$as_me:20693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20695: \$? = $ac_status" >&5 + echo "$as_me:20696: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20704,7 +20705,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20707 "configure" +#line 20708 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20736,15 +20737,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20740: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20742: \$? = $ac_status" >&5 + echo "$as_me:20743: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20744: \"$ac_try\"") >&5 + { (eval echo "$as_me:20745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20747: \$? = $ac_status" >&5 + echo "$as_me:20748: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20756,7 +20757,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:20759: result: $cf_result" >&5 + echo "$as_me:20760: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20773,7 +20774,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:20776: checking for X" >&5 + echo "$as_me:20777: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -20877,17 +20878,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 20880 "configure" +#line 20881 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20884: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20885: \"$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:20890: \$? = $ac_status" >&5 + echo "$as_me:20891: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20920,7 +20921,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20923 "configure" +#line 20924 "configure" #include "confdefs.h" #include int @@ -20932,16 +20933,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20935: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20936: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20938: \$? = $ac_status" >&5 + echo "$as_me:20939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20941: \"$ac_try\"") >&5 + { (eval echo "$as_me:20942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20944: \$? = $ac_status" >&5 + echo "$as_me:20945: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -20979,7 +20980,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:20982: result: $have_x" >&5 + echo "$as_me:20983: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -20989,7 +20990,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:20992: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:20993: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21016,11 +21017,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21019: checking whether -R must be followed by a space" >&5 + echo "$as_me:21020: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21023 "configure" +#line 21024 "configure" #include "confdefs.h" int @@ -21032,16 +21033,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21036: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21038: \$? = $ac_status" >&5 + echo "$as_me:21039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21041: \"$ac_try\"") >&5 + { (eval echo "$as_me:21042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21044: \$? = $ac_status" >&5 + echo "$as_me:21045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -21051,13 +21052,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:21054: result: no" >&5 + echo "$as_me:21055: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21060 "configure" +#line 21061 "configure" #include "confdefs.h" int @@ -21069,16 +21070,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21073: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21075: \$? = $ac_status" >&5 + echo "$as_me:21076: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21078: \"$ac_try\"") >&5 + { (eval echo "$as_me:21079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21081: \$? = $ac_status" >&5 + echo "$as_me:21082: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -21088,11 +21089,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:21091: result: yes" >&5 + echo "$as_me:21092: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21095: result: neither works" >&5 + echo "$as_me:21096: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21112,7 +21113,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 21115 "configure" +#line 21116 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21131,22 +21132,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21137: \$? = $ac_status" >&5 + echo "$as_me:21138: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21140: \"$ac_try\"") >&5 + { (eval echo "$as_me:21141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21143: \$? = $ac_status" >&5 + echo "$as_me:21144: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21149: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:21150: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21154,7 +21155,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21157 "configure" +#line 21158 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21173,16 +21174,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21176: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21179: \$? = $ac_status" >&5 + echo "$as_me:21180: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21182: \"$ac_try\"") >&5 + { (eval echo "$as_me:21183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21185: \$? = $ac_status" >&5 + echo "$as_me:21186: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21193,14 +21194,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21197: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:21203: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21204: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21208,7 +21209,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21211 "configure" +#line 21212 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21227,16 +21228,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21230: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21231: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21233: \$? = $ac_status" >&5 + echo "$as_me:21234: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21236: \"$ac_try\"") >&5 + { (eval echo "$as_me:21237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21239: \$? = $ac_status" >&5 + echo "$as_me:21240: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21247,7 +21248,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21251: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -21266,13 +21267,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:21269: checking for gethostbyname" >&5 + echo "$as_me:21270: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21275 "configure" +#line 21276 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21303,16 +21304,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21309: \$? = $ac_status" >&5 + echo "$as_me:21310: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21312: \"$ac_try\"") >&5 + { (eval echo "$as_me:21313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21315: \$? = $ac_status" >&5 + echo "$as_me:21316: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -21322,11 +21323,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21325: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21326: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:21329: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21330: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21334,7 +21335,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21337 "configure" +#line 21338 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21353,16 +21354,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21356: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21357: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21359: \$? = $ac_status" >&5 + echo "$as_me:21360: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21362: \"$ac_try\"") >&5 + { (eval echo "$as_me:21363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21365: \$? = $ac_status" >&5 + echo "$as_me:21366: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21373,14 +21374,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21376: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:21377: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:21383: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:21384: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21388,7 +21389,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21391 "configure" +#line 21392 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21407,16 +21408,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21411: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21413: \$? = $ac_status" >&5 + echo "$as_me:21414: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21416: \"$ac_try\"") >&5 + { (eval echo "$as_me:21417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21419: \$? = $ac_status" >&5 + echo "$as_me:21420: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21427,7 +21428,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21430: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:21431: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -21443,13 +21444,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:21446: checking for connect" >&5 + echo "$as_me:21447: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21452 "configure" +#line 21453 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21480,16 +21481,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21484: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21486: \$? = $ac_status" >&5 + echo "$as_me:21487: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21489: \"$ac_try\"") >&5 + { (eval echo "$as_me:21490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21492: \$? = $ac_status" >&5 + echo "$as_me:21493: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -21499,11 +21500,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21502: result: $ac_cv_func_connect" >&5 +echo "$as_me:21503: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:21506: checking for connect in -lsocket" >&5 + echo "$as_me:21507: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21511,7 +21512,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21514 "configure" +#line 21515 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21530,16 +21531,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21533: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21534: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21536: \$? = $ac_status" >&5 + echo "$as_me:21537: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21539: \"$ac_try\"") >&5 + { (eval echo "$as_me:21540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21542: \$? = $ac_status" >&5 + echo "$as_me:21543: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -21550,7 +21551,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21553: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:21554: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -21559,13 +21560,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:21562: checking for remove" >&5 + echo "$as_me:21563: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21568 "configure" +#line 21569 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21596,16 +21597,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21599: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21600: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21602: \$? = $ac_status" >&5 + echo "$as_me:21603: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21605: \"$ac_try\"") >&5 + { (eval echo "$as_me:21606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21608: \$? = $ac_status" >&5 + echo "$as_me:21609: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -21615,11 +21616,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21618: result: $ac_cv_func_remove" >&5 +echo "$as_me:21619: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:21622: checking for remove in -lposix" >&5 + echo "$as_me:21623: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21627,7 +21628,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21630 "configure" +#line 21631 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21646,16 +21647,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21649: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21650: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21652: \$? = $ac_status" >&5 + echo "$as_me:21653: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21655: \"$ac_try\"") >&5 + { (eval echo "$as_me:21656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21658: \$? = $ac_status" >&5 + echo "$as_me:21659: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -21666,7 +21667,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21669: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:21670: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -21675,13 +21676,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:21678: checking for shmat" >&5 + echo "$as_me:21679: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21684 "configure" +#line 21685 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21712,16 +21713,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21718: \$? = $ac_status" >&5 + echo "$as_me:21719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21721: \"$ac_try\"") >&5 + { (eval echo "$as_me:21722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21724: \$? = $ac_status" >&5 + echo "$as_me:21725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -21731,11 +21732,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21734: result: $ac_cv_func_shmat" >&5 +echo "$as_me:21735: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:21738: checking for shmat in -lipc" >&5 + echo "$as_me:21739: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21743,7 +21744,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21746 "configure" +#line 21747 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21762,16 +21763,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21766: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21768: \$? = $ac_status" >&5 + echo "$as_me:21769: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21771: \"$ac_try\"") >&5 + { (eval echo "$as_me:21772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21774: \$? = $ac_status" >&5 + echo "$as_me:21775: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -21782,7 +21783,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21785: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:21786: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -21800,7 +21801,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:21803: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:21804: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21808,7 +21809,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21811 "configure" +#line 21812 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21827,16 +21828,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21831: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21833: \$? = $ac_status" >&5 + echo "$as_me:21834: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21836: \"$ac_try\"") >&5 + { (eval echo "$as_me:21837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21839: \$? = $ac_status" >&5 + echo "$as_me:21840: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -21847,7 +21848,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:21851: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -21894,16 +21895,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:21897: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21898: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:21902: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21903: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:21906: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21907: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -21942,16 +21943,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:21945: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:21946: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:21950: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:21951: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:21954: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21955: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -21990,23 +21991,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21993: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21994: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21998: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21999: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22002: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22003: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:22009: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22010: 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. @@ -22023,7 +22024,7 @@ else enable_warnings=no fi; -echo "$as_me:22026: result: $enable_warnings" >&5 +echo "$as_me:22027: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -22046,10 +22047,10 @@ cat > conftest.i <&5 + { echo "$as_me:22050: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <&5 + if { (eval echo "$as_me:22102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22104: \$? = $ac_status" >&5 + echo "$as_me:22105: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22106: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:22107: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -22181,7 +22182,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 22184 "configure" +#line 22185 "configure" #include "confdefs.h" #include @@ -22196,26 +22197,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22200: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22202: \$? = $ac_status" >&5 + echo "$as_me:22203: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22205: \"$ac_try\"") >&5 + { (eval echo "$as_me:22206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22208: \$? = $ac_status" >&5 + echo "$as_me:22209: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:22211: checking for X11/Xt const-feature" >&5 +echo "$as_me:22212: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22218 "configure" +#line 22219 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -22232,16 +22233,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22235: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22236: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22238: \$? = $ac_status" >&5 + echo "$as_me:22239: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22241: \"$ac_try\"") >&5 + { (eval echo "$as_me:22242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22244: \$? = $ac_status" >&5 + echo "$as_me:22245: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -22256,7 +22257,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22259: result: $cf_cv_const_x_string" >&5 +echo "$as_me:22260: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -22285,7 +22286,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:22305: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -22317,12 +22318,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:22320: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22323: \$? = $ac_status" >&5 + echo "$as_me:22324: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22325: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22326: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -22330,7 +22331,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:22333: checking for $CC warning options..." >&5 + { echo "$as_me:22334: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -22353,12 +22354,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:22356: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22359: \$? = $ac_status" >&5 + echo "$as_me:22360: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22361: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22362: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -22366,7 +22367,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}:22369: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22370: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22376,7 +22377,7 @@ echo "${as_me:-configure}:22369: 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}:22379: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22380: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22393,7 +22394,7 @@ fi fi -echo "$as_me:22396: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:22397: 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. @@ -22415,7 +22416,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:22418: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:22419: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -22529,23 +22530,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:22532: checking for dmalloc.h" >&5 + echo "$as_me:22533: 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 22538 "configure" +#line 22539 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22542: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22543: \"$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:22548: \$? = $ac_status" >&5 + echo "$as_me:22549: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22564,11 +22565,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22567: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:22568: 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:22571: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:22572: 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 @@ -22576,7 +22577,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22579 "configure" +#line 22580 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22595,16 +22596,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22599: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22601: \$? = $ac_status" >&5 + echo "$as_me:22602: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22604: \"$ac_try\"") >&5 + { (eval echo "$as_me:22605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22607: \$? = $ac_status" >&5 + echo "$as_me:22608: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -22615,7 +22616,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22618: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:22619: 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:22634: 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. @@ -22652,7 +22653,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:22655: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:22656: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -22766,23 +22767,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:22769: checking for dbmalloc.h" >&5 + echo "$as_me:22770: 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 22775 "configure" +#line 22776 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22779: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22780: \"$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:22785: \$? = $ac_status" >&5 + echo "$as_me:22786: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22801,11 +22802,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22804: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:22805: 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:22808: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:22809: 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 @@ -22813,7 +22814,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22816 "configure" +#line 22817 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22832,16 +22833,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22835: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22836: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22838: \$? = $ac_status" >&5 + echo "$as_me:22839: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22841: \"$ac_try\"") >&5 + { (eval echo "$as_me:22842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22844: \$? = $ac_status" >&5 + echo "$as_me:22845: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -22852,7 +22853,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22855: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:22856: 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:22871: 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. @@ -22889,7 +22890,7 @@ EOF else with_valgrind= fi; -echo "$as_me:22892: result: ${with_valgrind:-no}" >&5 +echo "$as_me:22893: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -23002,7 +23003,7 @@ fi ;; esac -echo "$as_me:23005: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23006: 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. @@ -23013,7 +23014,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:23016: result: $with_no_leaks" >&5 +echo "$as_me:23017: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -23031,7 +23032,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:23034: checking for an rpath option" >&5 + echo "$as_me:23035: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -23062,12 +23063,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:23065: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23066: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:23070: checking if we need a space after rpath option" >&5 + echo "$as_me:23071: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -23088,7 +23089,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23091 "configure" +#line 23092 "configure" #include "confdefs.h" int @@ -23100,16 +23101,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23103: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23106: \$? = $ac_status" >&5 + echo "$as_me:23107: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23109: \"$ac_try\"") >&5 + { (eval echo "$as_me:23110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23112: \$? = $ac_status" >&5 + echo "$as_me:23113: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -23119,14 +23120,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:23122: result: $cf_rpath_space" >&5 + echo "$as_me:23123: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:23129: checking if rpath-hack should be disabled" >&5 +echo "$as_me:23130: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -23144,22 +23145,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:23147: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:23148: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:23152: checking for updated LDFLAGS" >&5 +echo "$as_me:23153: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:23155: result: maybe" >&5 + echo "$as_me:23156: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd 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:23162: checking for $ac_word" >&5 +echo "$as_me:23163: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23174,7 +23175,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_cf_ldd_prog="$ac_prog" -echo "$as_me:23177: found $ac_dir/$ac_word" >&5 +echo "$as_me:23178: found $ac_dir/$ac_word" >&5 break done @@ -23182,10 +23183,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:23185: result: $cf_ldd_prog" >&5 + echo "$as_me:23186: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:23188: result: no" >&5 + echo "$as_me:23189: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23199,7 +23200,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 23202 "configure" +#line 23203 "configure" #include "confdefs.h" #include int @@ -23211,16 +23212,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23215: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23217: \$? = $ac_status" >&5 + echo "$as_me:23218: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23220: \"$ac_try\"") >&5 + { (eval echo "$as_me:23221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23223: \$? = $ac_status" >&5 + echo "$as_me:23224: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -23248,7 +23249,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:23251: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:23252: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -23260,11 +23261,11 @@ echo "${as_me:-configure}:23251: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23263: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23264: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23267: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23268: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -23301,7 +23302,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23304: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23305: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23314,11 +23315,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23317: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23318: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23321: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23322: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -23355,7 +23356,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23358: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23359: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23368,14 +23369,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23371: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23372: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23375: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23376: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:23378: result: no" >&5 + echo "$as_me:23379: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23465,7 +23466,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:23468: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23469: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -23644,7 +23645,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23647: error: ambiguous option: $1 + { { echo "$as_me:23648: 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;} @@ -23663,7 +23664,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23666: error: unrecognized option: $1 + -*) { { echo "$as_me:23667: 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;} @@ -23713,7 +23714,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:23716: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23717: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24019,7 +24020,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24022: creating $ac_file" >&5 + { echo "$as_me:24023: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24037,7 +24038,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:24040: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24041: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24050,7 +24051,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24053: error: cannot find input file: $f" >&5 + { { echo "$as_me:24054: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24066,7 +24067,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:24069: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24070: 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;} @@ -24075,7 +24076,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:24078: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24079: 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;} @@ -24112,7 +24113,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:24115: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24116: 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;} @@ -24123,7 +24124,7 @@ $ac_seen" >&2;} ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:24126: WARNING: Some variables may not be substituted: + { echo "$as_me:24127: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24172,7 +24173,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:24175: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24176: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24183,7 +24184,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:24186: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24187: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24196,7 +24197,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24199: error: cannot find input file: $f" >&5 + { { echo "$as_me:24200: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24254,7 +24255,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:24257: $ac_file is unchanged" >&5 + { echo "$as_me:24258: $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/test/configure.in b/test/configure.in index e74643e9..0973eb37 100644 --- a/test/configure.in +++ b/test/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.164 2022/04/09 21:31:37 tom Exp $ +dnl $Id: configure.in,v 1.165 2022/07/16 18:44:46 tom Exp $ dnl This is a simple configuration-script for the ncurses test programs that dnl allows the test-directory to be separately configured against a reference dnl system (i.e., sysvr4 curses) @@ -255,6 +255,7 @@ unistd.h \ CF_GETOPT_HEADER AC_CHECK_FUNCS( \ +cfmakeraw \ getopt \ gettimeofday \ snprintf \ diff --git a/test/listused.sh b/test/listused.sh index e329d277..45653ebd 100755 --- a/test/listused.sh +++ b/test/listused.sh @@ -27,7 +27,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: listused.sh,v 1.11 2022/04/09 23:03:25 tom Exp $ +# $Id: listused.sh,v 1.12 2022/07/16 16:33:38 tom Exp $ # A very simple script to list all entrypoints that are used by either a test # program, or within the libraries. This relies on the output format of 'nm', # and assumes that the libraries are configured with TRACE defined, and using @@ -67,7 +67,7 @@ do ;; *) NAME=../objects/${name}.o - if test -f $NAME + if test -f "$NAME" then PROGS="$PROGS $NAME" fi @@ -78,19 +78,19 @@ done # For each library - for lib in ../lib/*.a do - LIB=`basename $lib .a` + LIB=`basename "$lib" .a` case $LIB in *_*|*+*) continue ;; esac - tmp=`echo $LIB|sed -e 's/w$//'` + tmp=`echo "$LIB"|sed -e 's/w$//'` echo echo "${tmp}:" - echo $tmp |sed -e 's/./-/g' + echo "$tmp" |sed -e 's/./-/g' # Construct a list of public externals provided by the library. - WANT=`nm $NM_OPTS $lib |\ + WANT=`nm $NM_OPTS "$lib" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -113,7 +113,7 @@ do tags=$prog ;; *) - TEST=`nm $NM_OPTS $prog |\ + TEST=`nm $NM_OPTS "$prog" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -125,7 +125,7 @@ do -e '/^[^_]/d'` if test -n "$TEST" then - have=`basename $prog .o` + have=`basename "$prog" .o` if test -n "$HAVE" then if test "$last" = "$tags" @@ -153,7 +153,7 @@ do continue ;; esac - TEST=`nm $NM_OPTS $tmp |\ + TEST=`nm $NM_OPTS "$tmp" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -166,20 +166,20 @@ do -e '/^[^_]/d'` if test -n "$TEST" then - tmp=`basename $tmp .a |sed -e 's/w$//'` - HAVE=`echo $tmp | sed -e 's/lib/lib: /'` + tmp=`basename "$tmp" .a |sed -e 's/w$//'` + HAVE=`echo "$tmp" | sed -e 's/lib/lib: /'` break fi done fi test -z "$HAVE" && HAVE="-" - lenn=`expr 39 - length $name` - lenn=`expr $lenn / 8` + lenn=`expr 39 - length "$name"` + lenn=`expr "$lenn" / 8` tabs= - while test $lenn != 0 + while test "$lenn" != 0 do tabs="${tabs} " - lenn=`expr $lenn - 1` + lenn=`expr "$lenn" - 1` done echo "${name}${tabs}${HAVE}" done diff --git a/test/savescreen.sh b/test/savescreen.sh index e77bffef..1ffab2fc 100644 --- a/test/savescreen.sh +++ b/test/savescreen.sh @@ -27,13 +27,13 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: savescreen.sh,v 1.7 2022/02/05 17:58:06 tom Exp $ +# $Id: savescreen.sh,v 1.8 2022/07/16 16:34:34 tom Exp $ # # Use this script to exercise "savescreen". # It starts by generating a series of temporary-filenames, which are passed # to the test-program. Loop as long as the first file named exists. -: ${TMPDIR:=/tmp} +: "${TMPDIR:=/tmp}" # "mktemp -d" would be preferable, but is not standard. MY_DIR=$TMPDIR/savescreen$$ @@ -59,7 +59,7 @@ if test -f $BEGINS then while test -f $BEGINS do - ${0%.sh} -r $PARAMS + "${0%.sh}" -r $PARAMS test $? != 0 && break done else diff --git a/test/test.priv.h b/test/test.priv.h index 125477f1..b4f32594 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -30,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.201 2022/05/21 20:37:38 tom Exp $ */ +/* $Id: test.priv.h,v 1.202 2022/07/16 18:49:01 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -67,16 +67,8 @@ #define HAVE_ASSUME_DEFAULT_COLORS 0 #endif -#ifndef HAVE_BSD_STRING_H -#define HAVE_BSD_STRING_H 0 -#endif - -#ifndef HAVE_CURSES_VERSION -#define HAVE_CURSES_VERSION 0 -#endif - -#ifndef HAVE_CURSCR -#define HAVE_CURSCR 0 +#ifndef HAVE_CFMAKERAW +#define HAVE_CFMAKERAW 0 #endif #ifndef HAVE_CHGAT @@ -95,6 +87,18 @@ #define HAVE_COLOR_SET 0 #endif +#ifndef HAVE_BSD_STRING_H +#define HAVE_BSD_STRING_H 0 +#endif + +#ifndef HAVE_CURSES_VERSION +#define HAVE_CURSES_VERSION 0 +#endif + +#ifndef HAVE_CURSCR +#define HAVE_CURSCR 0 +#endif + #ifndef HAVE_DELSCREEN #define HAVE_DELSCREEN 0 #endif @@ -123,6 +127,10 @@ #define HAVE_GETMAXX 0 #endif +#ifndef HAVE_GETTIMEOFDAY +#define HAVE_GETTIMEOFDAY 0 +#endif + #ifndef HAVE_GETOPT_H #define HAVE_GETOPT_H 0 #endif @@ -726,10 +734,18 @@ extern int optind; #define HAVE_SNPRINTF 0 #endif +#ifndef HAVE_STRDUP +#define HAVE_STRDUP 0 +#endif + #ifndef USE_STRING_HACKS #define USE_STRING_HACKS 0 #endif +#ifndef HAVE_STRSTR +#define HAVE_STRSTR 0 +#endif + #ifndef NCURSES_CAST #ifdef __cplusplus extern "C" { diff --git a/test/test_mouse.c b/test/test_mouse.c index b24903d5..c898080a 100644 --- a/test/test_mouse.c +++ b/test/test_mouse.c @@ -22,7 +22,7 @@ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************/ /* - * $Id: test_mouse.c,v 1.19 2022/05/15 16:41:20 tom Exp $ + * $Id: test_mouse.c,v 1.20 2022/07/16 18:52:09 tom Exp $ * * Author: Leonid S Usov * @@ -43,7 +43,18 @@ raw_loop(void) char *xtermcap; tcgetattr(0, &old); +#if HAVE_CFMAKERAW cfmakeraw(&tty); +#else + tty = old; + tty.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP + | INLCR | IGNCR | ICRNL | IXON); + tty.c_oflag &= ~OPOST; + tty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN); + tty.c_cflag &= ~(CSIZE | PARENB); + tty.c_cflag |= CS8; + tcsetattr(0, TCSANOW, &tty); +#endif setupterm(NULL, 0, 0); xtermcap = tigetstr("XM"); @@ -57,7 +68,7 @@ raw_loop(void) tcsetattr(0, TCSANOW, &tty); - while (true) { + while (1) { int c = getc(stdin); const char *pretty; -- 2.45.0