From: Thomas E. Dickey Date: Sun, 10 Sep 2017 01:23:51 +0000 (+0000) Subject: ncurses 6.0 - patch 20170909 X-Git-Tag: v6.1~20 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=5d8dbcdd9423bf9821db414fd9ec792ccf1f1027 ncurses 6.0 - patch 20170909 + improve wide-character implementation of myADDNSTR() in frm_driver.c, which was inconsistent with the normal implementation. + save/restore cursor position in Undo_Justification(), matching behavior of Buffer_To_Window() (report by Leon Winter). + modify test/knight to provide the "slow" solution for small screens using "R", noting that Warnsdorf's method is easily done with "a". + modify several test-programs which call use_default_colors() to consistently do this only if "-d" option is given. + additional changes to test with non-standard variants of curses: + modify a loop limit in firework.c to work around absense of limit checks in some libraries. + fill the last row of a window with "?" in firstlast if waddch does not return ERR on the lower-right corner. + add checks in test/configure for some functions not in 4.3BSD curses. + fix a regression in test/configure (cf: 20170826). --- diff --git a/NEWS b/NEWS index 936c9409..6254ce4a 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2939 2017/09/02 21:48:17 tom Exp $ +-- $Id: NEWS,v 1.2949 2017/09/09 22:32:34 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,23 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20170909 + + improve wide-character implementation of myADDNSTR() in frm_driver.c, + which was inconsistent with the normal implementation. + + save/restore cursor position in Undo_Justification(), matching + behavior of Buffer_To_Window() (report by Leon Winter). + + modify test/knight to provide the "slow" solution for small screens + using "R", noting that Warnsdorf's method is easily done with "a". + + modify several test-programs which call use_default_colors() to + consistently do this only if "-d" option is given. + + additional changes to test with non-standard variants of curses: + + modify a loop limit in firework.c to work around absense of limit + checks in some libraries. + + fill the last row of a window with "?" in firstlast if waddch does + not return ERR on the lower-right corner. + + add checks in test/configure for some functions not in 4.3BSD curses. + + fix a regression in test/configure (cf: 20170826). + 20170902 + amend change for endwin-state for better consistency with the older logic (report/patch by Jeb Rosen, cf: 20170722). diff --git a/VERSION b/VERSION index db7e2867..5ea0db9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20170902 +5:0:9 6.0 20170909 diff --git a/dist.mk b/dist.mk index 77f8ec80..78f18a66 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1181 2017/08/29 22:24:15 tom Exp $ +# $Id: dist.mk,v 1.1182 2017/09/03 20:54:16 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20170902 +NCURSES_PATCH = 20170909 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/form/frm_driver.c b/form/frm_driver.c index 45e323f7..837b02a1 100644 --- a/form/frm_driver.c +++ b/form/frm_driver.c @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_driver.c,v 1.121 2017/04/08 22:02:15 tom Exp $") +MODULE_ID("$Id: frm_driver.c,v 1.123 2017/09/09 22:35:49 tom Exp $") /*---------------------------------------------------------------------------- This is the core module of the form library. It contains the majority @@ -99,9 +99,9 @@ Perhaps at some time we will make this configurable at runtime. #define GROW_IF_NAVIGATE (1) #if USE_WIDEC_SUPPORT -#define myADDNSTR(w, s, n) wadd_wchnstr(w, s, n) -#define myINSNSTR(w, s, n) wins_wchnstr(w, s, n) -#define myINNSTR(w, s, n) fix_wchnstr(w, s, n) +#define myADDNSTR(w, s, n) wide_waddnstr(w, s, n) +#define myINSNSTR(w, s, n) wide_winsnstr(w, s, n) +#define myINNSTR(w, s, n) wide_winnstr(w, s, n) #define myWCWIDTH(w, y, x) cell_width(w, y, x) #else #define myADDNSTR(w, s, n) waddnstr(w, s, n) @@ -239,9 +239,29 @@ check_pos(FORM *form, int lineno) Wide-character special functions --------------------------------------------------------------------------*/ #if USE_WIDEC_SUPPORT -/* like winsnstr */ +/* add like waddnstr, but using cchar_t* rather than char* + */ static int -wins_wchnstr(WINDOW *w, cchar_t *s, int n) +wide_waddnstr(WINDOW *w, const cchar_t *s, int n) +{ + int rc = OK; + + while (n-- > 0) + { + if ((rc = wadd_wch(w, s)) != OK) + break; + ++s; + } + return rc; +} + +/* insert like winsnstr, but using cchar_t* rather than char* + * + * X/Open Curses has no close equivalent; inserts are done only with wchar_t + * strings. + */ +static int +wide_winsnstr(WINDOW *w, const cchar_t *s, int n) { int code = ERR; int y, x; @@ -257,11 +277,13 @@ wins_wchnstr(WINDOW *w, cchar_t *s, int n) return code; } -/* win_wchnstr is inconsistent with winnstr, since it returns OK rather than - * the number of items transferred. +/* retrieve like winnstr, but using cchar_t*, rather than char*. + * + * X/Open Curses' closest equivalent, win_wchnstr(), is inconsistent with + * winnstr(), since it returns OK rather than the number of items transferred. */ static int -fix_wchnstr(WINDOW *w, cchar_t *s, int n) +wide_winnstr(WINDOW *w, cchar_t *s, int n) { int x; @@ -1023,8 +1045,11 @@ static void Undo_Justification(FIELD *field, WINDOW *win) { FIELD_CELL *bp; + int y, x; int len; + getyx(win, y, x); + bp = (Field_Has_Option(field, O_NO_LEFT_STRIP) ? field->buf : Get_Start_Of_Data(field->buf, Buffer_Length(field))); @@ -1036,6 +1061,7 @@ Undo_Justification(FIELD *field, WINDOW *win) wmove(win, 0, 0); myADDNSTR(win, bp, len); } + wmove(win, y, x); } /*--------------------------------------------------------------------------- diff --git a/include/ncurses_defs b/include/ncurses_defs index fffd5fb9..26f76460 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.75 2017/08/20 16:50:04 tom Exp $ +# $Id: ncurses_defs,v 1.80 2017/09/04 15:01:23 tom Exp $ ############################################################################## # Copyright (c) 2000-2016,2017 Free Software Foundation, Inc. # # # @@ -52,8 +52,11 @@ HAVE_BUILTIN_H HAVE_CHGAT 1 HAVE_COLOR_CONTENT 1 HAVE_COLOR_SET 1 +HAVE_COPYWIN 1 HAVE_CURSCR 1 +HAVE_DERWIN 1 HAVE_DIRENT_H +HAVE_DUPWIN 1 HAVE_ERRNO HAVE_FCNTL_H HAVE_FILTER 1 @@ -73,6 +76,7 @@ HAVE_GETWIN 1 HAVE_GPM_H HAVE_GPP_BUILTIN_H HAVE_GXX_BUILTIN_H +HAVE_HALFDELAY 1 HAVE_HAS_KEY HAVE_INIT_EXTENDED_COLOR HAVE_INTTYPES_H @@ -105,6 +109,7 @@ HAVE_MVVLINE 1 HAVE_MVWVLINE 1 HAVE_NANOSLEEP HAVE_NC_ALLOC_H +HAVE_NEWPAD 1 HAVE_PANEL_H HAVE_POLL HAVE_POLL_H diff --git a/man/user_caps.5 b/man/user_caps.5 index f4d0828b..0f20dad1 100644 --- a/man/user_caps.5 +++ b/man/user_caps.5 @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: user_caps.5,v 1.1 2017/08/12 21:26:12 tom Exp $ +.\" $Id: user_caps.5,v 1.2 2017/09/04 19:27:24 tom Exp $ .TH user_caps 5 .ie \n(.g .ds `` \(lq .el .ds `` `` @@ -210,7 +210,7 @@ asserts that ncurses must use Unicode values for line-drawing characters, and that it should ignore the alternate character set capabilities when the locale uses UTF-8 encoding. For more information, see the discussion of -\fBNCURSES_NO_UTF8_ACS\fP in \fBterminfo\fP(5). +\fBNCURSES_NO_UTF8_ACS\fP in \fBncurses\fP(3X). .IP Set this capability to a nonzero value to enable it. .TP 3 diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 6b66e2b4..6f6f983a 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170902) unstable; urgency=low +ncurses6 (6.0+20170909) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Tue, 29 Aug 2017 18:24:15 -0400 + -- Thomas E. Dickey Sun, 03 Sep 2017 16:54:16 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 6b66e2b4..6f6f983a 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170902) unstable; urgency=low +ncurses6 (6.0+20170909) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Tue, 29 Aug 2017 18:24:15 -0400 + -- Thomas E. Dickey Sun, 03 Sep 2017 16:54:16 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index c032d2fd..396da58c 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170902) unstable; urgency=low +ncurses6 (6.0+20170909) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Tue, 29 Aug 2017 18:24:15 -0400 + -- Thomas E. Dickey Sun, 03 Sep 2017 16:54:16 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 34dfb838..1d74f2db 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.229 2017/08/29 22:24:15 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.230 2017/09/03 20:54:16 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "0" !define VERSION_YYYY "2017" -!define VERSION_MMDD "0902" +!define VERSION_MMDD "0909" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 07d003ea..f1f28603 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.0 -Release: 20170902 +Release: 20170909 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 15129a71..4cf67561 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.0 -Release: 20170902 +Release: 20170909 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/Makefile.in b/test/Makefile.in index 7b2f05ae..c6e03cea 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.116 2017/08/11 00:13:11 tom Exp $ +# $Id: Makefile.in,v 1.117 2017/09/04 00:50:06 tom Exp $ ############################################################################## -# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. # +# Copyright (c) 1998-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # diff --git a/test/aclocal.m4 b/test/aclocal.m4 index ec32d0ef..814f030b 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.142 2017/08/20 18:12:43 tom Exp $ +dnl $Id: aclocal.m4,v 1.144 2017/09/07 21:08:12 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -745,7 +745,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 39 updated: 2015/05/10 19:52:14 +dnl CF_CURSES_LIBS version: 40 updated: 2017/09/07 17:06:24 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -839,7 +839,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown do LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then AC_MSG_CHECKING(if we can link with $cf_curs_lib library) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr()], diff --git a/test/configure b/test/configure index 32ac8be5..a5956500 100755 --- a/test/configure +++ b/test/configure @@ -2077,13 +2077,65 @@ echo "${ECHO_T}ok" >&6 ;; esac +echo "$as_me:2080: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +#line 2088 "configure" +#include "confdefs.h" +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif + +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2097: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2100: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2106: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_inline=$ac_kw; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:2117: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in + inline | yes) ;; + no) +cat >>confdefs.h <<\EOF +#define inline +EOF + ;; + *) cat >>confdefs.h <&5 +echo "$as_me:2138: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2104,18 +2156,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2107 "configure" +#line 2159 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2112: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2164: \"$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:2118: \$? = $ac_status" >&5 + echo "$as_me:2170: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2138,17 +2190,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2141 "configure" +#line 2193 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2145: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2197: \"$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:2151: \$? = $ac_status" >&5 + echo "$as_me:2203: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2185,7 +2237,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2188: result: $CPP" >&5 +echo "$as_me:2240: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2195,18 +2247,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2198 "configure" +#line 2250 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2203: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2255: \"$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:2209: \$? = $ac_status" >&5 + echo "$as_me:2261: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2229,17 +2281,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2232 "configure" +#line 2284 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2236: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2288: \"$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:2242: \$? = $ac_status" >&5 + echo "$as_me:2294: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2267,7 +2319,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2270: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2322: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2283,7 +2335,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2286: checking for $ac_word" >&5 +echo "$as_me:2338: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2298,7 +2350,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2301: found $ac_dir/$ac_word" >&5 +echo "$as_me:2353: found $ac_dir/$ac_word" >&5 break done @@ -2306,10 +2358,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2309: result: $AWK" >&5 + echo "$as_me:2361: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2312: result: no" >&5 + echo "$as_me:2364: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2328,7 +2380,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2331: checking for a BSD compatible install" >&5 +echo "$as_me:2383: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2377,7 +2429,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2380: result: $INSTALL" >&5 +echo "$as_me:2432: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2402,7 +2454,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2405: checking for $ac_word" >&5 +echo "$as_me:2457: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2417,7 +2469,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2420: found $ac_dir/$ac_word" >&5 +echo "$as_me:2472: found $ac_dir/$ac_word" >&5 break done @@ -2425,17 +2477,17 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2428: result: $LINT" >&5 + echo "$as_me:2480: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2431: result: no" >&5 + echo "$as_me:2483: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:2438: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2490: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2462,7 +2514,7 @@ else fi fi -echo "$as_me:2465: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2517: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2473,7 +2525,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2476: checking for $ac_word" >&5 +echo "$as_me:2528: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2488,7 +2540,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:2491: found $ac_dir/$ac_word" >&5 +echo "$as_me:2543: found $ac_dir/$ac_word" >&5 break done @@ -2496,10 +2548,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2499: result: $CTAGS" >&5 + echo "$as_me:2551: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2502: result: no" >&5 + echo "$as_me:2554: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2510,7 +2562,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2513: checking for $ac_word" >&5 +echo "$as_me:2565: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2525,7 +2577,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:2528: found $ac_dir/$ac_word" >&5 +echo "$as_me:2580: found $ac_dir/$ac_word" >&5 break done @@ -2533,10 +2585,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2536: result: $ETAGS" >&5 + echo "$as_me:2588: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2539: result: no" >&5 + echo "$as_me:2591: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2545,7 +2597,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2548: checking for $ac_word" >&5 +echo "$as_me:2600: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2560,7 +2612,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:2563: found $ac_dir/$ac_word" >&5 +echo "$as_me:2615: found $ac_dir/$ac_word" >&5 break done @@ -2569,17 +2621,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2572: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2624: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2575: result: no" >&5 + echo "$as_me:2627: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2582: checking for $ac_word" >&5 +echo "$as_me:2634: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2594,7 +2646,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:2597: found $ac_dir/$ac_word" >&5 +echo "$as_me:2649: found $ac_dir/$ac_word" >&5 break done @@ -2603,10 +2655,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2606: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2658: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2609: result: no" >&5 + echo "$as_me:2661: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2626,14 +2678,14 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2629: checking if -lm needed for math functions" >&5 +echo "$as_me:2681: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2636 "configure" +#line 2688 "configure" #include "confdefs.h" #include @@ -2649,16 +2701,16 @@ double x = rand(); printf("result = %g\n", pow(sin(x),x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2704: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2655: \$? = $ac_status" >&5 + echo "$as_me:2707: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2658: \"$ac_try\"") >&5 + { (eval echo "$as_me:2710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2661: \$? = $ac_status" >&5 + echo "$as_me:2713: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -2668,7 +2720,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2671: result: $cf_cv_need_libm" >&5 +echo "$as_me:2723: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -2727,10 +2779,10 @@ cat > conftest.i <&5 + { echo "$as_me:2782: 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:2834: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2785: \$? = $ac_status" >&5 + echo "$as_me:2837: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:2787: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:2839: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -2843,7 +2895,7 @@ fi rm -rf conftest* fi -echo "$as_me:2846: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:2898: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -2853,7 +2905,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:2856: result: $with_string_hacks" >&5 +echo "$as_me:2908: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -2862,15 +2914,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:2865: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:2917: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:2867: checking for strlcat" >&5 + echo "$as_me:2919: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2873 "configure" +#line 2925 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strlcat (); below. */ @@ -2901,16 +2953,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2904: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2956: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2907: \$? = $ac_status" >&5 + echo "$as_me:2959: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2910: \"$ac_try\"") >&5 + { (eval echo "$as_me:2962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2913: \$? = $ac_status" >&5 + echo "$as_me:2965: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -2920,7 +2972,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2923: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:2975: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -2930,7 +2982,7 @@ EOF else - echo "$as_me:2933: checking for strlcat in -lbsd" >&5 + echo "$as_me:2985: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2938,7 +2990,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2941 "configure" +#line 2993 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2957,16 +3009,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2960: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2963: \$? = $ac_status" >&5 + echo "$as_me:3015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2966: \"$ac_try\"") >&5 + { (eval echo "$as_me:3018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2969: \$? = $ac_status" >&5 + echo "$as_me:3021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -2977,7 +3029,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2980: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3032: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test $ac_cv_lib_bsd_strlcat = yes; then @@ -3000,23 +3052,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3003: checking for $ac_header" >&5 +echo "$as_me:3055: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3009 "configure" +#line 3061 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3013: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3065: \"$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:3019: \$? = $ac_status" >&5 + echo "$as_me:3071: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3035,7 +3087,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3038: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3090: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3111: 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 3065 "configure" +#line 3117 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3093,16 +3145,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3099: \$? = $ac_status" >&5 + echo "$as_me:3151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3102: \"$ac_try\"") >&5 + { (eval echo "$as_me:3154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3105: \$? = $ac_status" >&5 + echo "$as_me:3157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3112,7 +3164,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3115: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3167: 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:3217: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3172 "configure" +#line 3224 "configure" #include "confdefs.h" #include int @@ -3184,16 +3236,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3190: \$? = $ac_status" >&5 + echo "$as_me:3242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3193: \"$ac_try\"") >&5 + { (eval echo "$as_me:3245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3196: \$? = $ac_status" >&5 + echo "$as_me:3248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3202,7 +3254,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3205 "configure" +#line 3257 "configure" #include "confdefs.h" #include int @@ -3217,16 +3269,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3272: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3223: \$? = $ac_status" >&5 + echo "$as_me:3275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3226: \"$ac_try\"") >&5 + { (eval echo "$as_me:3278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3229: \$? = $ac_status" >&5 + echo "$as_me:3281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3241,12 +3293,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3244: result: $cf_cv_gnu_source" >&5 +echo "$as_me:3296: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then -echo "$as_me:3249: checking if we should also define _DEFAULT_SOURCE" >&5 +echo "$as_me:3301: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3254,7 +3306,7 @@ else CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3257 "configure" +#line 3309 "configure" #include "confdefs.h" #include int @@ -3269,16 +3321,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3272: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3324: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3275: \$? = $ac_status" >&5 + echo "$as_me:3327: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3278: \"$ac_try\"") >&5 + { (eval echo "$as_me:3330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3281: \$? = $ac_status" >&5 + echo "$as_me:3333: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_default_source=no else @@ -3289,7 +3341,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3292: result: $cf_cv_default_source" >&5 +echo "$as_me:3344: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" fi @@ -3315,16 +3367,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3318: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3370: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3324: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3376: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3327 "configure" +#line 3379 "configure" #include "confdefs.h" #include int @@ -3339,16 +3391,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3342: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3394: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3345: \$? = $ac_status" >&5 + echo "$as_me:3397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3348: \"$ac_try\"") >&5 + { (eval echo "$as_me:3400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3351: \$? = $ac_status" >&5 + echo "$as_me:3403: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3369,7 +3421,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3372 "configure" +#line 3424 "configure" #include "confdefs.h" #include int @@ -3384,16 +3436,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3387: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3390: \$? = $ac_status" >&5 + echo "$as_me:3442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3393: \"$ac_try\"") >&5 + { (eval echo "$as_me:3445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3396: \$? = $ac_status" >&5 + echo "$as_me:3448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3404,15 +3456,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3407: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3459: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3412: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3464: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3415 "configure" +#line 3467 "configure" #include "confdefs.h" #include int @@ -3427,16 +3479,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3430: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3482: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3433: \$? = $ac_status" >&5 + echo "$as_me:3485: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3436: \"$ac_try\"") >&5 + { (eval echo "$as_me:3488: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3439: \$? = $ac_status" >&5 + echo "$as_me:3491: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3452,7 +3504,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3455: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3507: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3590,14 +3642,14 @@ fi ;; (*) -echo "$as_me:3593: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3645: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3600 "configure" +#line 3652 "configure" #include "confdefs.h" #include @@ -3616,16 +3668,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3622: \$? = $ac_status" >&5 + echo "$as_me:3674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3625: \"$ac_try\"") >&5 + { (eval echo "$as_me:3677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3628: \$? = $ac_status" >&5 + echo "$as_me:3680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3634,7 +3686,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3637 "configure" +#line 3689 "configure" #include "confdefs.h" #include @@ -3653,16 +3705,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3659: \$? = $ac_status" >&5 + echo "$as_me:3711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3662: \"$ac_try\"") >&5 + { (eval echo "$as_me:3714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3665: \$? = $ac_status" >&5 + echo "$as_me:3717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3677,7 +3729,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3680: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3732: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3805,16 +3857,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3808: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3860: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3814: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3866: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3817 "configure" +#line 3869 "configure" #include "confdefs.h" #include int @@ -3829,16 +3881,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3832: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3884: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3835: \$? = $ac_status" >&5 + echo "$as_me:3887: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3838: \"$ac_try\"") >&5 + { (eval echo "$as_me:3890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3841: \$? = $ac_status" >&5 + echo "$as_me:3893: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3859,7 +3911,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3862 "configure" +#line 3914 "configure" #include "confdefs.h" #include int @@ -3874,16 +3926,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3877: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3880: \$? = $ac_status" >&5 + echo "$as_me:3932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3883: \"$ac_try\"") >&5 + { (eval echo "$as_me:3935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3886: \$? = $ac_status" >&5 + echo "$as_me:3938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3894,15 +3946,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3897: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3949: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3902: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3954: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3905 "configure" +#line 3957 "configure" #include "confdefs.h" #include int @@ -3917,16 +3969,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3923: \$? = $ac_status" >&5 + echo "$as_me:3975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3926: \"$ac_try\"") >&5 + { (eval echo "$as_me:3978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3929: \$? = $ac_status" >&5 + echo "$as_me:3981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3942,7 +3994,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3945: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3997: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4134,7 +4186,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:4137: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4189: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4144,7 +4196,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:4147: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4199: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4154,7 +4206,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:4157: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4209: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -4164,10 +4216,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4167: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4219: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4170 "configure" +#line 4222 "configure" #include "confdefs.h" #include int @@ -4182,16 +4234,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4185: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4237: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4188: \$? = $ac_status" >&5 + echo "$as_me:4240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4191: \"$ac_try\"") >&5 + { (eval echo "$as_me:4243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4194: \$? = $ac_status" >&5 + echo "$as_me:4246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4200,12 +4252,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:4203: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4255: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 4208 "configure" +#line 4260 "configure" #include "confdefs.h" #include int @@ -4220,16 +4272,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4226: \$? = $ac_status" >&5 + echo "$as_me:4278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4229: \"$ac_try\"") >&5 + { (eval echo "$as_me:4281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4232: \$? = $ac_status" >&5 + echo "$as_me:4284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4240,19 +4292,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:4243: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:4295: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4248: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4300: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4255 "configure" +#line 4307 "configure" #include "confdefs.h" #include @@ -4271,16 +4323,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4274: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4277: \$? = $ac_status" >&5 + echo "$as_me:4329: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4280: \"$ac_try\"") >&5 + { (eval echo "$as_me:4332: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4283: \$? = $ac_status" >&5 + echo "$as_me:4335: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4289,7 +4341,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 4292 "configure" +#line 4344 "configure" #include "confdefs.h" #include @@ -4308,16 +4360,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4311: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4363: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4314: \$? = $ac_status" >&5 + echo "$as_me:4366: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4317: \"$ac_try\"") >&5 + { (eval echo "$as_me:4369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4320: \$? = $ac_status" >&5 + echo "$as_me:4372: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4332,7 +4384,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4335: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4387: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4450,7 +4502,7 @@ fi fi fi -echo "$as_me:4453: checking for signal global datatype" >&5 +echo "$as_me:4505: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4462,7 +4514,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 4465 "configure" +#line 4517 "configure" #include "confdefs.h" #include @@ -4485,16 +4537,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4488: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4491: \$? = $ac_status" >&5 + echo "$as_me:4543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4494: \"$ac_try\"") >&5 + { (eval echo "$as_me:4546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4497: \$? = $ac_status" >&5 + echo "$as_me:4549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -4508,7 +4560,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4511: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:4563: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:4572: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4527 "configure" +#line 4579 "configure" #include "confdefs.h" #include @@ -4539,23 +4591,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4542: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4545: \$? = $ac_status" >&5 + echo "$as_me:4597: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4548: \"$ac_try\"") >&5 + { (eval echo "$as_me:4600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4551: \$? = $ac_status" >&5 + echo "$as_me:4603: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 4558 "configure" +#line 4610 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4573,16 +4625,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4576: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4628: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4579: \$? = $ac_status" >&5 + echo "$as_me:4631: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4582: \"$ac_try\"") >&5 + { (eval echo "$as_me:4634: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4585: \$? = $ac_status" >&5 + echo "$as_me:4637: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -4596,11 +4648,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4599: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:4651: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:4603: checking for actual SIGWINCH definition" >&5 +echo "$as_me:4655: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4611,7 +4663,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 4614 "configure" +#line 4666 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4633,16 +4685,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4639: \$? = $ac_status" >&5 + echo "$as_me:4691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4642: \"$ac_try\"") >&5 + { (eval echo "$as_me:4694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4645: \$? = $ac_status" >&5 + echo "$as_me:4697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -4656,7 +4708,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:4659: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:4711: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -4666,13 +4718,13 @@ fi # Checks for CODESET support. -echo "$as_me:4669: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:4721: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4675 "configure" +#line 4727 "configure" #include "confdefs.h" #include int @@ -4684,16 +4736,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4687: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4690: \$? = $ac_status" >&5 + echo "$as_me:4742: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4693: \"$ac_try\"") >&5 + { (eval echo "$as_me:4745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4696: \$? = $ac_status" >&5 + echo "$as_me:4748: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -4704,7 +4756,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4707: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:4759: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -4714,7 +4766,7 @@ EOF fi -echo "$as_me:4717: checking if you want to use pkg-config" >&5 +echo "$as_me:4769: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -4724,7 +4776,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:4727: result: $cf_pkg_config" >&5 +echo "$as_me:4779: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in @@ -4736,7 +4788,7 @@ case $cf_pkg_config in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:4739: checking for $ac_word" >&5 +echo "$as_me:4791: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4753,7 +4805,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4756: found $ac_dir/$ac_word" >&5 + echo "$as_me:4808: found $ac_dir/$ac_word" >&5 break fi done @@ -4764,10 +4816,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:4767: result: $PKG_CONFIG" >&5 + echo "$as_me:4819: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:4770: result: no" >&5 + echo "$as_me:4822: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4776,7 +4828,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:4779: checking for $ac_word" >&5 +echo "$as_me:4831: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4793,7 +4845,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4796: found $ac_dir/$ac_word" >&5 + echo "$as_me:4848: found $ac_dir/$ac_word" >&5 break fi done @@ -4805,10 +4857,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:4808: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:4860: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:4811: result: no" >&5 + echo "$as_me:4863: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4851,18 +4903,18 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4854: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:4906: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:4861: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:4913: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:4865: checking if you want to see long compiling messages" >&5 +echo "$as_me:4917: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -4896,10 +4948,10 @@ else ECHO_CC='' fi; -echo "$as_me:4899: result: $enableval" >&5 +echo "$as_me:4951: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:4902: checking for ncurses wrap-prefix" >&5 +echo "$as_me:4954: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -4909,10 +4961,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:4912: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:4964: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:4915: checking if you want to check for wide-character functions" >&5 +echo "$as_me:4967: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -4929,10 +4981,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:4932: result: $cf_enable_widec" >&5 +echo "$as_me:4984: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:4935: checking for specific curses-directory" >&5 +echo "$as_me:4987: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4942,7 +4994,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4945: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4997: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) @@ -4973,7 +5025,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4976: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:5028: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5006,7 +5058,7 @@ if test -n "$cf_cv_curses_dir/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 5009 "configure" +#line 5061 "configure" #include "confdefs.h" #include int @@ -5018,16 +5070,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5021: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5073: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5024: \$? = $ac_status" >&5 + echo "$as_me:5076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5027: \"$ac_try\"") >&5 + { (eval echo "$as_me:5079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5030: \$? = $ac_status" >&5 + echo "$as_me:5082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5044,7 +5096,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5047: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5099: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5080,7 +5132,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5083: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5135: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5093,7 +5145,7 @@ fi cf_cv_screen=curses -echo "$as_me:5096: checking for specified curses library type" >&5 +echo "$as_me:5148: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -5137,13 +5189,13 @@ fi; fi; fi; -echo "$as_me:5140: result: $cf_cv_screen" >&5 +echo "$as_me:5192: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:5146: checking for extra include directories" >&5 +echo "$as_me:5198: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5169,11 +5221,11 @@ case $host_os in esac fi -echo "$as_me:5172: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:5224: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" -echo "$as_me:5176: checking if we have identified curses headers" >&5 +echo "$as_me:5228: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5185,7 +5237,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 5188 "configure" +#line 5240 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5197,16 +5249,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5200: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5252: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5203: \$? = $ac_status" >&5 + echo "$as_me:5255: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5206: \"$ac_try\"") >&5 + { (eval echo "$as_me:5258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5209: \$? = $ac_status" >&5 + echo "$as_me:5261: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5217,11 +5269,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5220: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5272: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:5224: error: No curses header-files found" >&5 + { { echo "$as_me:5276: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5231,23 +5283,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5234: checking for $ac_header" >&5 +echo "$as_me:5286: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5240 "configure" +#line 5292 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5244: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5296: \"$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:5250: \$? = $ac_status" >&5 + echo "$as_me:5302: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5266,7 +5318,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5269: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5321: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5331: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5294,7 +5346,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 5297 "configure" +#line 5349 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5309,16 +5361,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5312: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5364: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5315: \$? = $ac_status" >&5 + echo "$as_me:5367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5318: \"$ac_try\"") >&5 + { (eval echo "$as_me:5370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5321: \$? = $ac_status" >&5 + echo "$as_me:5373: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -5334,7 +5386,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5337: result: $cf_cv_term_header" >&5 +echo "$as_me:5389: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5366,7 +5418,7 @@ EOF ;; esac -echo "$as_me:5369: checking for ncurses version" >&5 +echo "$as_me:5421: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5392,10 +5444,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5395: \"$cf_try\"") >&5 + { (eval echo "$as_me:5447: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5398: \$? = $ac_status" >&5 + echo "$as_me:5450: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -5405,7 +5457,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 5408 "configure" +#line 5460 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5430,15 +5482,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5436: \$? = $ac_status" >&5 + echo "$as_me:5488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5438: \"$ac_try\"") >&5 + { (eval echo "$as_me:5490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5441: \$? = $ac_status" >&5 + echo "$as_me:5493: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5452,17 +5504,17 @@ fi rm -f $cf_tempfile fi -echo "$as_me:5455: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:5507: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5462: checking if we have identified curses libraries" >&5 +echo "$as_me:5514: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5465 "configure" +#line 5517 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5474,16 +5526,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5477: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5529: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5480: \$? = $ac_status" >&5 + echo "$as_me:5532: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5483: \"$ac_try\"") >&5 + { (eval echo "$as_me:5535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5486: \$? = $ac_status" >&5 + echo "$as_me:5538: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5492,13 +5544,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:5495: result: $cf_result" >&5 +echo "$as_me:5547: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in (freebsd*) - echo "$as_me:5501: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:5553: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5506,7 +5558,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5509 "configure" +#line 5561 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5525,16 +5577,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5528: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5580: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5531: \$? = $ac_status" >&5 + echo "$as_me:5583: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5534: \"$ac_try\"") >&5 + { (eval echo "$as_me:5586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5537: \$? = $ac_status" >&5 + echo "$as_me:5589: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -5545,7 +5597,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5548: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:5600: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then @@ -5575,7 +5627,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:5578: checking for initscr in -lcur_colr" >&5 + echo "$as_me:5630: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5583,7 +5635,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5586 "configure" +#line 5638 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5602,16 +5654,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5657: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5608: \$? = $ac_status" >&5 + echo "$as_me:5660: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5611: \"$ac_try\"") >&5 + { (eval echo "$as_me:5663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5614: \$? = $ac_status" >&5 + echo "$as_me:5666: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -5622,7 +5674,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5625: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:5677: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -5646,7 +5698,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:5649: checking for initscr in -lHcurses" >&5 + echo "$as_me:5701: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5654,7 +5706,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5657 "configure" +#line 5709 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5673,16 +5725,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5676: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5728: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5679: \$? = $ac_status" >&5 + echo "$as_me:5731: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5682: \"$ac_try\"") >&5 + { (eval echo "$as_me:5734: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5685: \$? = $ac_status" >&5 + echo "$as_me:5737: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -5693,7 +5745,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5696: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:5748: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -5749,7 +5801,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5752: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5804: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5778,7 +5830,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5781: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5833: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5809,7 +5861,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5812: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5864: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5844,7 +5896,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5847: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5899: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5888,13 +5940,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:5891: checking for tgoto" >&5 + echo "$as_me:5943: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5897 "configure" +#line 5949 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -5925,16 +5977,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5928: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5931: \$? = $ac_status" >&5 + echo "$as_me:5983: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5934: \"$ac_try\"") >&5 + { (eval echo "$as_me:5986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5937: \$? = $ac_status" >&5 + echo "$as_me:5989: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -5944,7 +5996,7 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5947: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:5999: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined @@ -5953,7 +6005,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:5956: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:6008: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5961,7 +6013,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5964 "configure" +#line 6016 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5980,16 +6032,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5983: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5986: \$? = $ac_status" >&5 + echo "$as_me:6038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5989: \"$ac_try\"") >&5 + { (eval echo "$as_me:6041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5992: \$? = $ac_status" >&5 + echo "$as_me:6044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -6000,7 +6052,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6003: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:6055: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break @@ -6019,11 +6071,11 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown do LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - echo "$as_me:6023: checking if we can link with $cf_curs_lib library" >&5 + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then + echo "$as_me:6075: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6026 "configure" +#line 6078 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6035,16 +6087,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6038: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6090: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6041: \$? = $ac_status" >&5 + echo "$as_me:6093: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6044: \"$ac_try\"") >&5 + { (eval echo "$as_me:6096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6047: \$? = $ac_status" >&5 + echo "$as_me:6099: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -6053,16 +6105,16 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6056: result: $cf_result" >&5 + echo "$as_me:6108: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:6062: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:6114: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6065 "configure" +#line 6117 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6074,16 +6126,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6077: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6129: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6080: \$? = $ac_status" >&5 + echo "$as_me:6132: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6083: \"$ac_try\"") >&5 + { (eval echo "$as_me:6135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6086: \$? = $ac_status" >&5 + echo "$as_me:6138: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -6092,7 +6144,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6095 "configure" +#line 6147 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6104,16 +6156,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6107: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6110: \$? = $ac_status" >&5 + echo "$as_me:6162: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6113: \"$ac_try\"") >&5 + { (eval echo "$as_me:6165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6116: \$? = $ac_status" >&5 + echo "$as_me:6168: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -6125,13 +6177,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6128: result: $cf_result" >&5 + echo "$as_me:6180: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result != error && break fi done fi - test $cf_curs_lib = unknown && { { echo "$as_me:6134: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:6186: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -6140,7 +6192,7 @@ fi ;; (ncursesw*) -echo "$as_me:6143: checking for multibyte character support" >&5 +echo "$as_me:6195: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6148,7 +6200,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6151 "configure" +#line 6203 "configure" #include "confdefs.h" #include @@ -6161,16 +6213,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6164: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6167: \$? = $ac_status" >&5 + echo "$as_me:6219: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6170: \"$ac_try\"") >&5 + { (eval echo "$as_me:6222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6173: \$? = $ac_status" >&5 + echo "$as_me:6225: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -6182,12 +6234,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6185: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6237: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6190 "configure" +#line 6242 "configure" #include "confdefs.h" #include @@ -6200,16 +6252,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6203: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6206: \$? = $ac_status" >&5 + echo "$as_me:6258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6209: \"$ac_try\"") >&5 + { (eval echo "$as_me:6261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6212: \$? = $ac_status" >&5 + echo "$as_me:6264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -6223,7 +6275,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6226 "configure" +#line 6278 "configure" #include "confdefs.h" #include @@ -6236,16 +6288,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6291: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6242: \$? = $ac_status" >&5 + echo "$as_me:6294: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6245: \"$ac_try\"") >&5 + { (eval echo "$as_me:6297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6248: \$? = $ac_status" >&5 + echo "$as_me:6300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -6262,9 +6314,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6265: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:6317: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6267: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6319: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6355,11 +6407,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6358: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6410: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 6362 "configure" +#line 6414 "configure" #include "confdefs.h" #include @@ -6372,21 +6424,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6375: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6427: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6378: \$? = $ac_status" >&5 + echo "$as_me:6430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6381: \"$ac_try\"") >&5 + { (eval echo "$as_me:6433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6384: \$? = $ac_status" >&5 + echo "$as_me:6436: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6389: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6441: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6404,7 +6456,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6407: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6459: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6479,13 +6531,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:6482: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6534: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 6488 "configure" +#line 6540 "configure" #include "confdefs.h" #include @@ -6498,21 +6550,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6501: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6553: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6504: \$? = $ac_status" >&5 + echo "$as_me:6556: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6507: \"$ac_try\"") >&5 + { (eval echo "$as_me:6559: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6510: \$? = $ac_status" >&5 + echo "$as_me:6562: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:6515: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6567: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -6554,7 +6606,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6557: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:6609: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -6589,7 +6641,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6592 "configure" +#line 6644 "configure" #include "confdefs.h" #include int @@ -6601,16 +6653,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6656: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6607: \$? = $ac_status" >&5 + echo "$as_me:6659: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6610: \"$ac_try\"") >&5 + { (eval echo "$as_me:6662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6613: \$? = $ac_status" >&5 + echo "$as_me:6665: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6627,7 +6679,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6630: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6682: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6663,7 +6715,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6666: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6718: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6693,13 +6745,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:6696: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:6748: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:6699: result: yes" >&5 + echo "$as_me:6751: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:6702: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:6754: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -6725,7 +6777,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 6728 "configure" +#line 6780 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6737,37 +6789,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6740: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6792: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6743: \$? = $ac_status" >&5 + echo "$as_me:6795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6746: \"$ac_try\"") >&5 + { (eval echo "$as_me:6798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6749: \$? = $ac_status" >&5 + echo "$as_me:6801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 6755 "configure" +#line 6807 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6762: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6814: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6765: \$? = $ac_status" >&5 + echo "$as_me:6817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6767: \"$ac_try\"") >&5 + { (eval echo "$as_me:6819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6770: \$? = $ac_status" >&5 + echo "$as_me:6822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_ncuconfig=yes else @@ -6784,7 +6836,7 @@ cat conftest.$ac_ext >&5 cf_have_ncuconfig=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6787: result: $cf_have_ncuconfig" >&5 + echo "$as_me:6839: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -6801,7 +6853,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root fi -echo "$as_me:6804: checking for terminfo header" >&5 +echo "$as_me:6856: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6819,7 +6871,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 6822 "configure" +#line 6874 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6834,16 +6886,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6889: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6840: \$? = $ac_status" >&5 + echo "$as_me:6892: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6843: \"$ac_try\"") >&5 + { (eval echo "$as_me:6895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6846: \$? = $ac_status" >&5 + echo "$as_me:6898: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -6859,7 +6911,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:6862: result: $cf_cv_term_header" >&5 +echo "$as_me:6914: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6892,7 +6944,7 @@ EOF esac else - echo "$as_me:6895: result: no" >&5 + echo "$as_me:6947: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -6908,7 +6960,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:6911: checking for $ac_word" >&5 +echo "$as_me:6963: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6923,7 +6975,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:6926: found $ac_dir/$ac_word" >&5 +echo "$as_me:6978: found $ac_dir/$ac_word" >&5 break done @@ -6931,10 +6983,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:6934: result: $NCURSES_CONFIG" >&5 + echo "$as_me:6986: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:6937: result: no" >&5 + echo "$as_me:6989: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6947,7 +6999,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:6950: checking for $ac_word" >&5 +echo "$as_me:7002: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6962,7 +7014,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:6965: found $ac_dir/$ac_word" >&5 +echo "$as_me:7017: found $ac_dir/$ac_word" >&5 break done @@ -6970,10 +7022,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:6973: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7025: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:6976: result: no" >&5 + echo "$as_me:7028: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7006,7 +7058,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:7009: checking if we have identified curses headers" >&5 +echo "$as_me:7061: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7018,7 +7070,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 7021 "configure" +#line 7073 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -7030,16 +7082,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7033: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7085: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7036: \$? = $ac_status" >&5 + echo "$as_me:7088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7039: \"$ac_try\"") >&5 + { (eval echo "$as_me:7091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7042: \$? = $ac_status" >&5 + echo "$as_me:7094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -7050,11 +7102,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7053: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:7105: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:7057: error: No curses header-files found" >&5 + { { echo "$as_me:7109: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -7064,23 +7116,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7067: checking for $ac_header" >&5 +echo "$as_me:7119: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7073 "configure" +#line 7125 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7077: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7129: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7083: \$? = $ac_status" >&5 + echo "$as_me:7135: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7099,7 +7151,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7102: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:7154: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 7155 "configure" +#line 7207 "configure" #include "confdefs.h" #include int @@ -7164,16 +7216,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7167: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7219: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7170: \$? = $ac_status" >&5 + echo "$as_me:7222: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7173: \"$ac_try\"") >&5 + { (eval echo "$as_me:7225: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7176: \$? = $ac_status" >&5 + echo "$as_me:7228: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7190,7 +7242,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7193: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7245: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7209,7 +7261,7 @@ fi } -echo "$as_me:7212: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:7264: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7221,7 +7273,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 7224 "configure" +#line 7276 "configure" #include "confdefs.h" #include <$cf_header> @@ -7245,16 +7297,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7300: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7251: \$? = $ac_status" >&5 + echo "$as_me:7303: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7254: \"$ac_try\"") >&5 + { (eval echo "$as_me:7306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7257: \$? = $ac_status" >&5 + echo "$as_me:7309: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -7269,14 +7321,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7272: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:7324: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:7279: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:7331: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7394,7 +7446,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 7397 "configure" +#line 7449 "configure" #include "confdefs.h" #include int @@ -7406,16 +7458,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7409: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7412: \$? = $ac_status" >&5 + echo "$as_me:7464: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7415: \"$ac_try\"") >&5 + { (eval echo "$as_me:7467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7418: \$? = $ac_status" >&5 + echo "$as_me:7470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7432,7 +7484,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7435: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7487: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7455,7 +7507,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 7458 "configure" +#line 7510 "configure" #include "confdefs.h" #include <$cf_header> @@ -7479,16 +7531,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7482: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7485: \$? = $ac_status" >&5 + echo "$as_me:7537: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7488: \"$ac_try\"") >&5 + { (eval echo "$as_me:7540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7491: \$? = $ac_status" >&5 + echo "$as_me:7543: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -7509,12 +7561,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7512: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7564: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:7517: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:7569: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -7547,7 +7599,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 7550 "configure" +#line 7602 "configure" #include "confdefs.h" #include int @@ -7559,16 +7611,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7562: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7614: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7565: \$? = $ac_status" >&5 + echo "$as_me:7617: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7568: \"$ac_try\"") >&5 + { (eval echo "$as_me:7620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7571: \$? = $ac_status" >&5 + echo "$as_me:7623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7585,7 +7637,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7588: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7640: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7633,7 +7685,7 @@ EOF ;; esac -echo "$as_me:7636: checking for terminfo header" >&5 +echo "$as_me:7688: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7651,7 +7703,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 7654 "configure" +#line 7706 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7666,16 +7718,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7669: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7721: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7672: \$? = $ac_status" >&5 + echo "$as_me:7724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7675: \"$ac_try\"") >&5 + { (eval echo "$as_me:7727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7678: \$? = $ac_status" >&5 + echo "$as_me:7730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -7691,7 +7743,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7694: result: $cf_cv_term_header" >&5 +echo "$as_me:7746: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7729,7 +7781,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:7732: checking for ncurses version" >&5 +echo "$as_me:7784: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7755,10 +7807,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:7758: \"$cf_try\"") >&5 + { (eval echo "$as_me:7810: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7761: \$? = $ac_status" >&5 + echo "$as_me:7813: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -7768,7 +7820,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 7771 "configure" +#line 7823 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -7793,15 +7845,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7796: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7848: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7799: \$? = $ac_status" >&5 + echo "$as_me:7851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7801: \"$ac_try\"") >&5 + { (eval echo "$as_me:7853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7804: \$? = $ac_status" >&5 + echo "$as_me:7856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7815,7 +7867,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:7818: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:7870: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -7828,7 +7880,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:7831: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:7883: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7836,7 +7888,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7839 "configure" +#line 7891 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7855,16 +7907,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7858: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7910: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7861: \$? = $ac_status" >&5 + echo "$as_me:7913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7864: \"$ac_try\"") >&5 + { (eval echo "$as_me:7916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7867: \$? = $ac_status" >&5 + echo "$as_me:7919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -7875,10 +7927,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7878: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:7930: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:7881: checking for initscr in -lgpm" >&5 + echo "$as_me:7933: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7886,7 +7938,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7889 "configure" +#line 7941 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7905,16 +7957,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7908: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7960: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7911: \$? = $ac_status" >&5 + echo "$as_me:7963: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7914: \"$ac_try\"") >&5 + { (eval echo "$as_me:7966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7917: \$? = $ac_status" >&5 + echo "$as_me:7969: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -7925,7 +7977,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7928: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:7980: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -7940,7 +7992,7 @@ case $host_os in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:7943: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:7995: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7948,7 +8000,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7951 "configure" +#line 8003 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7967,16 +8019,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7970: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8022: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7973: \$? = $ac_status" >&5 + echo "$as_me:8025: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7976: \"$ac_try\"") >&5 + { (eval echo "$as_me:8028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7979: \$? = $ac_status" >&5 + echo "$as_me:8031: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -7987,7 +8039,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7990: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:8042: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -8036,13 +8088,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:8039: checking for initscr" >&5 + echo "$as_me:8091: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8045 "configure" +#line 8097 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -8073,16 +8125,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8128: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8079: \$? = $ac_status" >&5 + echo "$as_me:8131: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8082: \"$ac_try\"") >&5 + { (eval echo "$as_me:8134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8085: \$? = $ac_status" >&5 + echo "$as_me:8137: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -8092,18 +8144,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8095: result: $ac_cv_func_initscr" >&5 +echo "$as_me:8147: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:8102: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:8154: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8106 "configure" +#line 8158 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8115,25 +8167,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8170: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8121: \$? = $ac_status" >&5 + echo "$as_me:8173: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8124: \"$ac_try\"") >&5 + { (eval echo "$as_me:8176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8127: \$? = $ac_status" >&5 + echo "$as_me:8179: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8129: result: yes" >&5 + echo "$as_me:8181: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8136: result: no" >&5 +echo "$as_me:8188: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -8201,11 +8253,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:8204: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:8256: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8208 "configure" +#line 8260 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8217,25 +8269,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8220: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8223: \$? = $ac_status" >&5 + echo "$as_me:8275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8226: \"$ac_try\"") >&5 + { (eval echo "$as_me:8278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8229: \$? = $ac_status" >&5 + echo "$as_me:8281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8231: result: yes" >&5 + echo "$as_me:8283: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8238: result: no" >&5 +echo "$as_me:8290: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -8250,7 +8302,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:8253: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:8305: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -8258,7 +8310,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:8261: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:8313: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -8268,7 +8320,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 8271 "configure" +#line 8323 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8280,23 +8332,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8283: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8286: \$? = $ac_status" >&5 + echo "$as_me:8338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8289: \"$ac_try\"") >&5 + { (eval echo "$as_me:8341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8292: \$? = $ac_status" >&5 + echo "$as_me:8344: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8294: result: yes" >&5 + echo "$as_me:8346: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8299: result: no" >&5 +echo "$as_me:8351: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -8321,13 +8373,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8324: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8376: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:8327: result: yes" >&5 + echo "$as_me:8379: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8330: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8382: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -8353,7 +8405,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 8356 "configure" +#line 8408 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8365,37 +8417,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8368: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8420: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8371: \$? = $ac_status" >&5 + echo "$as_me:8423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8374: \"$ac_try\"") >&5 + { (eval echo "$as_me:8426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8377: \$? = $ac_status" >&5 + echo "$as_me:8429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 8383 "configure" +#line 8435 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8390: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8442: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8393: \$? = $ac_status" >&5 + echo "$as_me:8445: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8395: \"$ac_try\"") >&5 + { (eval echo "$as_me:8447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8398: \$? = $ac_status" >&5 + echo "$as_me:8450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_ncuconfig=yes else @@ -8412,7 +8464,7 @@ cat conftest.$ac_ext >&5 cf_have_ncuconfig=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:8415: result: $cf_have_ncuconfig" >&5 + echo "$as_me:8467: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -8429,7 +8481,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root fi -echo "$as_me:8432: checking for terminfo header" >&5 +echo "$as_me:8484: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8447,7 +8499,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 8450 "configure" +#line 8502 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8462,16 +8514,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8468: \$? = $ac_status" >&5 + echo "$as_me:8520: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8471: \"$ac_try\"") >&5 + { (eval echo "$as_me:8523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8474: \$? = $ac_status" >&5 + echo "$as_me:8526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -8487,7 +8539,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8490: result: $cf_cv_term_header" >&5 +echo "$as_me:8542: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8520,7 +8572,7 @@ EOF esac else - echo "$as_me:8523: result: no" >&5 + echo "$as_me:8575: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8536,7 +8588,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:8539: checking for $ac_word" >&5 +echo "$as_me:8591: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8551,7 +8603,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:8554: found $ac_dir/$ac_word" >&5 +echo "$as_me:8606: found $ac_dir/$ac_word" >&5 break done @@ -8559,10 +8611,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8562: result: $NCURSES_CONFIG" >&5 + echo "$as_me:8614: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:8565: result: no" >&5 + echo "$as_me:8617: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8575,7 +8627,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:8578: checking for $ac_word" >&5 +echo "$as_me:8630: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8590,7 +8642,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:8593: found $ac_dir/$ac_word" >&5 +echo "$as_me:8645: found $ac_dir/$ac_word" >&5 break done @@ -8598,10 +8650,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:8601: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:8653: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:8604: result: no" >&5 + echo "$as_me:8656: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8634,7 +8686,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8637: checking if we have identified curses headers" >&5 +echo "$as_me:8689: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8646,7 +8698,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 8649 "configure" +#line 8701 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8658,16 +8710,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8664: \$? = $ac_status" >&5 + echo "$as_me:8716: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8667: \"$ac_try\"") >&5 + { (eval echo "$as_me:8719: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8670: \$? = $ac_status" >&5 + echo "$as_me:8722: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8678,11 +8730,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8681: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8733: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:8685: error: No curses header-files found" >&5 + { { echo "$as_me:8737: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8692,23 +8744,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8695: checking for $ac_header" >&5 +echo "$as_me:8747: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8701 "configure" +#line 8753 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8705: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8757: \"$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:8711: \$? = $ac_status" >&5 + echo "$as_me:8763: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8727,7 +8779,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8730: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8782: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 8783 "configure" +#line 8835 "configure" #include "confdefs.h" #include int @@ -8792,16 +8844,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8795: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8798: \$? = $ac_status" >&5 + echo "$as_me:8850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8801: \"$ac_try\"") >&5 + { (eval echo "$as_me:8853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8804: \$? = $ac_status" >&5 + echo "$as_me:8856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8818,7 +8870,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8821: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8837,7 +8889,7 @@ fi } -echo "$as_me:8840: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8892: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8849,7 +8901,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 8852 "configure" +#line 8904 "configure" #include "confdefs.h" #include <$cf_header> @@ -8873,16 +8925,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8876: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8879: \$? = $ac_status" >&5 + echo "$as_me:8931: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8882: \"$ac_try\"") >&5 + { (eval echo "$as_me:8934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8885: \$? = $ac_status" >&5 + echo "$as_me:8937: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -8897,14 +8949,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8900: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8952: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:8907: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8959: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9022,7 +9074,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9025 "configure" +#line 9077 "configure" #include "confdefs.h" #include int @@ -9034,16 +9086,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9037: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9040: \$? = $ac_status" >&5 + echo "$as_me:9092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9043: \"$ac_try\"") >&5 + { (eval echo "$as_me:9095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9046: \$? = $ac_status" >&5 + echo "$as_me:9098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9060,7 +9112,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9063: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9115: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9083,7 +9135,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 9086 "configure" +#line 9138 "configure" #include "confdefs.h" #include <$cf_header> @@ -9107,16 +9159,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9162: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9113: \$? = $ac_status" >&5 + echo "$as_me:9165: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9116: \"$ac_try\"") >&5 + { (eval echo "$as_me:9168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9119: \$? = $ac_status" >&5 + echo "$as_me:9171: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9137,12 +9189,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9140: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9192: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9145: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9197: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -9175,7 +9227,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9178 "configure" +#line 9230 "configure" #include "confdefs.h" #include int @@ -9187,16 +9239,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9190: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9193: \$? = $ac_status" >&5 + echo "$as_me:9245: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9196: \"$ac_try\"") >&5 + { (eval echo "$as_me:9248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9199: \$? = $ac_status" >&5 + echo "$as_me:9251: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9213,7 +9265,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9216: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9268: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9261,7 +9313,7 @@ EOF ;; esac -echo "$as_me:9264: checking for terminfo header" >&5 +echo "$as_me:9316: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9279,7 +9331,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 9282 "configure" +#line 9334 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9294,16 +9346,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9297: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9349: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9300: \$? = $ac_status" >&5 + echo "$as_me:9352: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9303: \"$ac_try\"") >&5 + { (eval echo "$as_me:9355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9306: \$? = $ac_status" >&5 + echo "$as_me:9358: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -9319,7 +9371,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:9322: result: $cf_cv_term_header" >&5 +echo "$as_me:9374: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9357,7 +9409,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9360: checking for ncurses version" >&5 +echo "$as_me:9412: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9383,10 +9435,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9386: \"$cf_try\"") >&5 + { (eval echo "$as_me:9438: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9389: \$? = $ac_status" >&5 + echo "$as_me:9441: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -9396,7 +9448,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 9399 "configure" +#line 9451 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -9421,15 +9473,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9424: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9476: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9427: \$? = $ac_status" >&5 + echo "$as_me:9479: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9429: \"$ac_try\"") >&5 + { (eval echo "$as_me:9481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9432: \$? = $ac_status" >&5 + echo "$as_me:9484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9443,7 +9495,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:9446: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:9498: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9456,7 +9508,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9459: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:9511: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9464,7 +9516,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9467 "configure" +#line 9519 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9483,16 +9535,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9538: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9489: \$? = $ac_status" >&5 + echo "$as_me:9541: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9492: \"$ac_try\"") >&5 + { (eval echo "$as_me:9544: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9495: \$? = $ac_status" >&5 + echo "$as_me:9547: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -9503,10 +9555,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9506: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:9558: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:9509: checking for initscr in -lgpm" >&5 + echo "$as_me:9561: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9514,7 +9566,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9517 "configure" +#line 9569 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9533,16 +9585,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9588: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9539: \$? = $ac_status" >&5 + echo "$as_me:9591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9542: \"$ac_try\"") >&5 + { (eval echo "$as_me:9594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9545: \$? = $ac_status" >&5 + echo "$as_me:9597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -9553,7 +9605,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9556: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:9608: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -9568,7 +9620,7 @@ case $host_os in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:9571: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9623: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9576,7 +9628,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9579 "configure" +#line 9631 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9595,16 +9647,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9650: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9601: \$? = $ac_status" >&5 + echo "$as_me:9653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9604: \"$ac_try\"") >&5 + { (eval echo "$as_me:9656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9607: \$? = $ac_status" >&5 + echo "$as_me:9659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9615,7 +9667,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9618: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9670: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -9664,13 +9716,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:9667: checking for initscr" >&5 + echo "$as_me:9719: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9673 "configure" +#line 9725 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -9701,16 +9753,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9756: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9707: \$? = $ac_status" >&5 + echo "$as_me:9759: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9710: \"$ac_try\"") >&5 + { (eval echo "$as_me:9762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9713: \$? = $ac_status" >&5 + echo "$as_me:9765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -9720,18 +9772,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9723: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9775: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:9730: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9782: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9734 "configure" +#line 9786 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9743,25 +9795,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9746: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9749: \$? = $ac_status" >&5 + echo "$as_me:9801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9752: \"$ac_try\"") >&5 + { (eval echo "$as_me:9804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9755: \$? = $ac_status" >&5 + echo "$as_me:9807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9757: result: yes" >&5 + echo "$as_me:9809: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9764: result: no" >&5 +echo "$as_me:9816: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9829,11 +9881,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9832: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9884: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9836 "configure" +#line 9888 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9845,25 +9897,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9848: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9851: \$? = $ac_status" >&5 + echo "$as_me:9903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9854: \"$ac_try\"") >&5 + { (eval echo "$as_me:9906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9857: \$? = $ac_status" >&5 + echo "$as_me:9909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9859: result: yes" >&5 + echo "$as_me:9911: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9866: result: no" >&5 +echo "$as_me:9918: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9878,7 +9930,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:9881: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9933: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9886,7 +9938,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9889: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9941: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -9896,7 +9948,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 9899 "configure" +#line 9951 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9908,23 +9960,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9911: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9963: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9914: \$? = $ac_status" >&5 + echo "$as_me:9966: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9917: \"$ac_try\"") >&5 + { (eval echo "$as_me:9969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9920: \$? = $ac_status" >&5 + echo "$as_me:9972: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9922: result: yes" >&5 + echo "$as_me:9974: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9927: result: no" >&5 +echo "$as_me:9979: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9944,7 +9996,7 @@ fi ;; (pdcurses) - echo "$as_me:9947: checking for X" >&5 + echo "$as_me:9999: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -10041,17 +10093,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 10044 "configure" +#line 10096 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:10048: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10100: \"$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:10054: \$? = $ac_status" >&5 + echo "$as_me:10106: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10084,7 +10136,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10087 "configure" +#line 10139 "configure" #include "confdefs.h" #include int @@ -10096,16 +10148,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10099: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10102: \$? = $ac_status" >&5 + echo "$as_me:10154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10105: \"$ac_try\"") >&5 + { (eval echo "$as_me:10157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10108: \$? = $ac_status" >&5 + echo "$as_me:10160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -10143,7 +10195,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:10146: result: $have_x" >&5 + echo "$as_me:10198: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -10153,7 +10205,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:10156: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:10208: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -10177,11 +10229,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:10180: checking whether -R must be followed by a space" >&5 + echo "$as_me:10232: 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 10184 "configure" +#line 10236 "configure" #include "confdefs.h" int @@ -10193,16 +10245,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10248: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10199: \$? = $ac_status" >&5 + echo "$as_me:10251: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10202: \"$ac_try\"") >&5 + { (eval echo "$as_me:10254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10205: \$? = $ac_status" >&5 + echo "$as_me:10257: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -10212,13 +10264,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:10215: result: no" >&5 + echo "$as_me:10267: 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 10221 "configure" +#line 10273 "configure" #include "confdefs.h" int @@ -10230,16 +10282,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10285: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10236: \$? = $ac_status" >&5 + echo "$as_me:10288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10239: \"$ac_try\"") >&5 + { (eval echo "$as_me:10291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10242: \$? = $ac_status" >&5 + echo "$as_me:10294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -10249,11 +10301,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:10252: result: yes" >&5 + echo "$as_me:10304: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:10256: result: neither works" >&5 + echo "$as_me:10308: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -10273,7 +10325,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 10276 "configure" +#line 10328 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10292,22 +10344,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10347: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10298: \$? = $ac_status" >&5 + echo "$as_me:10350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10301: \"$ac_try\"") >&5 + { (eval echo "$as_me:10353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10304: \$? = $ac_status" >&5 + echo "$as_me:10356: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10310: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:10362: 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 @@ -10315,7 +10367,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10318 "configure" +#line 10370 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10334,16 +10386,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10337: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10389: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10340: \$? = $ac_status" >&5 + echo "$as_me:10392: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10343: \"$ac_try\"") >&5 + { (eval echo "$as_me:10395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10346: \$? = $ac_status" >&5 + echo "$as_me:10398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -10354,14 +10406,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10357: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:10409: 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:10364: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:10416: 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 @@ -10369,7 +10421,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10372 "configure" +#line 10424 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10388,16 +10440,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10391: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10443: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10394: \$? = $ac_status" >&5 + echo "$as_me:10446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10397: \"$ac_try\"") >&5 + { (eval echo "$as_me:10449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10400: \$? = $ac_status" >&5 + echo "$as_me:10452: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -10408,7 +10460,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10411: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:10463: 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" @@ -10427,13 +10479,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:10430: checking for gethostbyname" >&5 + echo "$as_me:10482: 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 10436 "configure" +#line 10488 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -10464,16 +10516,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10467: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10519: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10470: \$? = $ac_status" >&5 + echo "$as_me:10522: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10473: \"$ac_try\"") >&5 + { (eval echo "$as_me:10525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10476: \$? = $ac_status" >&5 + echo "$as_me:10528: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -10483,11 +10535,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10486: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:10538: 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:10490: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:10542: 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 @@ -10495,7 +10547,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10498 "configure" +#line 10550 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10514,16 +10566,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10569: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10520: \$? = $ac_status" >&5 + echo "$as_me:10572: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10523: \"$ac_try\"") >&5 + { (eval echo "$as_me:10575: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10526: \$? = $ac_status" >&5 + echo "$as_me:10578: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -10534,14 +10586,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10537: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:10589: 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:10544: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:10596: 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 @@ -10549,7 +10601,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10552 "configure" +#line 10604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10568,16 +10620,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10571: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10574: \$? = $ac_status" >&5 + echo "$as_me:10626: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10577: \"$ac_try\"") >&5 + { (eval echo "$as_me:10629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10580: \$? = $ac_status" >&5 + echo "$as_me:10632: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -10588,7 +10640,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10591: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:10643: 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" @@ -10604,13 +10656,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:10607: checking for connect" >&5 + echo "$as_me:10659: 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 10613 "configure" +#line 10665 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -10641,16 +10693,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10696: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10647: \$? = $ac_status" >&5 + echo "$as_me:10699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10650: \"$ac_try\"") >&5 + { (eval echo "$as_me:10702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10653: \$? = $ac_status" >&5 + echo "$as_me:10705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -10660,11 +10712,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10663: result: $ac_cv_func_connect" >&5 +echo "$as_me:10715: 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:10667: checking for connect in -lsocket" >&5 + echo "$as_me:10719: 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 @@ -10672,7 +10724,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10675 "configure" +#line 10727 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10691,16 +10743,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10694: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10746: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10697: \$? = $ac_status" >&5 + echo "$as_me:10749: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10700: \"$ac_try\"") >&5 + { (eval echo "$as_me:10752: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10703: \$? = $ac_status" >&5 + echo "$as_me:10755: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -10711,7 +10763,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10714: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:10766: 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" @@ -10720,13 +10772,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:10723: checking for remove" >&5 + echo "$as_me:10775: 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 10729 "configure" +#line 10781 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -10757,16 +10809,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10760: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10763: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10766: \"$ac_try\"") >&5 + { (eval echo "$as_me:10818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10769: \$? = $ac_status" >&5 + echo "$as_me:10821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -10776,11 +10828,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10779: result: $ac_cv_func_remove" >&5 +echo "$as_me:10831: 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:10783: checking for remove in -lposix" >&5 + echo "$as_me:10835: 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 @@ -10788,7 +10840,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10791 "configure" +#line 10843 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10807,16 +10859,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10810: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10813: \$? = $ac_status" >&5 + echo "$as_me:10865: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10816: \"$ac_try\"") >&5 + { (eval echo "$as_me:10868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10819: \$? = $ac_status" >&5 + echo "$as_me:10871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -10827,7 +10879,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10830: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:10882: 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" @@ -10836,13 +10888,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:10839: checking for shmat" >&5 + echo "$as_me:10891: 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 10845 "configure" +#line 10897 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -10873,16 +10925,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10876: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10928: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10879: \$? = $ac_status" >&5 + echo "$as_me:10931: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10882: \"$ac_try\"") >&5 + { (eval echo "$as_me:10934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10885: \$? = $ac_status" >&5 + echo "$as_me:10937: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -10892,11 +10944,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10895: result: $ac_cv_func_shmat" >&5 +echo "$as_me:10947: 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:10899: checking for shmat in -lipc" >&5 + echo "$as_me:10951: 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 @@ -10904,7 +10956,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10907 "configure" +#line 10959 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10923,16 +10975,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10929: \$? = $ac_status" >&5 + echo "$as_me:10981: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10932: \"$ac_try\"") >&5 + { (eval echo "$as_me:10984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10935: \$? = $ac_status" >&5 + echo "$as_me:10987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -10943,7 +10995,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10946: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:10998: 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" @@ -10961,7 +11013,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:10964: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:11016: 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 @@ -10969,7 +11021,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10972 "configure" +#line 11024 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10988,16 +11040,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10991: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10994: \$? = $ac_status" >&5 + echo "$as_me:11046: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10997: \"$ac_try\"") >&5 + { (eval echo "$as_me:11049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11000: \$? = $ac_status" >&5 + echo "$as_me:11052: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -11008,7 +11060,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11011: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:11063: 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" @@ -11020,7 +11072,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:11023: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:11075: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -11031,14 +11083,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:11034: result: yes" >&5 + echo "$as_me:11086: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11037: result: no" >&5 + echo "$as_me:11089: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11041: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:11093: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -11049,14 +11101,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:11052: result: yes" >&5 + echo "$as_me:11104: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11055: result: no" >&5 + echo "$as_me:11107: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11059: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:11111: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -11067,14 +11119,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:11070: result: yes" >&5 + echo "$as_me:11122: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11073: result: no" >&5 + echo "$as_me:11125: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11077: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:11129: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -11085,10 +11137,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:11088: result: yes" >&5 + echo "$as_me:11140: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11091: result: no" >&5 + echo "$as_me:11143: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11108,17 +11160,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:11111: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:11163: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11117: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11169: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11121: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11173: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11249,20 +11301,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:11252: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:11304: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:11258: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:11310: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11265 "configure" +#line 11317 "configure" #include "confdefs.h" #include @@ -11278,16 +11330,16 @@ int check = XmuCompareISOLatin1("big", "small") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11281: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11333: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11284: \$? = $ac_status" >&5 + echo "$as_me:11336: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11287: \"$ac_try\"") >&5 + { (eval echo "$as_me:11339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11290: \$? = $ac_status" >&5 + echo "$as_me:11342: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else @@ -11297,7 +11349,7 @@ cf_cv_xaw_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11300: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:11352: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -11309,7 +11361,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:11312: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:11364: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -11317,17 +11369,17 @@ echo "${as_me:-configure}:11312: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:11320: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:11372: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11326: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11378: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11330: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11382: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11447,12 +11499,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11450: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:11502: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11455: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:11507: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -11460,12 +11512,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11463: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:11515: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11468: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:11520: testing ...after $LIBS ..." 1>&5 fi @@ -11476,7 +11528,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:11479: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:11531: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -11501,17 +11553,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:11504: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:11556: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11510: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11562: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11514: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11566: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11632,7 +11684,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:11635: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:11687: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11640,7 +11692,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11643 "configure" +#line 11695 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11659,16 +11711,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11662: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11714: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11665: \$? = $ac_status" >&5 + echo "$as_me:11717: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11668: \"$ac_try\"") >&5 + { (eval echo "$as_me:11720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11671: \$? = $ac_status" >&5 + echo "$as_me:11723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -11679,7 +11731,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11682: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:11734: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then @@ -11715,17 +11767,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:11718: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:11770: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11724: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11776: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11728: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11780: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11845,24 +11897,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:11848: WARNING: unable to find X11 library" >&5 + { echo "$as_me:11900: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:11855: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:11907: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11861: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11913: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11865: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11917: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11982,24 +12034,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:11985: WARNING: unable to find ICE library" >&5 + { echo "$as_me:12037: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:11992: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:12044: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11998: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12050: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12002: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12054: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12119,24 +12171,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:12122: WARNING: unable to find SM library" >&5 + { echo "$as_me:12174: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:12129: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:12181: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12135: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12187: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12139: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12191: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12256,7 +12308,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:12259: WARNING: unable to find Xt library" >&5 + { echo "$as_me:12311: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -12267,17 +12319,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:12270: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:12322: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12276: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12328: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12280: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12332: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12398,14 +12450,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:12401: checking for usable X dependency" >&5 +echo "$as_me:12453: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12408 "configure" +#line 12460 "configure" #include "confdefs.h" #include @@ -12424,16 +12476,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12427: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12430: \$? = $ac_status" >&5 + echo "$as_me:12482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12433: \"$ac_try\"") >&5 + { (eval echo "$as_me:12485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12436: \$? = $ac_status" >&5 + echo "$as_me:12488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -12443,30 +12495,30 @@ cf_cv_xt_x11_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12446: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:12498: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:12452: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:12504: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:12459: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:12511: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12465: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12517: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12469: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12521: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12589,12 +12641,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:12592: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:12644: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:12597: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:12649: testing ...after $LIBS ..." 1>&5 fi @@ -12602,14 +12654,14 @@ fi ;; esac -echo "$as_me:12605: checking for usable X Toolkit package" >&5 +echo "$as_me:12657: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12612 "configure" +#line 12664 "configure" #include "confdefs.h" #include @@ -12624,16 +12676,16 @@ int num = IceConnectionNumber(0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12630: \$? = $ac_status" >&5 + echo "$as_me:12682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12633: \"$ac_try\"") >&5 + { (eval echo "$as_me:12685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12636: \$? = $ac_status" >&5 + echo "$as_me:12688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -12643,7 +12695,7 @@ cf_cv_xt_ice_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12646: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:12698: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -12657,22 +12709,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:12660: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:12712: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:12665: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:12717: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12671: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12723: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12675: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12727: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12791,17 +12843,17 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:12794: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:12846: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12800: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12852: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12804: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12856: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12930,12 +12982,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:12933: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:12985: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:12938: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:12990: testing ...after $LIBS ..." 1>&5 fi @@ -12955,7 +13007,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:12958: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13010: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13040,7 +13092,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13043: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:13095: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13050,7 +13102,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13053: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:13105: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13060,7 +13112,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13063: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:13115: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -13069,7 +13121,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 13072 "configure" +#line 13124 "configure" #include "confdefs.h" #include int @@ -13081,16 +13133,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13084: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13087: \$? = $ac_status" >&5 + echo "$as_me:13139: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13090: \"$ac_try\"") >&5 + { (eval echo "$as_me:13142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13093: \$? = $ac_status" >&5 + echo "$as_me:13145: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13098,12 +13150,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13101: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13153: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13106: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:13158: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -13111,13 +13163,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:13114: checking for XOpenDisplay" >&5 + echo "$as_me:13166: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13120 "configure" +#line 13172 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -13148,16 +13200,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13151: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13203: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13154: \$? = $ac_status" >&5 + echo "$as_me:13206: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13157: \"$ac_try\"") >&5 + { (eval echo "$as_me:13209: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13160: \$? = $ac_status" >&5 + echo "$as_me:13212: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -13167,13 +13219,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13170: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:13222: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$as_me:13176: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:13228: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13181,7 +13233,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13184 "configure" +#line 13236 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13200,16 +13252,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13203: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13206: \$? = $ac_status" >&5 + echo "$as_me:13258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13209: \"$ac_try\"") >&5 + { (eval echo "$as_me:13261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13212: \$? = $ac_status" >&5 + echo "$as_me:13264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -13220,7 +13272,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13223: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:13275: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then @@ -13244,13 +13296,13 @@ fi fi - echo "$as_me:13247: checking for XtAppInitialize" >&5 + echo "$as_me:13299: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13253 "configure" +#line 13305 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -13281,16 +13333,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13284: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13336: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13287: \$? = $ac_status" >&5 + echo "$as_me:13339: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13290: \"$ac_try\"") >&5 + { (eval echo "$as_me:13342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13293: \$? = $ac_status" >&5 + echo "$as_me:13345: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -13300,13 +13352,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13303: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:13355: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$as_me:13309: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:13361: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13314,7 +13366,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13317 "configure" +#line 13369 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13333,16 +13385,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13336: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13388: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13339: \$? = $ac_status" >&5 + echo "$as_me:13391: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13342: \"$ac_try\"") >&5 + { (eval echo "$as_me:13394: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13345: \$? = $ac_status" >&5 + echo "$as_me:13397: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -13353,7 +13405,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13356: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:13408: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then @@ -13370,7 +13422,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:13373: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:13425: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -13392,14 +13444,14 @@ do cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="$cf_save -I$cf_path/include" - echo "$as_me:13395: checking for $cf_test in $cf_path" >&5 + echo "$as_me:13447: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:13398: checking for $cf_test" >&5 + echo "$as_me:13450: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 13402 "configure" +#line 13454 "configure" #include "confdefs.h" #include @@ -13413,16 +13465,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13468: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13419: \$? = $ac_status" >&5 + echo "$as_me:13471: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13422: \"$ac_try\"") >&5 + { (eval echo "$as_me:13474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13425: \$? = $ac_status" >&5 + echo "$as_me:13477: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13431,7 +13483,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:13434: result: $cf_result" >&5 + echo "$as_me:13486: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_inc=$cf_path @@ -13443,7 +13495,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:13446: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:13498: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_inc" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" @@ -13489,7 +13541,7 @@ do done LIBS="$cf_add_libs" - echo "$as_me:13492: checking for $cf_libs in $cf_path" >&5 + echo "$as_me:13544: checking for $cf_libs in $cf_path" >&5 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 else @@ -13509,11 +13561,11 @@ do done LIBS="$cf_add_libs" - echo "$as_me:13512: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:13564: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 13516 "configure" +#line 13568 "configure" #include "confdefs.h" #include @@ -13529,16 +13581,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13532: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13584: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13535: \$? = $ac_status" >&5 + echo "$as_me:13587: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13538: \"$ac_try\"") >&5 + { (eval echo "$as_me:13590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13541: \$? = $ac_status" >&5 + echo "$as_me:13593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13547,7 +13599,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:13550: result: $cf_result" >&5 + echo "$as_me:13602: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_libs" @@ -13561,7 +13613,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:13564: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:13616: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -13579,7 +13631,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:13582: checking for $ac_word" >&5 +echo "$as_me:13634: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13594,7 +13646,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:13597: found $ac_dir/$ac_word" >&5 +echo "$as_me:13649: found $ac_dir/$ac_word" >&5 break done @@ -13602,10 +13654,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:13605: result: $XCURSES_CONFIG" >&5 + echo "$as_me:13657: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:13608: result: no" >&5 + echo "$as_me:13660: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13618,7 +13670,7 @@ if test -z "$XCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:13621: checking for $ac_word" >&5 +echo "$as_me:13673: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13633,7 +13685,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:13636: found $ac_dir/$ac_word" >&5 +echo "$as_me:13688: found $ac_dir/$ac_word" >&5 break done @@ -13641,10 +13693,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:13644: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:13696: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:13647: result: no" >&5 + echo "$as_me:13699: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13683,7 +13735,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:13686: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13738: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13768,7 +13820,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13771: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:13823: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13778,7 +13830,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13781: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:13833: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13788,7 +13840,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13791: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:13843: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -13797,7 +13849,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 13800 "configure" +#line 13852 "configure" #include "confdefs.h" #include int @@ -13809,16 +13861,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13812: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13864: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13815: \$? = $ac_status" >&5 + echo "$as_me:13867: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13818: \"$ac_try\"") >&5 + { (eval echo "$as_me:13870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13821: \$? = $ac_status" >&5 + echo "$as_me:13873: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13826,12 +13878,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13829: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13881: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13834: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:13886: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -13839,7 +13891,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13842: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:13894: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13847,7 +13899,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13850 "configure" +#line 13902 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13866,16 +13918,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13869: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13921: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13872: \$? = $ac_status" >&5 + echo "$as_me:13924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13875: \"$ac_try\"") >&5 + { (eval echo "$as_me:13927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13878: \$? = $ac_status" >&5 + echo "$as_me:13930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -13886,7 +13938,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13889: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:13941: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then @@ -13908,7 +13960,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:13911: checking for XCurses library" >&5 +echo "$as_me:13963: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13931,7 +13983,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 13934 "configure" +#line 13986 "configure" #include "confdefs.h" #include @@ -13946,16 +13998,16 @@ XCursesExit(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13949: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13952: \$? = $ac_status" >&5 + echo "$as_me:14004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13955: \"$ac_try\"") >&5 + { (eval echo "$as_me:14007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13958: \$? = $ac_status" >&5 + echo "$as_me:14010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else @@ -13966,7 +14018,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13969: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:14021: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -13981,23 +14033,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:13984: checking for xcurses.h" >&5 + echo "$as_me:14036: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13990 "configure" +#line 14042 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13994: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14046: \"$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:14000: \$? = $ac_status" >&5 + echo "$as_me:14052: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14016,7 +14068,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14019: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:14071: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test $ac_cv_header_xcurses_h = yes; then @@ -14027,14 +14079,14 @@ EOF fi else - { { echo "$as_me:14030: error: Cannot link with XCurses" >&5 + { { echo "$as_me:14082: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:14037: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:14089: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -14042,7 +14094,7 @@ esac : ${cf_nculib_root:=$cf_cv_screen} as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:14045: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:14097: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14050,7 +14102,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14053 "configure" +#line 14105 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14069,16 +14121,16 @@ _nc_init_pthreads (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14075: \$? = $ac_status" >&5 + echo "$as_me:14127: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14078: \"$ac_try\"") >&5 + { (eval echo "$as_me:14130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14081: \$? = $ac_status" >&5 + echo "$as_me:14133: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14089,7 +14141,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14092: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14144: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then cf_cv_ncurses_pthreads=yes @@ -14152,7 +14204,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:14155: checking if you want to check for panel functions" >&5 +echo "$as_me:14207: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -14169,13 +14221,13 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:14172: result: $cf_enable_panel" >&5 +echo "$as_me:14224: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:14178: checking for new_panel in -lpanel$cf_cv_libtype" >&5 +echo "$as_me:14230: checking for new_panel in -lpanel$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14183,7 +14235,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpanel$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14186 "configure" +#line 14238 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14202,16 +14254,16 @@ new_panel (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14205: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14257: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14208: \$? = $ac_status" >&5 + echo "$as_me:14260: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14211: \"$ac_try\"") >&5 + { (eval echo "$as_me:14263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14214: \$? = $ac_status" >&5 + echo "$as_me:14266: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14222,7 +14274,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14225: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14277: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then @@ -14253,7 +14305,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:14256: checking if you want to check for menu functions" >&5 +echo "$as_me:14308: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -14270,7 +14322,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:14273: result: $cf_enable_menu" >&5 +echo "$as_me:14325: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -14279,14 +14331,14 @@ then ;; (curses*) -echo "$as_me:14282: checking for NetBSD menu.h" >&5 +echo "$as_me:14334: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14289 "configure" +#line 14341 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14304,16 +14356,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14359: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14310: \$? = $ac_status" >&5 + echo "$as_me:14362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14313: \"$ac_try\"") >&5 + { (eval echo "$as_me:14365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14316: \$? = $ac_status" >&5 + echo "$as_me:14368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_menu_h=yes @@ -14325,7 +14377,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14328: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:14380: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -14337,7 +14389,7 @@ EOF esac as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:14340: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 +echo "$as_me:14392: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14345,7 +14397,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmenu$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14348 "configure" +#line 14400 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14364,16 +14416,16 @@ menu_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14367: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14419: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14370: \$? = $ac_status" >&5 + echo "$as_me:14422: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14373: \"$ac_try\"") >&5 + { (eval echo "$as_me:14425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14376: \$? = $ac_status" >&5 + echo "$as_me:14428: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14384,7 +14436,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14387: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14439: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then @@ -14415,7 +14467,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:14418: checking if you want to check for form functions" >&5 +echo "$as_me:14470: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -14432,7 +14484,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:14435: result: $cf_enable_form" >&5 +echo "$as_me:14487: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -14441,14 +14493,14 @@ then ;; (curses*) -echo "$as_me:14444: checking for NetBSD form.h" >&5 +echo "$as_me:14496: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14451 "configure" +#line 14503 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14467,16 +14519,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14470: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14522: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14473: \$? = $ac_status" >&5 + echo "$as_me:14525: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14476: \"$ac_try\"") >&5 + { (eval echo "$as_me:14528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14479: \$? = $ac_status" >&5 + echo "$as_me:14531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_form_h=yes @@ -14488,7 +14540,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14491: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:14543: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -14500,7 +14552,7 @@ EOF esac as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:14503: checking for form_driver in -lform$cf_cv_libtype" >&5 +echo "$as_me:14555: checking for form_driver in -lform$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14508,7 +14560,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lform$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14511 "configure" +#line 14563 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14527,16 +14579,16 @@ form_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14533: \$? = $ac_status" >&5 + echo "$as_me:14585: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14536: \"$ac_try\"") >&5 + { (eval echo "$as_me:14588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14539: \$? = $ac_status" >&5 + echo "$as_me:14591: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14547,7 +14599,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14550: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14602: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then @@ -14583,23 +14635,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14586: checking for $ac_header" >&5 +echo "$as_me:14638: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14592 "configure" +#line 14644 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14596: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14648: \"$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:14602: \$? = $ac_status" >&5 + echo "$as_me:14654: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14618,7 +14670,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14621: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14673: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:14683: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14637 "configure" +#line 14689 "configure" #include "confdefs.h" #include #include @@ -14642,13 +14694,13 @@ else #include _ACEOF -if { (eval echo "$as_me:14645: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14697: \"$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:14651: \$? = $ac_status" >&5 + echo "$as_me:14703: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14670,7 +14722,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 14673 "configure" +#line 14725 "configure" #include "confdefs.h" #include @@ -14688,7 +14740,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 14691 "configure" +#line 14743 "configure" #include "confdefs.h" #include @@ -14709,7 +14761,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 14712 "configure" +#line 14764 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -14735,15 +14787,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14790: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14741: \$? = $ac_status" >&5 + echo "$as_me:14793: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14743: \"$ac_try\"") >&5 + { (eval echo "$as_me:14795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14746: \$? = $ac_status" >&5 + echo "$as_me:14798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -14756,7 +14808,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:14759: result: $ac_cv_header_stdc" >&5 +echo "$as_me:14811: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -14766,13 +14818,13 @@ EOF fi -echo "$as_me:14769: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:14821: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14775 "configure" +#line 14827 "configure" #include "confdefs.h" #include #include @@ -14788,16 +14840,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14794: \$? = $ac_status" >&5 + echo "$as_me:14846: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14797: \"$ac_try\"") >&5 + { (eval echo "$as_me:14849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14800: \$? = $ac_status" >&5 + echo "$as_me:14852: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -14807,7 +14859,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14810: result: $ac_cv_header_time" >&5 +echo "$as_me:14862: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -14831,23 +14883,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14834: checking for $ac_header" >&5 +echo "$as_me:14886: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14840 "configure" +#line 14892 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14844: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14896: \"$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:14850: \$? = $ac_status" >&5 + echo "$as_me:14902: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14866,7 +14918,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14869: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14921: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:14934: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14888 "configure" +#line 14940 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14892: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14944: \"$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:14898: \$? = $ac_status" >&5 + echo "$as_me:14950: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14914,7 +14966,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14917: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14969: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:14979: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14934,7 +14986,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 14937 "configure" +#line 14989 "configure" #include "confdefs.h" #include <$cf_header> @@ -14947,16 +14999,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14950: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14953: \$? = $ac_status" >&5 + echo "$as_me:15005: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14956: \"$ac_try\"") >&5 + { (eval echo "$as_me:15008: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14959: \$? = $ac_status" >&5 + echo "$as_me:15011: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -14968,7 +15020,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14971: result: $cf_cv_getopt_header" >&5 +echo "$as_me:15023: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -14993,13 +15045,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:14996: checking for $ac_func" >&5 +echo "$as_me:15048: 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 15002 "configure" +#line 15054 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15030,16 +15082,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15033: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15036: \$? = $ac_status" >&5 + echo "$as_me:15088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15039: \"$ac_try\"") >&5 + { (eval echo "$as_me:15091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15042: \$? = $ac_status" >&5 + echo "$as_me:15094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15049,7 +15101,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15052: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15104: 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:15115: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -15079,13 +15131,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15082: checking for $ac_func" >&5 +echo "$as_me:15134: 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 15088 "configure" +#line 15140 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15116,16 +15168,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15122: \$? = $ac_status" >&5 + echo "$as_me:15174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15125: \"$ac_try\"") >&5 + { (eval echo "$as_me:15177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15128: \$? = $ac_status" >&5 + echo "$as_me:15180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15135,7 +15187,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15138: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15190: 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:15202: 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 @@ -15155,7 +15207,7 @@ else cf_cv_need_xopen_extension=unknown cat >conftest.$ac_ext <<_ACEOF -#line 15158 "configure" +#line 15210 "configure" #include "confdefs.h" #include @@ -15181,16 +15233,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15236: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15187: \$? = $ac_status" >&5 + echo "$as_me:15239: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15190: \"$ac_try\"") >&5 + { (eval echo "$as_me:15242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15193: \$? = $ac_status" >&5 + echo "$as_me:15245: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=none else @@ -15200,7 +15252,7 @@ cat conftest.$ac_ext >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >conftest.$ac_ext <<_ACEOF -#line 15203 "configure" +#line 15255 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -15222,16 +15274,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15225: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15277: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15228: \$? = $ac_status" >&5 + echo "$as_me:15280: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15231: \"$ac_try\"") >&5 + { (eval echo "$as_me:15283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15234: \$? = $ac_status" >&5 + echo "$as_me:15286: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -15245,7 +15297,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15248: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:15300: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case $cf_cv_need_xopen_extension in @@ -15254,7 +15306,7 @@ case $cf_cv_need_xopen_extension in ;; esac -echo "$as_me:15257: checking for term.h" >&5 +echo "$as_me:15309: 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 @@ -15275,7 +15327,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 15278 "configure" +#line 15330 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15289,16 +15341,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15292: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15295: \$? = $ac_status" >&5 + echo "$as_me:15347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15298: \"$ac_try\"") >&5 + { (eval echo "$as_me:15350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15301: \$? = $ac_status" >&5 + echo "$as_me:15353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -15317,7 +15369,7 @@ case $cf_cv_term_header in for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 15320 "configure" +#line 15372 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15335,16 +15387,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15338: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15390: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15341: \$? = $ac_status" >&5 + echo "$as_me:15393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15344: \"$ac_try\"") >&5 + { (eval echo "$as_me:15396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15347: \$? = $ac_status" >&5 + echo "$as_me:15399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -15359,7 +15411,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:15362: result: $cf_cv_term_header" >&5 +echo "$as_me:15414: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in @@ -15386,7 +15438,7 @@ EOF ;; esac -echo "$as_me:15389: checking for unctrl.h" >&5 +echo "$as_me:15441: 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 @@ -15407,7 +15459,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 15410 "configure" +#line 15462 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15421,16 +15473,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15424: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15476: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15427: \$? = $ac_status" >&5 + echo "$as_me:15479: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15430: \"$ac_try\"") >&5 + { (eval echo "$as_me:15482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15433: \$? = $ac_status" >&5 + echo "$as_me:15485: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -15443,12 +15495,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:15446: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:15498: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in (no) - { echo "$as_me:15451: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:15503: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -15483,6 +15535,9 @@ assume_default_colors \ chgat \ color_content \ color_set \ +copywin \ +delscreen \ +dupwin \ filter \ getbegx \ getcurx \ @@ -15490,10 +15545,14 @@ getmaxx \ getnstr \ getparx \ getwin \ +halfdelay \ init_extended_color \ +mvderwin \ mvvline \ +mvwin \ mvwvline \ napms \ +newpad \ putwin \ resize_term \ resizeterm \ @@ -15519,6 +15578,7 @@ vidputs \ vsscanf \ vw_printw \ wchgat \ +winsdelln \ winsstr \ wresize \ wsyncdown \ @@ -15528,10 +15588,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:15531: checking for ${cf_func}" >&5 + echo "$as_me:15591: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:15534: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:15594: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15540,7 +15600,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 15543 "configure" +#line 15603 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15573,16 +15633,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15636: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15579: \$? = $ac_status" >&5 + echo "$as_me:15639: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15582: \"$ac_try\"") >&5 + { (eval echo "$as_me:15642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15585: \$? = $ac_status" >&5 + echo "$as_me:15645: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15598,7 +15658,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:15601: result: $cf_result" >&5 + echo "$as_me:15661: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <&5 + echo "$as_me:15676: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:15619: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:15679: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15625,7 +15685,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 15628 "configure" +#line 15688 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15658,16 +15718,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15661: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15721: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15664: \$? = $ac_status" >&5 + echo "$as_me:15724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15667: \"$ac_try\"") >&5 + { (eval echo "$as_me:15727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15670: \$? = $ac_status" >&5 + echo "$as_me:15730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15683,7 +15743,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:15686: result: $cf_result" >&5 + echo "$as_me:15746: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 15710 "configure" +#line 15770 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15727,21 +15787,21 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15730: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15790: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15733: \$? = $ac_status" >&5 + echo "$as_me:15793: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15736: \"$ac_try\"") >&5 + { (eval echo "$as_me:15796: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15739: \$? = $ac_status" >&5 + echo "$as_me:15799: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:15744: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:15804: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:15824: 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 15771 "configure" +#line 15831 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15783,16 +15843,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15789: \$? = $ac_status" >&5 + echo "$as_me:15849: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15792: \"$ac_try\"") >&5 + { (eval echo "$as_me:15852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15795: \$? = $ac_status" >&5 + echo "$as_me:15855: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -15800,7 +15860,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15803 "configure" +#line 15863 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15825,16 +15885,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15828: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15888: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15831: \$? = $ac_status" >&5 + echo "$as_me:15891: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15834: \"$ac_try\"") >&5 + { (eval echo "$as_me:15894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15837: \$? = $ac_status" >&5 + echo "$as_me:15897: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -15848,7 +15908,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15851: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:15911: 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 @@ -15862,11 +15922,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:15865: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:15925: 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 15869 "configure" +#line 15929 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15879,16 +15939,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15882: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15942: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15885: \$? = $ac_status" >&5 + echo "$as_me:15945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15888: \"$ac_try\"") >&5 + { (eval echo "$as_me:15948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15891: \$? = $ac_status" >&5 + echo "$as_me:15951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15897,7 +15957,7 @@ cat conftest.$ac_ext >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >conftest.$ac_ext <<_ACEOF -#line 15900 "configure" +#line 15960 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15910,16 +15970,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15913: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15973: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15916: \$? = $ac_status" >&5 + echo "$as_me:15976: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15919: \"$ac_try\"") >&5 + { (eval echo "$as_me:15979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15922: \$? = $ac_status" >&5 + echo "$as_me:15982: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_define_xpg5=yes else @@ -15930,7 +15990,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:15933: result: $cf_define_xpg5" >&5 + echo "$as_me:15993: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -15939,14 +15999,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:15942: checking for wide-character functions" >&5 + echo "$as_me:16002: 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 15949 "configure" +#line 16009 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15963,16 +16023,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16026: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15969: \$? = $ac_status" >&5 + echo "$as_me:16029: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15972: \"$ac_try\"") >&5 + { (eval echo "$as_me:16032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15975: \$? = $ac_status" >&5 + echo "$as_me:16035: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widechar_funcs=yes else @@ -15983,7 +16043,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15986: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:16046: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -16004,14 +16064,14 @@ EOF fi -echo "$as_me:16007: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:16067: 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 16014 "configure" +#line 16074 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16029,16 +16089,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16032: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16092: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16035: \$? = $ac_status" >&5 + echo "$as_me:16095: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16038: \"$ac_try\"") >&5 + { (eval echo "$as_me:16098: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16041: \$? = $ac_status" >&5 + echo "$as_me:16101: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_use_pthreads=yes else @@ -16049,20 +16109,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16052: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:16112: 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:16058: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16118: 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 16065 "configure" +#line 16125 "configure" #include "confdefs.h" #include @@ -16082,16 +16142,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16085: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16088: \$? = $ac_status" >&5 + echo "$as_me:16148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16091: \"$ac_try\"") >&5 + { (eval echo "$as_me:16151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16094: \$? = $ac_status" >&5 + echo "$as_me:16154: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -16103,7 +16163,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16106: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16166: 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 @@ -16112,7 +16172,7 @@ EOF # special check for test/ditto.c -echo "$as_me:16115: checking for openpty in -lutil" >&5 +echo "$as_me:16175: 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 @@ -16120,7 +16180,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16123 "configure" +#line 16183 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16139,16 +16199,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16202: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16145: \$? = $ac_status" >&5 + echo "$as_me:16205: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16148: \"$ac_try\"") >&5 + { (eval echo "$as_me:16208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16151: \$? = $ac_status" >&5 + echo "$as_me:16211: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -16159,7 +16219,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16162: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:16222: 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 @@ -16167,7 +16227,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:16170: checking for openpty header" >&5 +echo "$as_me:16230: 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 @@ -16194,7 +16254,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 16197 "configure" +#line 16257 "configure" #include "confdefs.h" #include <$cf_header> @@ -16211,16 +16271,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16274: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16217: \$? = $ac_status" >&5 + echo "$as_me:16277: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16220: \"$ac_try\"") >&5 + { (eval echo "$as_me:16280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16223: \$? = $ac_status" >&5 + echo "$as_me:16283: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -16238,7 +16298,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:16241: result: $cf_cv_func_openpty" >&5 +echo "$as_me:16301: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -16272,7 +16332,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:16275: checking for function curses_version" >&5 +echo "$as_me:16335: 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 @@ -16282,7 +16342,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16285 "configure" +#line 16345 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16295,15 +16355,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16298: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16358: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16301: \$? = $ac_status" >&5 + echo "$as_me:16361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16303: \"$ac_try\"") >&5 + { (eval echo "$as_me:16363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16306: \$? = $ac_status" >&5 + echo "$as_me:16366: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -16318,14 +16378,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:16321: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:16381: 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:16328: checking for alternate character set array" >&5 +echo "$as_me:16388: 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 @@ -16335,7 +16395,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 16338 "configure" +#line 16398 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16351,16 +16411,16 @@ $name['k'] = ACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16354: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16357: \$? = $ac_status" >&5 + echo "$as_me:16417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16360: \"$ac_try\"") >&5 + { (eval echo "$as_me:16420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16363: \$? = $ac_status" >&5 + echo "$as_me:16423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_acs_map=$name; break else @@ -16371,7 +16431,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:16374: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:16434: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -16381,7 +16441,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:16384: checking for wide alternate character set array" >&5 +echo "$as_me:16444: 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 @@ -16391,7 +16451,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 16394 "configure" +#line 16454 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16407,16 +16467,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16413: \$? = $ac_status" >&5 + echo "$as_me:16473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16416: \"$ac_try\"") >&5 + { (eval echo "$as_me:16476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16419: \$? = $ac_status" >&5 + echo "$as_me:16479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -16427,7 +16487,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:16430: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:16490: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -16435,7 +16495,7 @@ cat >>confdefs.h <&5 +echo "$as_me:16498: 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 @@ -16445,7 +16505,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 16448 "configure" +#line 16508 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16462,16 +16522,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16465: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16468: \$? = $ac_status" >&5 + echo "$as_me:16528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16471: \"$ac_try\"") >&5 + { (eval echo "$as_me:16531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16474: \$? = $ac_status" >&5 + echo "$as_me:16534: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -16481,7 +16541,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 16484 "configure" +#line 16544 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16497,16 +16557,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16500: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16560: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16503: \$? = $ac_status" >&5 + echo "$as_me:16563: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16506: \"$ac_try\"") >&5 + { (eval echo "$as_me:16566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16509: \$? = $ac_status" >&5 + echo "$as_me:16569: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -16517,7 +16577,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:16520: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:16580: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -16527,10 +16587,10 @@ EOF fi -echo "$as_me:16530: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16590: 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 16533 "configure" +#line 16593 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16548,16 +16608,16 @@ attr_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16611: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16554: \$? = $ac_status" >&5 + echo "$as_me:16614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16557: \"$ac_try\"") >&5 + { (eval echo "$as_me:16617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16560: \$? = $ac_status" >&5 + echo "$as_me:16620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16566,7 +16626,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16569: result: $cf_result" >&5 +echo "$as_me:16629: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16587,14 +16647,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:16590: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:16650: 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 16597 "configure" +#line 16657 "configure" #include "confdefs.h" #include @@ -16612,23 +16672,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16615: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16618: \$? = $ac_status" >&5 + echo "$as_me:16678: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16621: \"$ac_try\"") >&5 + { (eval echo "$as_me:16681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16624: \$? = $ac_status" >&5 + echo "$as_me:16684: \$? = $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 16631 "configure" +#line 16691 "configure" #include "confdefs.h" #include @@ -16647,16 +16707,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16650: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16710: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16653: \$? = $ac_status" >&5 + echo "$as_me:16713: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16656: \"$ac_try\"") >&5 + { (eval echo "$as_me:16716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16659: \$? = $ac_status" >&5 + echo "$as_me:16719: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -16668,7 +16728,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16671: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:16731: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -16691,14 +16751,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:16694: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:16754: 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 16701 "configure" +#line 16761 "configure" #include "confdefs.h" #include @@ -16716,23 +16776,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16719: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16722: \$? = $ac_status" >&5 + echo "$as_me:16782: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16725: \"$ac_try\"") >&5 + { (eval echo "$as_me:16785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16728: \$? = $ac_status" >&5 + echo "$as_me:16788: \$? = $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 16735 "configure" +#line 16795 "configure" #include "confdefs.h" #include @@ -16751,16 +16811,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16757: \$? = $ac_status" >&5 + echo "$as_me:16817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16760: \"$ac_try\"") >&5 + { (eval echo "$as_me:16820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16763: \$? = $ac_status" >&5 + echo "$as_me:16823: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -16772,7 +16832,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16775: result: $cf_cv_wchar_t" >&5 +echo "$as_me:16835: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -16795,14 +16855,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:16798: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:16858: 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 16805 "configure" +#line 16865 "configure" #include "confdefs.h" #include @@ -16820,23 +16880,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16823: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16883: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16826: \$? = $ac_status" >&5 + echo "$as_me:16886: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16829: \"$ac_try\"") >&5 + { (eval echo "$as_me:16889: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16832: \$? = $ac_status" >&5 + echo "$as_me:16892: \$? = $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 16839 "configure" +#line 16899 "configure" #include "confdefs.h" #include @@ -16855,16 +16915,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16858: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16918: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16861: \$? = $ac_status" >&5 + echo "$as_me:16921: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16864: \"$ac_try\"") >&5 + { (eval echo "$as_me:16924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16867: \$? = $ac_status" >&5 + echo "$as_me:16927: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -16876,7 +16936,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16879: result: $cf_cv_wint_t" >&5 +echo "$as_me:16939: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -16900,10 +16960,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:16903: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16963: 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 16906 "configure" +#line 16966 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16921,16 +16981,16 @@ mbstate_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16924: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16984: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16927: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16930: \"$ac_try\"") >&5 + { (eval echo "$as_me:16990: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16933: \$? = $ac_status" >&5 + echo "$as_me:16993: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16939,7 +16999,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16942: result: $cf_result" >&5 +echo "$as_me:17002: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16961,10 +17021,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:16964: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17024: 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 16967 "configure" +#line 17027 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16982,16 +17042,16 @@ wchar_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16985: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16988: \$? = $ac_status" >&5 + echo "$as_me:17048: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16991: \"$ac_try\"") >&5 + { (eval echo "$as_me:17051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16994: \$? = $ac_status" >&5 + echo "$as_me:17054: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17000,7 +17060,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17003: result: $cf_result" >&5 +echo "$as_me:17063: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17022,10 +17082,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:17025: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17085: 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 17028 "configure" +#line 17088 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17043,16 +17103,16 @@ wint_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17046: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17049: \$? = $ac_status" >&5 + echo "$as_me:17109: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17052: \"$ac_try\"") >&5 + { (eval echo "$as_me:17112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17055: \$? = $ac_status" >&5 + echo "$as_me:17115: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17061,7 +17121,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17064: result: $cf_result" >&5 +echo "$as_me:17124: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17084,11 +17144,11 @@ fi for cf_data in curscr do -echo "$as_me:17087: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17147: 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 17091 "configure" +#line 17151 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17116,16 +17176,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17119: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17179: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17122: \$? = $ac_status" >&5 + echo "$as_me:17182: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17125: \"$ac_try\"") >&5 + { (eval echo "$as_me:17185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17128: \$? = $ac_status" >&5 + echo "$as_me:17188: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17135,7 +17195,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17138: result: $cf_result" >&5 +echo "$as_me:17198: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17147,14 +17207,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17150: checking for data $cf_data in library" >&5 + echo "$as_me:17210: 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 17157 "configure" +#line 17217 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17187,16 +17247,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17193: \$? = $ac_status" >&5 + echo "$as_me:17253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17196: \"$ac_try\"") >&5 + { (eval echo "$as_me:17256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17199: \$? = $ac_status" >&5 + echo "$as_me:17259: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17208,7 +17268,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17211 "configure" +#line 17271 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17234,15 +17294,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17297: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17240: \$? = $ac_status" >&5 + echo "$as_me:17300: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17242: \"$ac_try\"") >&5 + { (eval echo "$as_me:17302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17245: \$? = $ac_status" >&5 + echo "$as_me:17305: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17254,7 +17314,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17257: result: $cf_result" >&5 + echo "$as_me:17317: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17271,11 +17331,11 @@ done for cf_data in ospeed do -echo "$as_me:17274: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17334: 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 17278 "configure" +#line 17338 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17303,16 +17363,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17306: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17366: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17309: \$? = $ac_status" >&5 + echo "$as_me:17369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17312: \"$ac_try\"") >&5 + { (eval echo "$as_me:17372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17315: \$? = $ac_status" >&5 + echo "$as_me:17375: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17322,7 +17382,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17325: result: $cf_result" >&5 +echo "$as_me:17385: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17334,14 +17394,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17337: checking for data $cf_data in library" >&5 + echo "$as_me:17397: 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 17344 "configure" +#line 17404 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17374,16 +17434,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17377: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17437: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17380: \$? = $ac_status" >&5 + echo "$as_me:17440: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17383: \"$ac_try\"") >&5 + { (eval echo "$as_me:17443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17386: \$? = $ac_status" >&5 + echo "$as_me:17446: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17395,7 +17455,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17398 "configure" +#line 17458 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17421,15 +17481,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17424: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17484: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17427: \$? = $ac_status" >&5 + echo "$as_me:17487: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17429: \"$ac_try\"") >&5 + { (eval echo "$as_me:17489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17432: \$? = $ac_status" >&5 + echo "$as_me:17492: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17441,7 +17501,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17444: result: $cf_result" >&5 + echo "$as_me:17504: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17458,11 +17518,11 @@ done for cf_data in boolnames do -echo "$as_me:17461: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17521: 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 17465 "configure" +#line 17525 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17490,16 +17550,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17493: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17553: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17496: \$? = $ac_status" >&5 + echo "$as_me:17556: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17499: \"$ac_try\"") >&5 + { (eval echo "$as_me:17559: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17502: \$? = $ac_status" >&5 + echo "$as_me:17562: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17509,7 +17569,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17512: result: $cf_result" >&5 +echo "$as_me:17572: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17521,14 +17581,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17524: checking for data $cf_data in library" >&5 + echo "$as_me:17584: 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 17531 "configure" +#line 17591 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17561,16 +17621,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17564: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17624: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17567: \$? = $ac_status" >&5 + echo "$as_me:17627: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17570: \"$ac_try\"") >&5 + { (eval echo "$as_me:17630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17573: \$? = $ac_status" >&5 + echo "$as_me:17633: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17582,7 +17642,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17585 "configure" +#line 17645 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17608,15 +17668,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17611: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17671: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17614: \$? = $ac_status" >&5 + echo "$as_me:17674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17616: \"$ac_try\"") >&5 + { (eval echo "$as_me:17676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17619: \$? = $ac_status" >&5 + echo "$as_me:17679: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17628,7 +17688,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17631: result: $cf_result" >&5 + echo "$as_me:17691: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17645,11 +17705,11 @@ done for cf_data in boolfnames do -echo "$as_me:17648: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17708: 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 17652 "configure" +#line 17712 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17677,16 +17737,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17680: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17683: \$? = $ac_status" >&5 + echo "$as_me:17743: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17686: \"$ac_try\"") >&5 + { (eval echo "$as_me:17746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17689: \$? = $ac_status" >&5 + echo "$as_me:17749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17696,7 +17756,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17699: result: $cf_result" >&5 +echo "$as_me:17759: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17708,14 +17768,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17711: checking for data $cf_data in library" >&5 + echo "$as_me:17771: 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 17718 "configure" +#line 17778 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17748,16 +17808,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17811: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17754: \$? = $ac_status" >&5 + echo "$as_me:17814: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17757: \"$ac_try\"") >&5 + { (eval echo "$as_me:17817: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17760: \$? = $ac_status" >&5 + echo "$as_me:17820: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17769,7 +17829,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17772 "configure" +#line 17832 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17795,15 +17855,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17798: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17801: \$? = $ac_status" >&5 + echo "$as_me:17861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17803: \"$ac_try\"") >&5 + { (eval echo "$as_me:17863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17806: \$? = $ac_status" >&5 + echo "$as_me:17866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17815,7 +17875,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17818: result: $cf_result" >&5 + echo "$as_me:17878: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17832,11 +17892,11 @@ done for cf_data in ttytype do -echo "$as_me:17835: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17895: 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 17839 "configure" +#line 17899 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17864,16 +17924,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17867: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17927: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17870: \$? = $ac_status" >&5 + echo "$as_me:17930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17873: \"$ac_try\"") >&5 + { (eval echo "$as_me:17933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17876: \$? = $ac_status" >&5 + echo "$as_me:17936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17883,7 +17943,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17886: result: $cf_result" >&5 +echo "$as_me:17946: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17895,14 +17955,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17898: checking for data $cf_data in library" >&5 + echo "$as_me:17958: 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 17905 "configure" +#line 17965 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17935,16 +17995,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17998: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17941: \$? = $ac_status" >&5 + echo "$as_me:18001: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17944: \"$ac_try\"") >&5 + { (eval echo "$as_me:18004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17947: \$? = $ac_status" >&5 + echo "$as_me:18007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17956,7 +18016,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17959 "configure" +#line 18019 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17982,15 +18042,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17988: \$? = $ac_status" >&5 + echo "$as_me:18048: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17990: \"$ac_try\"") >&5 + { (eval echo "$as_me:18050: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17993: \$? = $ac_status" >&5 + echo "$as_me:18053: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -18002,7 +18062,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:18005: result: $cf_result" >&5 + echo "$as_me:18065: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -18019,7 +18079,7 @@ done if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:18022: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:18082: 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. @@ -18036,7 +18096,7 @@ else with_warnings=no fi; -echo "$as_me:18039: result: $with_warnings" >&5 +echo "$as_me:18099: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -18059,10 +18119,10 @@ cat > conftest.i <&5 + { echo "$as_me:18122: 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:18174: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18117: \$? = $ac_status" >&5 + echo "$as_me:18177: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18119: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:18179: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -18180,12 +18240,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:18183: checking if this is really Intel C compiler" >&5 + echo "$as_me:18243: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 18188 "configure" +#line 18248 "configure" #include "confdefs.h" int @@ -18202,16 +18262,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18205: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18265: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18208: \$? = $ac_status" >&5 + echo "$as_me:18268: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18211: \"$ac_try\"") >&5 + { (eval echo "$as_me:18271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18214: \$? = $ac_status" >&5 + echo "$as_me:18274: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -18222,7 +18282,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:18225: result: $INTEL_COMPILER" >&5 + echo "$as_me:18285: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -18231,12 +18291,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:18234: checking if this is really Clang C compiler" >&5 + echo "$as_me:18294: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 18239 "configure" +#line 18299 "configure" #include "confdefs.h" int @@ -18253,16 +18313,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18256: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18316: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18259: \$? = $ac_status" >&5 + echo "$as_me:18319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18262: \"$ac_try\"") >&5 + { (eval echo "$as_me:18322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18265: \$? = $ac_status" >&5 + echo "$as_me:18325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -18273,12 +18333,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:18276: result: $CLANG_COMPILER" >&5 + echo "$as_me:18336: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:18358: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -18311,12 +18371,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:18314: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18317: \$? = $ac_status" >&5 + echo "$as_me:18377: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18319: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -18325,7 +18385,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:18328: checking for $CC warning options..." >&5 + { echo "$as_me:18388: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -18349,12 +18409,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:18352: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18355: \$? = $ac_status" >&5 + echo "$as_me:18415: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18357: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18417: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -18365,7 +18425,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}:18368: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18428: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -18375,7 +18435,7 @@ echo "${as_me:-configure}:18368: 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}:18378: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18438: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -18391,7 +18451,7 @@ rm -rf conftest* fi fi -echo "$as_me:18394: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:18454: 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. @@ -18408,7 +18468,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:18411: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:18471: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -18522,23 +18582,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:18525: checking for dmalloc.h" >&5 + echo "$as_me:18585: 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 18531 "configure" +#line 18591 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18535: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18595: \"$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:18541: \$? = $ac_status" >&5 + echo "$as_me:18601: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18557,11 +18617,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18560: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:18620: 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:18564: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:18624: 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 @@ -18569,7 +18629,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18572 "configure" +#line 18632 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18588,16 +18648,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18591: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18651: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18594: \$? = $ac_status" >&5 + echo "$as_me:18654: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18597: \"$ac_try\"") >&5 + { (eval echo "$as_me:18657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18600: \$? = $ac_status" >&5 + echo "$as_me:18660: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -18608,7 +18668,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18611: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:18671: 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:18686: 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. @@ -18640,7 +18700,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:18643: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:18703: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -18754,23 +18814,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:18757: checking for dbmalloc.h" >&5 + echo "$as_me:18817: 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 18763 "configure" +#line 18823 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18767: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18827: \"$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:18773: \$? = $ac_status" >&5 + echo "$as_me:18833: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18789,11 +18849,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18792: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:18852: 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:18796: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:18856: 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 @@ -18801,7 +18861,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18804 "configure" +#line 18864 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18820,16 +18880,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18823: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18883: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18826: \$? = $ac_status" >&5 + echo "$as_me:18886: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18829: \"$ac_try\"") >&5 + { (eval echo "$as_me:18889: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18832: \$? = $ac_status" >&5 + echo "$as_me:18892: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -18840,7 +18900,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18843: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:18903: 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:18918: 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. @@ -18872,7 +18932,7 @@ EOF else with_valgrind= fi; -echo "$as_me:18875: result: ${with_valgrind:-no}" >&5 +echo "$as_me:18935: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -18985,7 +19045,7 @@ fi ;; esac -echo "$as_me:18988: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:19048: 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. @@ -18995,7 +19055,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:18998: result: $with_no_leaks" >&5 +echo "$as_me:19058: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -19011,7 +19071,7 @@ EOF fi LD_RPATH_OPT= -echo "$as_me:19014: checking for an rpath option" >&5 +echo "$as_me:19074: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -19042,12 +19102,12 @@ case $cf_cv_system_name in (*) ;; esac -echo "$as_me:19045: result: $LD_RPATH_OPT" >&5 +echo "$as_me:19105: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:19050: checking if we need a space after rpath option" >&5 + echo "$as_me:19110: 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" @@ -19068,7 +19128,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 19071 "configure" +#line 19131 "configure" #include "confdefs.h" int @@ -19080,16 +19140,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19083: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19143: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19086: \$? = $ac_status" >&5 + echo "$as_me:19146: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19089: \"$ac_try\"") >&5 + { (eval echo "$as_me:19149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19092: \$? = $ac_status" >&5 + echo "$as_me:19152: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -19099,13 +19159,13 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:19102: result: $cf_rpath_space" >&5 + echo "$as_me:19162: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac -echo "$as_me:19108: checking if rpath-hack should be disabled" >&5 +echo "$as_me:19168: 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. @@ -19122,21 +19182,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:19125: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:19185: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:19129: checking for updated LDFLAGS" >&5 +echo "$as_me:19189: 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:19132: result: maybe" >&5 + echo "$as_me:19192: 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:19139: checking for $ac_word" >&5 +echo "$as_me:19199: 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 @@ -19151,7 +19211,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:19154: found $ac_dir/$ac_word" >&5 +echo "$as_me:19214: found $ac_dir/$ac_word" >&5 break done @@ -19159,10 +19219,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:19162: result: $cf_ldd_prog" >&5 + echo "$as_me:19222: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:19165: result: no" >&5 + echo "$as_me:19225: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19176,7 +19236,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 19179 "configure" +#line 19239 "configure" #include "confdefs.h" #include int @@ -19188,16 +19248,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19251: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19194: \$? = $ac_status" >&5 + echo "$as_me:19254: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19197: \"$ac_try\"") >&5 + { (eval echo "$as_me:19257: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19200: \$? = $ac_status" >&5 + echo "$as_me:19260: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -19225,7 +19285,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}:19228: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:19288: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -19237,11 +19297,11 @@ echo "${as_me:-configure}:19228: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:19240: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:19300: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:19244: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:19304: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -19278,7 +19338,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:19281: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:19341: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -19291,11 +19351,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:19294: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:19354: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:19298: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:19358: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -19332,7 +19392,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:19335: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:19395: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -19345,14 +19405,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:19348: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:19408: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:19352: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:19412: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:19355: result: no" >&5 + echo "$as_me:19415: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19442,7 +19502,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:19445: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:19505: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -19618,7 +19678,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:19621: error: ambiguous option: $1 + { { echo "$as_me:19681: 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;} @@ -19637,7 +19697,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:19640: error: unrecognized option: $1 + -*) { { echo "$as_me:19700: 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;} @@ -19687,7 +19747,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:19690: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:19750: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -19978,7 +20038,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:19981: creating $ac_file" >&5 + { echo "$as_me:20041: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19996,7 +20056,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:19999: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20059: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20009,7 +20069,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20012: error: cannot find input file: $f" >&5 + { { echo "$as_me:20072: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20025,7 +20085,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:20028: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:20088: 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;} @@ -20034,7 +20094,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:20037: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:20097: 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;} @@ -20071,7 +20131,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:20074: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:20134: 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;} @@ -20082,7 +20142,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:20085: WARNING: Some variables may not be substituted: + { echo "$as_me:20145: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -20131,7 +20191,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:20134: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:20194: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -20142,7 +20202,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:20145: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20205: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20155,7 +20215,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20158: error: cannot find input file: $f" >&5 + { { echo "$as_me:20218: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20213,7 +20273,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:20216: $ac_file is unchanged" >&5 + { echo "$as_me:20276: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -20290,7 +20350,7 @@ do \$(srcdir)/test.priv.h \\ ncurses_cfg.h $SHOW_CC - $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c + $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) -DMODULE_NAME="$N" \$(srcdir)/$N.c TEST_EOF done diff --git a/test/configure.in b/test/configure.in index 4f2bd8ad..a73771b4 100644 --- a/test/configure.in +++ b/test/configure.in @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.135 2017/08/20 16:38:29 tom Exp $ +dnl $Id: configure.in,v 1.142 2017/09/09 23:07:56 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) @@ -52,6 +52,7 @@ AC_ARG_PROGRAM AC_PROG_MAKE_SET CF_PROG_CC +AC_C_INLINE AC_PROG_CPP AC_PROG_AWK CF_PROG_INSTALL @@ -272,6 +273,9 @@ assume_default_colors \ chgat \ color_content \ color_set \ +copywin \ +delscreen \ +dupwin \ filter \ getbegx \ getcurx \ @@ -279,10 +283,14 @@ getmaxx \ getnstr \ getparx \ getwin \ +halfdelay \ init_extended_color \ +mvderwin \ mvvline \ +mvwin \ mvwvline \ napms \ +newpad \ putwin \ resize_term \ resizeterm \ @@ -308,6 +316,7 @@ vidputs \ vsscanf \ vw_printw \ wchgat \ +winsdelln \ winsstr \ wresize \ wsyncdown \ @@ -453,7 +462,7 @@ do \$(srcdir)/test.priv.h \\ ncurses_cfg.h $SHOW_CC - $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c + $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) -DMODULE_NAME="$N" \$(srcdir)/$N.c TEST_EOF done diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c index 26256a80..5f8e8e66 100644 --- a/test/demo_new_pair.c +++ b/test/demo_new_pair.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_new_pair.c,v 1.15 2017/06/26 00:20:23 tom Exp $ + * $Id: demo_new_pair.c,v 1.16 2017/09/04 11:47:44 tom Exp $ * * Demonstrate the alloc_pair() function. */ @@ -334,7 +334,7 @@ main(int argc, char *argv[]) total_cells += 1 + (use_wide ? 1 : 0); ++current; } - endwin(); + exit_curses(); fclose(output); printf("%.1f cells/second\n", diff --git a/test/demo_termcap.c b/test/demo_termcap.c index 134e9e2c..e1ce0cda 100644 --- a/test/demo_termcap.c +++ b/test/demo_termcap.c @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_termcap.c,v 1.54 2017/04/13 09:12:40 tom Exp $ + * $Id: demo_termcap.c,v 1.55 2017/09/04 13:28:44 tom Exp $ * * A simple demo of the termcap interface. */ @@ -74,8 +74,10 @@ static bool b_opt = FALSE; static bool n_opt = FALSE; static bool s_opt = FALSE; static bool q_opt = FALSE; +#ifdef NCURSES_VERSION static bool x_opt = FALSE; static bool y_opt = FALSE; +#endif static char *d_opt; static char *e_opt; @@ -768,7 +770,9 @@ main(int argc, char *argv[]) int n; char *name; bool a_opt = FALSE; +#if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED) bool v_opt = FALSE; +#endif char *input_name = 0; int repeat; @@ -804,9 +808,12 @@ main(int argc, char *argv[]) case 's': s_opt = TRUE; break; +#if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED) case 'v': v_opt = TRUE; break; +#endif +#ifdef NCURSES_VERSION #if NCURSES_XNAMES case 'x': x_opt = TRUE; @@ -815,6 +822,7 @@ main(int argc, char *argv[]) y_opt = TRUE; x_opt = TRUE; break; +#endif #endif default: usage(); diff --git a/test/ditto.c b/test/ditto.c index 84327c0f..bf14946f 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.44 2016/09/04 20:43:04 tom Exp $ + * $Id: ditto.c,v 1.46 2017/09/06 09:19:14 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -44,6 +44,8 @@ #include #include +#if HAVE_DELSCREEN + #ifdef USE_PTHREADS #include #endif @@ -450,3 +452,11 @@ main(int argc, char *argv[]) } ExitProgram(EXIT_SUCCESS); } +#else +int +main(void) +{ + printf("This program requires the curses delscreen function\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/echochar.c b/test/echochar.c index 75916ba7..ef649ca4 100644 --- a/test/echochar.c +++ b/test/echochar.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: echochar.c,v 1.13 2017/04/15 13:38:37 tom Exp $ + * $Id: echochar.c,v 1.14 2017/09/04 11:48:15 tom Exp $ * * Demonstrate the echochar function (compare to dots.c). * Thomas Dickey - 2006/11/4 @@ -45,7 +45,7 @@ static time_t started; static void cleanup(void) { - endwin(); + exit_curses(); printf("\n\n%ld total chars, rate %.2f/sec\n", total_chars, diff --git a/test/filter.c b/test/filter.c index 926ec6b8..890adda3 100644 --- a/test/filter.c +++ b/test/filter.c @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey 1998 * - * $Id: filter.c,v 1.29 2017/06/17 18:16:39 tom Exp $ + * $Id: filter.c,v 1.30 2017/09/08 22:34:05 tom Exp $ * * An example of the 'filter()' function in ncurses, this program prompts * for commands and executes them (like a command shell). It illustrates @@ -308,6 +308,9 @@ usage(void) ," -a suppress xterm alternate-screen by amending smcup/rmcup" #endif ," -c show current time on prompt line with \"Command\"" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif ," -i use initscr() rather than newterm()" ," -p poll for individual characters rather than using getnstr" }; @@ -327,12 +330,15 @@ main(int argc, char *argv[]) bool a_option = FALSE; #endif bool c_option = FALSE; +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif bool i_option = FALSE; bool p_option = FALSE; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "acip")) != -1) { + while ((ch = getopt(argc, argv, "adcip")) != -1) { switch (ch) { #ifdef NCURSES_VERSION case 'a': @@ -342,6 +348,11 @@ main(int argc, char *argv[]) case 'c': c_option = TRUE; break; +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif case 'i': i_option = TRUE; break; @@ -376,7 +387,7 @@ main(int argc, char *argv[]) int background = COLOR_BLACK; start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() != ERR) + if (d_option && (use_default_colors() != ERR)) background = -1; #endif init_pair(1, COLOR_CYAN, (short) background); diff --git a/test/firework.c b/test/firework.c index 6d35d501..198c58d7 100644 --- a/test/firework.c +++ b/test/firework.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * + * Copyright (c) 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: firework.c,v 1.30 2014/08/02 17:24:07 tom Exp $ + * $Id: firework.c,v 1.34 2017/09/09 00:35:56 tom Exp $ */ #include @@ -37,8 +37,7 @@ static short my_bg = COLOR_BLACK; static void cleanup(void) { - curs_set(1); - endwin(); + exit_curses(); } static void @@ -137,13 +136,52 @@ explode(int row, int col) showit(); } +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: firework [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors, repeat to use in init_pair" +#endif + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + int -main( - int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { - int start, end, row, diff, flag = 0, direction; + int ch; + int start, end; + int row, diff; + int flag = 0; + int direction; unsigned seed; +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif + + while ((ch = getopt(argc, argv, "d")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif + default: + usage(); + } + } + if (optind < argc) + usage(); CATCHALL(onsig); @@ -156,7 +194,7 @@ main( if (has_colors()) { start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (d_option && (use_default_colors() == OK)) my_bg = -1; #endif } @@ -174,7 +212,7 @@ main( diff = abs(start - end); } while (diff < 2 || diff >= LINES - 2); (void) attrset(AttrArg(0, A_NORMAL)); - for (row = 0; row < diff; row++) { + for (row = 1; row < diff; row++) { MvPrintw(LINES - row, start + (row * direction), (direction < 0) ? "\\" : "/"); if (flag++) { diff --git a/test/firstlast.c b/test/firstlast.c index f5328c72..fb09cb27 100644 --- a/test/firstlast.c +++ b/test/firstlast.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ * This test was written by Alexander V. Lukyanov to demonstrate difference * between ncurses 4.1 and SVR4 curses * - * $Id: firstlast.c,v 1.7 2010/05/01 19:11:55 tom Exp $ + * $Id: firstlast.c,v 1.8 2017/09/06 01:07:39 tom Exp $ */ #include @@ -40,6 +40,11 @@ fill(WINDOW *w, const char *str) const char *s; int x0 = -1, y0 = -1; int x1, y1; + int maxx, maxy, limit; + + getmaxyx(w, maxy, maxx); + wmove(w, 0, 0); + limit = maxy * maxx; for (;;) { for (s = str; *s; s++) { @@ -49,6 +54,16 @@ fill(WINDOW *w, const char *str) wmove(w, 0, 0); return; } + /* waddch() should return ERR at the lower-right corner */ + if (--limit < 0) { + beep(); + if (*str == '?') + return; + napms(500); + wmove(w, maxy - 1, 0); + str = "?"; + limit = maxx + 1; + } x0 = x1; y0 = y1; } diff --git a/test/gdc.6 b/test/gdc.6 index ed3a4f10..a8d57a9c 100644 --- a/test/gdc.6 +++ b/test/gdc.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2006,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,16 +26,12 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: gdc.6,v 1.3 2006/04/22 23:02:15 tom Exp $ +.\" $Id: gdc.6,v 1.4 2017/09/09 20:04:09 tom Exp $ .TH GDC 6 .SH NAME gdc \- grand digital clock (curses) .SH SYNOPSIS -.B gdc -[-n] [ -[-s] [ -.I n -] +.B gdc \fP[\fIoptions\fP] [\fIn\fP] .SH DESCRIPTION .I Gdc runs a digital clock made of reverse-video blanks on a terminal screen. @@ -44,14 +40,20 @@ You can make the clock stop, pause or resume by pressing a ``q'', ``s'' or space, respectively. .SH OPTIONS .TP -.B -n +.B \-d +use terminal's default colors for the background. +.TP +.B \-n redirects input to /dev/null, making it ignore the stop/pause commands. You can still stop it by pressing the interrupt key. .TP -.B -s +.B \-s makes digits scroll as they change. When running on a fast display, the program breaks up the scrolling into subsecond repaints, making the operation appear smooth. +.TP +.B \-t \fIhh:mm:ss\fP +specify starting time (default is ``now''). .PP With an optional numeric argument .I num @@ -61,4 +63,5 @@ seconds. Normally it runs "forever" (counting down from 2 billion seconds). .SH AUTHOR Amos Shapir, modified for curses by John Lupien. +.br Improvements for ncurses by Thomas Dickey. diff --git a/test/gdc.c b/test/gdc.c index 0c48ffbe..c70efba8 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -33,7 +33,7 @@ * modified 10-18-89 for curses (jrl) * 10-18-89 added signal handling * - * $Id: gdc.c,v 1.45 2016/09/10 21:47:55 tom Exp $ + * $Id: gdc.c,v 1.50 2017/09/09 20:23:09 tom Exp $ */ #include @@ -66,7 +66,7 @@ sighndl(int signo) signal(signo, sighndl); sigtermed = signo; if (redirected) { - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } } @@ -76,7 +76,7 @@ check_term(void) { if (sigtermed) { (void) standend(); - endwin(); + exit_curses(); fprintf(stderr, "gdc terminated by signal %d\n", sigtermed); ExitProgram(EXIT_FAILURE); } @@ -156,8 +156,11 @@ usage(void) "Usage: gdc [options] [count]" ,"" ,"Options:" - ," -n redirect input to /dev/null" - ," -s scroll each number into place, rather than flipping" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -n redirect input to /dev/null" + ," -s scroll each number into place, rather than flipping" ," -t hh:mm:ss specify starting time (default is ``now'')" ,"" ,"If you specify a count, gdc runs for that number of seconds" @@ -218,13 +221,21 @@ main(int argc, char *argv[]) bool smooth = FALSE; bool stages = FALSE; time_t starts = 0; +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif setlocale(LC_ALL, ""); CATCHALL(sighndl); - while ((k = getopt(argc, argv, "nst:")) != -1) { + while ((k = getopt(argc, argv, "dnst:")) != -1) { switch (k) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif case 'n': ifp = fopen("/dev/null", "r"); redirected = TRUE; @@ -268,7 +279,7 @@ main(int argc, char *argv[]) short bg = COLOR_BLACK; start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (d_option && (use_default_colors() == OK)) bg = -1; #endif init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED); @@ -435,6 +446,6 @@ main(int argc, char *argv[]) } } while (--count); (void) standend(); - endwin(); + exit_curses(); ExitProgram(EXIT_SUCCESS); } diff --git a/test/hanoi.c b/test/hanoi.c index 7447ae2c..f24ae54f 100644 --- a/test/hanoi.c +++ b/test/hanoi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * + * Copyright (c) 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -41,7 +41,7 @@ * * Date: 05.Nov.90 * - * $Id: hanoi.c,v 1.36 2014/08/02 17:24:07 tom Exp $ + * $Id: hanoi.c,v 1.39 2017/09/09 00:19:24 tom Exp $ */ #include @@ -89,104 +89,6 @@ static int NTiles = 0; static int NMoves = 0; static bool AutoFlag = FALSE; -static void InitTiles(void); -static void DisplayTiles(void); -static void MakeMove(int From, int To); -static void AutoMove(int From, int To, int Num); -static void Usage(void); -static int Solved(int NumTiles); -static int GetMove(int *From, int *To); -static int InvalidMove(int From, int To); - -int -main(int argc, char **argv) -{ - int FromCol, ToCol; - - setlocale(LC_ALL, ""); - - switch (argc) { - case 1: - NTiles = DEFAULTTILES; - break; - case 2: - NTiles = atoi(argv[1]); - if (NTiles > MAXTILES || NTiles < MINTILES) { - fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES); - ExitProgram(EXIT_FAILURE); - } - break; - case 3: - if (strcmp(argv[2], "a")) { - Usage(); - ExitProgram(EXIT_FAILURE); - } - NTiles = atoi(argv[1]); - if (NTiles > MAXTILES || NTiles < MINTILES) { - fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES); - ExitProgram(EXIT_FAILURE); - } - AutoFlag = TRUE; - break; - default: - Usage(); - ExitProgram(EXIT_FAILURE); - } - initscr(); - if (has_colors()) { - int i; - short bg = COLOR_BLACK; - start_color(); -#if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) - bg = -1; -#endif - for (i = 0; i < 9; i++) - init_pair((short) (i + 1), bg, TileColour[i]); - } - cbreak(); - if (LINES < 24) { - endwin(); - fprintf(stderr, "Min screen length 24 lines\n"); - ExitProgram(EXIT_FAILURE); - } - if (AutoFlag) { - curs_set(0); - leaveok(stdscr, TRUE); /* Attempt to remove cursor */ - } - InitTiles(); - DisplayTiles(); - if (AutoFlag) { - do { - noecho(); - AutoMove(0, 2, NTiles); - } while (!Solved(NTiles)); - sleep(2); - } else { - echo(); - for (;;) { - if (GetMove(&FromCol, &ToCol)) - break; - if (InvalidMove(FromCol, ToCol)) { - MvAddStr(STATUSLINE, 0, "Invalid Move !!"); - refresh(); - beep(); - continue; - } - MakeMove(FromCol, ToCol); - if (Solved(NTiles)) { - MvPrintw(STATUSLINE, 0, - "Well Done !! You did it in %d moves", NMoves); - refresh(); - sleep(5); - break; - } - } - } - endwin(); - ExitProgram(EXIT_SUCCESS); -} - static int InvalidMove(int From, int To) { @@ -329,9 +231,129 @@ Solved(int NumTiles) } static void -Usage(void) +usage(void) +{ + static const char *msg[] = + { + "Usage: hanoi [options] [[] [a]]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -n NUM set number of tiles (positional param is deprecated)" + ," -X solve automatically (positional \"a\" is deprecated)" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + +int +main(int argc, char **argv) { - fprintf(stderr, "Usage: hanoi [] [a]\n"); - fprintf(stderr, - "The 'a' option causes the tower to be solved automatically\n"); + int ch, FromCol, ToCol; + +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif + + NTiles = DEFAULTTILES; + while ((ch = getopt(argc, argv, "dn:X")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif + case 'n': + NTiles = atoi(optarg); + break; + case 'X': + AutoFlag = TRUE; + break; + default: + usage(); + /* NOTREACHED */ + } + } + setlocale(LC_ALL, ""); + + switch (ch = (argc - optind)) { + case 2: + if (strcmp(argv[optind + 1], "a")) { + usage(); + } + AutoFlag = TRUE; + /* FALLTHRU */ + case 1: + NTiles = atoi(argv[optind]); + /* FALLTHRU */ + case 0: + break; + default: + usage(); + } + + if (NTiles > MAXTILES || NTiles < MINTILES) { + fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES); + usage(); + } + + initscr(); + if (has_colors()) { + int i; + short bg = COLOR_BLACK; + start_color(); +#if HAVE_USE_DEFAULT_COLORS + if (d_option && (use_default_colors() == OK)) + bg = -1; +#endif + for (i = 0; i < 9; i++) + init_pair((short) (i + 1), bg, TileColour[i]); + } + cbreak(); + if (LINES < 24) { + endwin(); + fprintf(stderr, "Min screen length 24 lines\n"); + ExitProgram(EXIT_FAILURE); + } + if (AutoFlag) { + curs_set(0); + leaveok(stdscr, TRUE); /* Attempt to remove cursor */ + } + InitTiles(); + DisplayTiles(); + if (AutoFlag) { + do { + noecho(); + AutoMove(0, 2, NTiles); + } while (!Solved(NTiles)); + sleep(2); + } else { + echo(); + for (;;) { + if (GetMove(&FromCol, &ToCol)) + break; + if (InvalidMove(FromCol, ToCol)) { + MvAddStr(STATUSLINE, 0, "Invalid Move !!"); + refresh(); + beep(); + continue; + } + MakeMove(FromCol, ToCol); + if (Solved(NTiles)) { + MvPrintw(STATUSLINE, 0, + "Well Done !! You did it in %d moves", NMoves); + refresh(); + sleep(5); + break; + } + } + } + exit_curses(); + ExitProgram(EXIT_SUCCESS); } diff --git a/test/inchs.c b/test/inchs.c index 2e05ccbc..87a8e670 100644 --- a/test/inchs.c +++ b/test/inchs.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inchs.c,v 1.14 2017/04/29 22:03:26 tom Exp $ + * $Id: inchs.c,v 1.16 2017/09/06 09:20:42 tom Exp $ * * Author: Thomas E Dickey */ diff --git a/test/insdelln.c b/test/insdelln.c index 84fc9996..e8b98e21 100644 --- a/test/insdelln.c +++ b/test/insdelln.c @@ -26,12 +26,15 @@ * authorization. * ****************************************************************************/ /* - * $Id: insdelln.c,v 1.10 2017/04/15 17:40:11 tom Exp $ + * $Id: insdelln.c,v 1.12 2017/09/07 08:24:24 tom Exp $ * * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln */ #include + +#if HAVE_WINSDELLN + #include #define SHOW(n) ((n) == ERR ? "ERR" : "OK") @@ -379,3 +382,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) ExitProgram(EXIT_SUCCESS); } + +#else +int +main(void) +{ + printf("This program requires the curses winsdelln function\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/knight.c b/test/knight.c index e9b41349..b95996c6 100644 --- a/test/knight.c +++ b/test/knight.c @@ -33,25 +33,26 @@ * Eric S. Raymond July 22 1995. Mouse support * added September 20th 1995. * - * $Id: knight.c,v 1.38 2017/08/20 16:15:42 tom Exp $ + * $Id: knight.c,v 1.43 2017/09/10 00:13:02 tom Exp $ */ #include /* board size */ -#define BDEPTH 8 -#define BWIDTH 8 +#define YLIMIT 8 +#define XLIMIT 8 +#define MAXMOVES (ylimit * xlimit) /* where to start the instructions */ -#define INSTRY 2 -#define INSTRX 35 +#define INSTRY 2 +#define INSTRX 35 /* corner of board */ -#define BOARDY 2 -#define BOARDX 0 +#define BOARDY 2 +#define BOARDX 0 /* notification line */ -#define NOTIFYY 21 +#define NOTIFYY 21 /* virtual color values */ #define TRAIL_COLOR 1 @@ -65,20 +66,28 @@ #define CYINV(y) (((y) - 2) / 2) typedef struct { - short x, y; -} cell; + int x, y; +} HISTORY; + +typedef int SQUARES[YLIMIT][XLIMIT]; static WINDOW *boardwin; /* the board window */ static WINDOW *helpwin; /* the help window */ static WINDOW *msgwin; /* the message window */ -static cell history[BDEPTH * BWIDTH + 1]; /* choice history */ + +static bool d_option; + static chtype minus = '-'; /* possible-move character */ static chtype oldch; static chtype plus = '+'; /* cursor hot-spot character */ static chtype trail = '#'; /* trail character */ -static int movecount; /* count of moves so far */ -static int trialcount; /* count of trials so far */ -static short board[BDEPTH][BWIDTH]; /* the squares */ + +static int ylimit = YLIMIT; +static int xlimit = XLIMIT; +static int maxmoves = (YLIMIT * XLIMIT); + +static int count_tries; /* count of trials so far */ +static int test_test; /* FIXME */ /* *INDENT-OFF* */ static const struct { int y; @@ -93,6 +102,7 @@ static const struct { { 1, -2 }, { 2, -1 }, }; +#define MAX_OFFSET (unsigned)SIZEOF(offsets) /* *INDENT-ON* */ static void @@ -104,9 +114,12 @@ init_program(void) initscr(); cbreak(); /* immediate char return */ noecho(); /* no immediate echo */ - boardwin = newwin(BDEPTH * 2 + 1, BWIDTH * 4 + 1, BOARDY, BOARDX); + + maxmoves = MAXMOVES; + boardwin = newwin(ylimit * 2 + 1, xlimit * 4 + 1, BOARDY, BOARDX); helpwin = newwin(0, 0, INSTRY, INSTRX); msgwin = newwin(1, INSTRX - 1, NOTIFYY, 0); + scrollok(msgwin, TRUE); keypad(boardwin, TRUE); @@ -115,7 +128,7 @@ init_program(void) start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (d_option && (use_default_colors() == OK)) bg = -1; #endif @@ -178,7 +191,11 @@ help2(void) (void) waddstr(helpwin, "r -- redraw screen \\|/ \\|/ \n"); (void) waddstr(helpwin, "bksp -- undo move h-+-l 4-+-6\n"); (void) waddstr(helpwin, "a -- autojump /|\\ /|\\ \n"); - (void) waddstr(helpwin, " b j n 1 2 3\n"); + if (ylimit <= 6) { + (void) waddstr(helpwin, "R -- solve (slow) b j n 1 2 3\n"); + } else { + (void) waddstr(helpwin, " b j n 1 2 3\n"); + } (void) waddstr(helpwin, "\nYou can place your knight on the selected\n"); (void) waddstr(helpwin, "square with spacebar, Enter, or the keypad\n"); @@ -202,30 +219,33 @@ show_help(bool * keyhelp) wrefresh(helpwin); } -static bool -chksqr(int r1, int c1) +static inline bool +isValidYX(int y, int x) { - if ((r1 < 0) || (r1 > BDEPTH - 1)) - return (FALSE); - if ((c1 < 0) || (c1 > BWIDTH - 1)) - return (FALSE); - return ((!board[r1][c1]) ? TRUE : FALSE); + return (y >= 0 && y < ylimit && x >= 0 && x < xlimit) ? TRUE : FALSE; +} + +static inline bool +isUnusedYX(SQUARES squares, int y, int x) +{ + return (isValidYX(y, x) && (!squares[y][x]) ? TRUE : FALSE); } static bool -chkmoves(int rw, int col) -/* check to see if valid moves are available */ +boardIsFilled(SQUARES squares, int y, int x) { unsigned n; - for (n = 0; n < SIZEOF(offsets); n++) - if (chksqr(rw + offsets[n].y, col + offsets[n].x)) - return (TRUE); - return (FALSE); + for (n = 0; n < MAX_OFFSET; n++) { + if (isUnusedYX(squares, y + offsets[n].y, x + offsets[n].x)) { + return FALSE; + } + } + return TRUE; } static void -dosquares(void) +drawBoard(void) { int i, j; @@ -233,7 +253,7 @@ dosquares(void) move(BOARDY, BOARDX); waddch(boardwin, ACS_ULCORNER); - for (j = 0; j < 7; j++) { + for (j = 0; j < (ylimit - 1); j++) { waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); @@ -244,10 +264,10 @@ dosquares(void) waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_URCORNER); - for (i = 1; i < BDEPTH; i++) { + for (i = 1; i < ylimit; i++) { move(BOARDY + i * 2 - 1, BOARDX); waddch(boardwin, ACS_VLINE); - for (j = 0; j < BWIDTH; j++) { + for (j = 0; j < xlimit; j++) { waddch(boardwin, ' '); waddch(boardwin, ' '); waddch(boardwin, ' '); @@ -255,7 +275,7 @@ dosquares(void) } move(BOARDY + i * 2, BOARDX); waddch(boardwin, ACS_LTEE); - for (j = 0; j < BWIDTH - 1; j++) { + for (j = 0; j < xlimit - 1; j++) { waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); @@ -269,7 +289,7 @@ dosquares(void) move(BOARDY + i * 2 - 1, BOARDX); waddch(boardwin, ACS_VLINE); - for (j = 0; j < BWIDTH; j++) { + for (j = 0; j < xlimit; j++) { waddch(boardwin, ' '); waddch(boardwin, ' '); waddch(boardwin, ' '); @@ -278,7 +298,7 @@ dosquares(void) move(BOARDY + i * 2, BOARDX); waddch(boardwin, ACS_LLCORNER); - for (j = 0; j < BWIDTH - 1; j++) { + for (j = 0; j < xlimit - 1; j++) { waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); waddch(boardwin, ACS_HLINE); @@ -291,20 +311,20 @@ dosquares(void) } static void -mark_possibles(int prow, int pcol, chtype mark) +mark_possibles(SQUARES squares, int y, int x, chtype mark) { unsigned n; - for (n = 0; n < SIZEOF(offsets); n++) { - if (chksqr(prow + offsets[n].y, pcol + offsets[n].x)) { - cellmove(prow + offsets[n].y, pcol + offsets[n].x); + for (n = 0; n < MAX_OFFSET; n++) { + if (isUnusedYX(squares, y + offsets[n].y, x + offsets[n].x)) { + cellmove(y + offsets[n].y, x + offsets[n].x); waddch(boardwin, mark); } } } static bool -find_next_move(int *y, int *x) +find_next_move(SQUARES squares, HISTORY * doneData, int doneSize, int *y, int *x) { unsigned j, k; int found = -1; @@ -314,14 +334,14 @@ find_next_move(int *y, int *x) int newy, newx; bool result = FALSE; - if (movecount > 1) { - oldy = history[movecount - 1].y; - oldx = history[movecount - 1].x; - for (j = 0; j < SIZEOF(offsets) * 2; j++) { - k = j % SIZEOF(offsets); + if (doneSize > 1) { + oldy = doneData[doneSize - 1].y; + oldx = doneData[doneSize - 1].x; + for (j = 0; j < MAX_OFFSET * 2; j++) { + k = j % MAX_OFFSET; newy = oldy + offsets[k].y; newx = oldx + offsets[k].x; - if (chksqr(newy, newx)) { + if (isUnusedYX(squares, newy, newx)) { if (first < 0) first = (int) k; if (newy == *y @@ -345,16 +365,16 @@ find_next_move(int *y, int *x) } static void -count_next_moves(int y, int x) +count_next_moves(SQUARES squares, int count_moves, int y, int x) { int count = 0; unsigned j; - wprintw(msgwin, "\nMove %d", movecount); - for (j = 0; j < SIZEOF(offsets); j++) { + wprintw(msgwin, "\nMove %d", count_moves); + for (j = 0; j < MAX_OFFSET; j++) { int newy = y + offsets[j].y; int newx = x + offsets[j].x; - if (chksqr(newy, newx)) { + if (isUnusedYX(squares, newy, newx)) { ++count; } } @@ -383,37 +403,38 @@ markcell(chtype tchar, int row, int column) } static void -drawmove(chtype tchar, int oldy, int oldx, int row, int column) +drawMove(SQUARES squares, int count_moves, chtype tchar, int oldy, int oldx, int + row, int column) /* place the stars, update board & currents */ { - if (movecount <= 1) { + if (count_moves <= 1) { int i, j; - for (i = 0; i < BDEPTH; i++) { - for (j = 0; j < BWIDTH; j++) { - if (movecount == 0) { + for (i = 0; i < ylimit; i++) { + for (j = 0; j < xlimit; j++) { + if (count_moves == 0) { unmarkcell(i, j); } else { cellmove(i, j); if (winch(boardwin) == minus) - waddch(boardwin, movecount ? ' ' : minus); + waddch(boardwin, count_moves ? ' ' : minus); } } } } else { markcell(tchar, oldy, oldx); - mark_possibles(oldy, oldx, ' '); + mark_possibles(squares, oldy, oldx, ' '); } if (row >= 0 && column >= 0) { markcell(trail, row, column); - mark_possibles(row, column, minus); - board[row][column] = TRUE; + mark_possibles(squares, row, column, minus); + squares[row][column] = TRUE; } - wprintw(msgwin, "\nMove %d", movecount); - if (trialcount != movecount) - wprintw(msgwin, " (%d tries)", trialcount); + wprintw(msgwin, "\nMove %d", count_moves); + if (count_tries != count_moves) + wprintw(msgwin, " (%d tries)", count_tries); wclrtoeol(msgwin); } @@ -427,17 +448,16 @@ iabs(int num) } static bool -evalmove(int row, int column) -/* evaluate move */ +evaluate_move(SQUARES squares, HISTORY * doneData, int doneSize, int row, int column) { - if (movecount == 1) + if (doneSize <= 1) return (TRUE); - else if (board[row][column] == TRUE) { + else if (squares[row][column] == TRUE) { waddstr(msgwin, "\nYou've already been there."); return (FALSE); } else { - int rdif = iabs(row - history[movecount - 1].y); - int cdif = iabs(column - history[movecount - 1].x); + int rdif = iabs(row - doneData[doneSize - 1].y); + int cdif = iabs(column - doneData[doneSize - 1].x); if (!((rdif == 1) && (cdif == 2)) && !((rdif == 2) && (cdif == 1))) { waddstr(msgwin, "\nThat's not a legal knight's move."); @@ -449,15 +469,18 @@ evalmove(int row, int column) } static int -completed(void) +completed(SQUARES squares) { int i, j, count = 0; - for (i = 0; i < BDEPTH; i++) - for (j = 0; j < BWIDTH; j++) - if (board[i][j] != 0) + for (i = 0; i < ylimit; i++) { + for (j = 0; j < xlimit; j++) { + if (squares[i][j] != 0) { count += 1; - return (count == (BWIDTH * BDEPTH) ? -1 : count); + } + } + } + return ((count == maxmoves) ? -1 : count); } static void @@ -467,6 +490,104 @@ no_previous_move(void) beep(); } +/* Recursively try all possible moves, starting from (y,x) */ +static int +recurBack(SQUARES squares, int y, int x, int total) +{ + int longest = total; + int best_x = x; + int best_y = y; + int result; + + if (total < maxmoves) { + int try_x, try_y; + unsigned k; + + for (k = 0; k < MAX_OFFSET; k++) { + try_x = x + offsets[k].x; + try_y = y + offsets[k].y; + if (isUnusedYX(squares, try_y, try_x)) { + ++test_test; + squares[try_y][try_x] = total + 1; + result = recurBack(squares, try_y, try_x, total + 1); + if (result > longest) { + longest = result; + best_x = try_x; + best_y = try_y; + } + if (result >= maxmoves) + break; + squares[try_y][try_x] = 0; /* allow retry... */ + } + } + } + + result = total; + if (longest > total) { + result = longest; + squares[best_y][best_x] = total + 1; + (void) recurBack(squares, best_y, best_x, total + 1); + if (result < maxmoves) + squares[best_y][best_x] = 0; + } + + return result; +} + +/* + * Solve the Knight Tour problem using backtracking, returning the length of + * the resulting solution. If this is invoked from a point where the remaining + * choices cannot complete the tour, the result will fall short. + */ +static int +useBacktracking(SQUARES result, HISTORY * doneData, int doneSize) +{ + int y = 0, x = 0, n; + SQUARES squares; + int total; + int actual = doneSize - 1; + + memset(squares, 0, sizeof(squares)); + for (n = 1; n <= actual; ++n) { + y = doneData[n].y; + x = doneData[n].x; + squares[y][x] = n; + } + + total = recurBack(squares, y, x, actual); + if (total > actual) { + for (y = 0; y < ylimit; ++y) { + for (x = 0; x < xlimit; ++x) { + result[y][x] = squares[y][x]; + if ((n = squares[y][x]) != 0) { + doneData[n].y = y; + doneData[n].x = x; + } + } + } + } + return total; +} + +static int +reviewHistory(HISTORY * history, int count_moves, int review, int *ny, int *nx) +{ + if (review < 0) { + beep(); + review = 0; + } else if (review > count_moves - 2) { + beep(); + review = count_moves - 2; + } else { + *ny = history[count_moves - review - 1].y; + *nx = history[count_moves - review - 1].x; + wprintw(msgwin, "\nReview %d:%d.", count_moves - review - 1, + count_moves - 1); + wrefresh(msgwin); + } + return review; +} + static void play(void) /* play the game */ @@ -477,14 +598,19 @@ play(void) int lastrow = 0; int ny = 0, nx = 0; int review = 0; /* review history */ + int test_size; int rw = 0, col = 0; /* current row and column */ do { + SQUARES squares; + HISTORY history[(YLIMIT * XLIMIT) + 1]; + int count_moves = 0; /* count of moves so far */ + /* clear screen and draw board */ werase(boardwin); werase(helpwin); werase(msgwin); - dosquares(); + drawBoard(); help1(); wnoutrefresh(stdscr); wnoutrefresh(helpwin); @@ -492,10 +618,9 @@ play(void) wnoutrefresh(boardwin); doupdate(); - movecount = 0; - for (i = 0; i < BDEPTH; i++) { - for (j = 0; j < BWIDTH; j++) { - board[i][j] = FALSE; + for (i = 0; i < ylimit; i++) { + for (j = 0; j < xlimit; j++) { + squares[i][j] = FALSE; unmarkcell(i, j); } } @@ -503,8 +628,8 @@ play(void) history[0].y = history[0].x = -1; history[1].y = history[1].x = -1; lastrow = lastcol = -2; - movecount = 1; - trialcount = 1; + count_moves = 1; + count_tries = 1; keyhelp = FALSE; show_help(&keyhelp); @@ -512,7 +637,7 @@ play(void) if (rw != lastrow || col != lastcol) { if (lastrow >= 0 && lastcol >= 0) { cellmove(lastrow, lastcol); - if (board[lastrow][lastcol]) + if (squares[lastrow][lastcol]) waddch(boardwin, trail); else waddch(boardwin, oldch); @@ -534,7 +659,7 @@ play(void) case 'k': case '8': case KEY_UP: - ny = rw + BDEPTH - 1; + ny = rw + ylimit - 1; nx = col; break; case 'j': @@ -547,7 +672,7 @@ play(void) case '4': case KEY_LEFT: ny = rw; - nx = col + BWIDTH - 1; + nx = col + xlimit - 1; break; case 'l': case '6': @@ -558,19 +683,19 @@ play(void) case 'y': case '7': case KEY_A1: - ny = rw + BDEPTH - 1; - nx = col + BWIDTH - 1; + ny = rw + ylimit - 1; + nx = col + xlimit - 1; break; case 'b': case '1': case KEY_C1: ny = rw + 1; - nx = col + BWIDTH - 1; + nx = col + xlimit - 1; break; case 'u': case '9': case KEY_A3: - ny = rw + BDEPTH - 1; + ny = rw + ylimit - 1; nx = col + 1; break; case 'n': @@ -587,8 +712,8 @@ play(void) MEVENT myevent; getmouse(&myevent); - if (myevent.y >= CY(0) && myevent.y <= CY(BDEPTH) - && myevent.x >= CX(0) && myevent.x <= CX(BWIDTH)) { + if (myevent.y >= CY(0) && myevent.y <= CY(ylimit) + && myevent.x >= CX(0) && myevent.x <= CX(xlimit)) { nx = CXINV(myevent.x); ny = CYINV(myevent.y); ungetch('\n'); @@ -605,8 +730,8 @@ play(void) request_mouse_pos(); test_y = MOUSE_Y_POS + 0; test_x = MOUSE_X_POS + 1; - if (test_y >= CY(0) && test_y <= CY(BDEPTH) - && test_x >= CX(0) && test_x <= CX(BWIDTH)) { + if (test_y >= CY(0) && test_y <= CY(ylimit) + && test_x >= CX(0) && test_x <= CX(xlimit)) { ny = CYINV(test_y); nx = CXINV(test_x); wmove(helpwin, 0, 0); @@ -622,18 +747,20 @@ play(void) case '\n': case ' ': review = 0; - if (evalmove(rw, col)) { - drawmove(trail, - history[movecount - 1].y, - history[movecount - 1].x, + if (evaluate_move(squares, history, count_moves, rw, col)) { + drawMove(squares, + count_moves, + trail, + history[count_moves - 1].y, + history[count_moves - 1].x, rw, col); - history[movecount].y = (short) rw; - history[movecount].x = (short) col; - movecount++; - trialcount++; + history[count_moves].y = (short) rw; + history[count_moves].x = (short) col; + count_moves++; + count_tries++; - if (!chkmoves(rw, col)) { - if (completed() < 0) { + if (boardIsFilled(squares, rw, col)) { + if (completed(squares) < 0) { waddstr(msgwin, "\nYou won."); } else { waddstr(msgwin, @@ -649,40 +776,40 @@ play(void) case KEY_BACKSPACE: case '\b': review = 0; - if (movecount <= 0) { + if (count_moves <= 0) { no_previous_move(); - } else if (movecount <= 1) { - ny = history[movecount].y; - nx = history[movecount].x; + } else if (count_moves <= 1) { + ny = history[count_moves].y; + nx = history[count_moves].x; if (nx < 0 || ny < 0) { ny = (lastrow >= 0) ? lastrow : 0; nx = (lastcol >= 0) ? lastcol : 0; } - movecount = 0; - board[ny][nx] = FALSE; + count_moves = 0; + squares[ny][nx] = FALSE; oldch = minus; - drawmove(' ', ny, nx, -1, -1); - movecount = 1; - trialcount = 1; + drawMove(squares, count_moves, ' ', ny, nx, -1, -1); + count_moves = 1; + count_tries = 1; no_previous_move(); } else { - int oldy = history[movecount - 1].y; - int oldx = history[movecount - 1].x; + int oldy = history[count_moves - 1].y; + int oldx = history[count_moves - 1].x; - if (!board[rw][col]) { + if (!squares[rw][col]) { cellmove(rw, col); waddch(boardwin, ' '); } - board[oldy][oldx] = FALSE; - --movecount; - ny = history[movecount - 1].y; - nx = history[movecount - 1].x; + squares[oldy][oldx] = FALSE; + --count_moves; + ny = history[count_moves - 1].y; + nx = history[count_moves - 1].x; if (nx < 0 || ny < 0) { ny = oldy; nx = oldx; } - drawmove(' ', oldy, oldx, ny, nx); + drawMove(squares, count_moves, ' ', oldy, oldx, ny, nx); /* avoid problems if we just changed the current cell */ cellmove(lastrow, lastcol); @@ -693,30 +820,41 @@ play(void) case 'a': nx = col; ny = rw; - if (find_next_move(&ny, &nx)) - count_next_moves(ny, nx); + if (find_next_move(squares, history, count_moves, &ny, &nx)) + count_next_moves(squares, count_moves, ny, nx); else beep(); break; case 'F': - if (review > 0) { - review--; - ny = history[movecount - review - 1].y; - nx = history[movecount - review - 1].x; - } else { - beep(); - } + review = reviewHistory(history, count_moves, review - 1, + &ny, &nx); break; case 'B': - if (review < movecount - 2) { - review++; - ny = history[movecount - review - 1].y; - nx = history[movecount - review - 1].x; + review = reviewHistory(history, count_moves, review + 1, + &ny, &nx); + break; + + case 'R': + if (ylimit <= 6) { + wprintw(msgwin, "\nworking..."); + wrefresh(msgwin); + test_test = 0; + test_size = useBacktracking(squares, history, count_moves); + wprintw(msgwin, "\nOk %d:%d (%d tests)", + test_size, maxmoves, test_test); + review = 0; + while (count_moves <= test_size) { + markcell(trail, + ny = history[count_moves].y, + nx = history[count_moves].x); + count_moves++; + } } else { - beep(); + wprintw(msgwin, "\nBoard is too large."); } + wrefresh(msgwin); break; #if HAVE_CURSCR @@ -745,12 +883,12 @@ play(void) break; } - col = nx % BWIDTH; - rw = ny % BDEPTH; + col = nx % xlimit; + rw = ny % ylimit; } dropout: - if ((count = completed()) < 0) + if ((count = completed(squares)) < 0) wprintw(msgwin, "\nYou won. Care to try again? "); else wprintw(msgwin, "\n%d squares filled. Try again? ", count); @@ -759,9 +897,55 @@ play(void) (tolower(wgetch(msgwin)) == 'y'); } +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: knight [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -n NUM set board-size to NUM*NUM (default 8x8)" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, "dn:")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif + case 'n': + ch = atoi(optarg); + if (ch < 3 || ch > 8) { + fprintf(stderr, "board size %d is outside [3..8]\n", ch); + usage(); + } + xlimit = ylimit = ch; + break; + default: + usage(); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(); + init_program(); play(); @@ -769,5 +953,3 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) endwin(); ExitProgram(EXIT_SUCCESS); } - -/* knight.c ends here */ diff --git a/test/lrtest.c b/test/lrtest.c index da12034c..ae47b4e7 100644 --- a/test/lrtest.c +++ b/test/lrtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +34,7 @@ * This can't be part of the ncurses test-program, because ncurses rips off the * bottom line to do labels. * - * $Id: lrtest.c,v 1.22 2010/05/01 19:11:55 tom Exp $ + * $Id: lrtest.c,v 1.24 2017/09/04 11:28:19 tom Exp $ */ #include @@ -174,8 +174,7 @@ main( refresh(); } - curs_set(1); - endwin(); + exit_curses(); ExitProgram(EXIT_SUCCESS); } diff --git a/test/mk-test.awk b/test/mk-test.awk index f7d4fd59..0efabc5a 100644 --- a/test/mk-test.awk +++ b/test/mk-test.awk @@ -1,6 +1,6 @@ -# $Id: mk-test.awk,v 1.16 2017/08/11 16:51:10 tom Exp $ +# $Id: mk-test.awk,v 1.17 2017/09/04 00:50:49 tom Exp $ ############################################################################## -# Copyright (c) 2006-2010,2015 Free Software Foundation, Inc. # +# Copyright (c) 2006-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # diff --git a/test/movewindow.c b/test/movewindow.c index 760ac2f4..285d92ef 100644 --- a/test/movewindow.c +++ b/test/movewindow.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: movewindow.c,v 1.43 2017/06/24 20:48:46 tom Exp $ + * $Id: movewindow.c,v 1.45 2017/09/06 20:08:11 tom Exp $ * * Demonstrate move functions for windows and derived windows from the curses * library. @@ -45,7 +45,9 @@ TODO: */ #include -#include + +#if HAVE_MVDERWIN && HAVE_MVWIN + #include #ifdef HAVE_XCURSES @@ -767,3 +769,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #endif ExitProgram(EXIT_SUCCESS); } +#else +int +main(void) +{ + printf("This program requires the curses mvderwin and mvwin functions\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/ncurses.c b/test/ncurses.c index ef6e1e48..24a2f877 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -40,7 +40,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.453 2017/06/24 20:49:44 tom Exp $ +$Id: ncurses.c,v 1.460 2017/09/09 22:52:38 tom Exp $ ***************************************************************************/ @@ -155,6 +155,7 @@ static bool use_colors; /* true if we use colors */ #undef max_pairs static int max_pairs; /* ...and the number of color pairs */ +#if HAVE_COLOR_CONTENT typedef struct { NCURSES_COLOR_T red; NCURSES_COLOR_T green; @@ -162,6 +163,7 @@ typedef struct { } RGB_DATA; static RGB_DATA *all_colors; +#endif static void main_menu(bool); static void failed(const char *s) GCC_NORETURN; @@ -174,29 +176,16 @@ failed(const char *s) ExitProgram(EXIT_FAILURE); } -/* The behavior of mvhline, mvvline for negative/zero length is unspecified, - * though we can rely on negative x/y values to stop the macro. - */ -static void -do_h_line(int y, int x, chtype c, int to) -{ - if ((to) > (x)) - MvHLine(y, x, c, (to) - (x)); -} - -static void -do_v_line(int y, int x, chtype c, int to) -{ - if ((to) > (y)) - MvVLine(y, x, c, (to) - (y)); -} - static void Repaint(void) { touchwin(stdscr); +#if HAVE_CURSCR touchwin(curscr); wrefresh(curscr); +#else + wrefresh(stdscr); +#endif } static bool @@ -2644,6 +2633,7 @@ wide_color_test(void) } #endif /* USE_WIDEC_SUPPORT */ +#if HAVE_COLOR_CONTENT static void change_color(NCURSES_PAIRS_T current, int field, int value, int usebase) { @@ -2990,6 +2980,7 @@ color_edit(void) endwin(); } +#endif /* HAVE_COLOR_CONTENT */ /**************************************************************************** * @@ -5255,6 +5246,25 @@ demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) * ****************************************************************************/ +#if HAVE_NEWPAD + +/* The behavior of mvhline, mvvline for negative/zero length is unspecified, + * though we can rely on negative x/y values to stop the macro. + */ +static void +do_h_line(int y, int x, chtype c, int to) +{ + if ((to) > (x)) + MvHLine(y, x, c, (to) - (x)); +} + +static void +do_v_line(int y, int x, chtype c, int to) +{ + if ((to) > (y)) + MvVLine(y, x, c, (to) - (y)); +} + #define GRIDSIZE 3 static bool pending_pan = FALSE; @@ -5703,6 +5713,7 @@ demo_pad(bool colored) endwin(); erase(); } +#endif /* HAVE_NEWPAD */ /**************************************************************************** * @@ -6519,6 +6530,7 @@ demo_forms(void) * ****************************************************************************/ +#if HAVE_COPYWIN /* ...and overlay, overwrite */ static void fillwin(WINDOW *win, char ch) { @@ -6861,10 +6873,11 @@ overlap_test(void) delwin(win2); delwin(win1); erase(); - curs_set(1); - endwin(); + exit_curses(); } +#endif /* HAVE_COPYWIN */ + static void show_setting_name(const char *name) { @@ -6944,7 +6957,7 @@ show_settings(void) show_boolean_setting("has_il", has_il()); Pause(); erase(); - endwin(); + exit_curses(); } /**************************************************************************** @@ -6994,6 +7007,7 @@ do_single_test(const char c) break; #endif +#if HAVE_COLOR_CONTENT case 'd': if (!use_colors) Cannot("does not support color."); @@ -7002,6 +7016,7 @@ do_single_test(const char c) else color_edit(); break; +#endif #if USE_SOFTKEYS case 'e': @@ -7055,6 +7070,7 @@ do_single_test(const char c) break; #endif +#if HAVE_NEWPAD case 'p': demo_pad(FALSE); break; @@ -7062,6 +7078,7 @@ do_single_test(const char c) case 'P': demo_pad(TRUE); break; +#endif #if USE_LIBFORM case 'r': @@ -7069,9 +7086,11 @@ do_single_test(const char c) break; #endif +#if HAVE_COPYWIN case 's': overlap_test(); break; +#endif #if USE_LIBMENU && defined(TRACE) case 't': @@ -7116,7 +7135,9 @@ usage(void) ," -h rip-off header line (can repeat)" #endif ," -m do not use colors" +#if HAVE_COLOR_CONTENT ," -p file rgb values to use in 'd' rather than ncurses's builtin" +#endif #if USE_LIBPANEL ," -s msec specify nominal time for panel-demo (default: 1, to hold)" #endif @@ -7126,7 +7147,9 @@ usage(void) #ifdef TRACE ," -t mask specify default trace-level (may toggle with ^T)" #endif +#if HAVE_COLOR_CONTENT ," -x use xterm-compatible control for reading color palette" +#endif }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) @@ -7196,8 +7219,10 @@ main_menu(bool top) #if USE_WIDEC_SUPPORT (void) puts("C = color test pattern using wide-character calls"); #endif +#if HAVE_COLOR_CONTENT if (top) (void) puts("d = edit RGB color values"); +#endif #if USE_SOFTKEYS (void) puts("e = exercise soft keys"); #if USE_WIDEC_SUPPORT @@ -7220,13 +7245,17 @@ main_menu(bool top) (void) puts("O = exercise panels with wide-characters"); #endif #endif +#if HAVE_NEWPAD (void) puts("p = exercise pad features"); (void) puts("P = exercise pad features, using color"); +#endif (void) puts("q = quit"); #if USE_LIBFORM (void) puts("r = exercise forms code"); #endif +#if HAVE_COPYWIN (void) puts("s = overlapping-refresh test"); +#endif #if USE_LIBMENU && defined(TRACE) (void) puts("t = set trace level"); #endif @@ -7304,9 +7333,11 @@ main(int argc, char *argv[]) bool assumed_colors = FALSE; bool default_colors = FALSE; #endif - char *palette_file = 0; bool monochrome = FALSE; +#if HAVE_COLOR_CONTENT bool xterm_colors = FALSE; + char *palette_file = 0; +#endif setlocale(LC_ALL, ""); @@ -7354,9 +7385,11 @@ main(int argc, char *argv[]) case 'm': monochrome = TRUE; break; +#if HAVE_COLOR_CONTENT case 'p': palette_file = optarg; break; +#endif #if USE_LIBPANEL case 's': nap_msec = (int) atol(optarg); @@ -7372,9 +7405,11 @@ main(int argc, char *argv[]) save_trace = (unsigned) strtol(optarg, 0, 0); break; #endif +#if HAVE_COLOR_CONTENT case 'x': xterm_colors = TRUE; break; +#endif default: usage(); } @@ -7434,9 +7469,11 @@ main(int argc, char *argv[]) #endif max_pairs = COLOR_PAIRS; /* was > 256 ? 256 : COLOR_PAIRS */ +#if HAVE_COLOR_CONTENT if (can_change_color()) { init_all_colors(xterm_colors, palette_file); } +#endif } /* diff --git a/test/newdemo.c b/test/newdemo.c index e056ecb7..462e340b 100644 --- a/test/newdemo.c +++ b/test/newdemo.c @@ -2,7 +2,7 @@ * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. * - * $Id: newdemo.c,v 1.43 2016/09/10 21:25:53 tom Exp $ + * $Id: newdemo.c,v 1.44 2017/09/04 11:49:55 tom Exp $ */ #include @@ -50,7 +50,7 @@ static const char *messages[] = static void trap(int sig GCC_UNUSED) { - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } @@ -241,7 +241,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) height = 14; /* Create a drawing window */ win = newwin(height, width, (LINES - height) / 2, (COLS - width) / 2); if (win == NULL) { - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } @@ -360,6 +360,6 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) if (WaitForUser(win) == 1) break; } - endwin(); + exit_curses(); ExitProgram(EXIT_SUCCESS); } diff --git a/test/picsmap.c b/test/picsmap.c index e971140a..47a9388b 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.101 2017/08/20 16:42:13 tom Exp $ + * $Id: picsmap.c,v 1.103 2017/09/06 09:21:38 tom Exp $ * * Author: Thomas E. Dickey * @@ -49,7 +49,6 @@ */ #include -#include #include #include @@ -1703,7 +1702,7 @@ main(int argc, char *argv[]) init_palette(palette_path); } scrollok(stdscr, FALSE); - endwin(); + exit_curses(); } if (optind >= argc) giveup("expected at least one image filename"); diff --git a/test/popup_msg.c b/test/popup_msg.c index 0b151feb..5a351731 100644 --- a/test/popup_msg.c +++ b/test/popup_msg.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.c,v 1.7 2017/04/15 19:16:41 tom Exp $ + * $Id: popup_msg.c,v 1.8 2017/09/03 21:05:01 tom Exp $ * * Show a multi-line message in a window which may extend beyond the screen. * @@ -37,6 +37,8 @@ #include +#if HAVE_NEWPAD + static WINDOW *old_window; static void @@ -167,3 +169,13 @@ popup_msg2(WINDOW *parent, char **msg) { popup_msg(parent, (const char *const *) msg); } + +#else +void +popup_msg(WINDOW *parent, const char *const *msg) +{ + (void) parent; + (void) msg; + beep(); +} +#endif diff --git a/test/rain.c b/test/rain.c index f3f7aa49..c51c7b0a 100644 --- a/test/rain.c +++ b/test/rain.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: rain.c,v 1.43 2017/04/30 01:08:14 tom Exp $ + * $Id: rain.c,v 1.46 2017/09/09 00:37:51 tom Exp $ */ #include #include @@ -70,8 +70,7 @@ static STATS drop_threads[MAX_THREADS]; static void onsig(int n GCC_UNUSED) { - curs_set(1); - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } @@ -289,9 +288,28 @@ get_input(void) return USING_WINDOW(stdscr, wgetch); } +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: rain [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { static const char *help[] = { @@ -309,6 +327,25 @@ main(int argc GCC_UNUSED, DATA last[MAX_DROP]; #endif int j = 0; + int ch; +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif + + while ((ch = getopt(argc, argv, "d")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif + default: + usage(); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(); setlocale(LC_ALL, ""); @@ -319,7 +356,7 @@ main(int argc GCC_UNUSED, int bg = COLOR_BLACK; start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (d_option && (use_default_colors() == OK)) bg = -1; #endif init_pair(1, COLOR_BLUE, (short) bg); @@ -394,8 +431,7 @@ main(int argc GCC_UNUSED, } napms(50); } - curs_set(1); - endwin(); + exit_curses(); #ifdef USE_PTHREADS printf("Counts per thread:\n"); for (j = 0; j < MAX_THREADS; ++j) diff --git a/test/savescreen.c b/test/savescreen.c index 9ace6a70..e48800db 100644 --- a/test/savescreen.c +++ b/test/savescreen.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: savescreen.c,v 1.32 2017/04/15 17:33:50 tom Exp $ + * $Id: savescreen.c,v 1.34 2017/09/04 15:01:45 tom Exp $ * * Demonstrate save/restore functions from the curses library. * Thomas Dickey - 2007/7/14 @@ -313,7 +313,7 @@ main(int argc, char *argv[]) } move(0, 0); } else { - endwin(); + exit_curses(); fprintf(stderr, "Cannot open \"%s\"\n", fill_by); ExitProgram(EXIT_FAILURE); } @@ -325,14 +325,14 @@ main(int argc, char *argv[]) * Use the last file as the initial/current screen. */ if (last < 0) { - endwin(); + exit_curses(); printf("No screen-dumps given\n"); ExitProgram(EXIT_FAILURE); } which = last; if (load_screen(files[which]) == ERR) { - endwin(); + exit_curses(); printf("Cannot load screen-dump %s\n", files[which]); ExitProgram(EXIT_FAILURE); } @@ -489,7 +489,7 @@ main(int argc, char *argv[]) #else int -main(int argc, char *argv[]) +main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { printf("This program requires the screen-dump functions\n"); ExitProgram(EXIT_FAILURE); diff --git a/test/tclock.c b/test/tclock.c index 19a44a5f..42cb8cf7 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,4 +1,4 @@ -/* $Id: tclock.c,v 1.35 2016/09/04 23:52:17 tom Exp $ */ +/* $Id: tclock.c,v 1.38 2017/09/09 00:37:06 tom Exp $ */ #include @@ -116,8 +116,28 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch) } } +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: tclock [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int i, cx, cy; double cr, mradius, hradius, mangle, hangle; @@ -137,6 +157,24 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) struct timeval current; #endif double fraction = 0.0; +#if HAVE_USE_DEFAULT_COLORS + bool d_option = FALSE; +#endif + + while ((ch = getopt(argc, argv, "d")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + d_option = TRUE; + break; +#endif + default: + usage(); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(); setlocale(LC_ALL, ""); @@ -149,7 +187,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) if (has_colors()) { start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (d_option && (use_default_colors() == OK)) my_bg = -1; #endif init_pair(1, COLOR_RED, my_bg); @@ -254,8 +292,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) } - curs_set(1); - endwin(); + exit_curses(); ExitProgram(EXIT_SUCCESS); } #else diff --git a/test/test.priv.h b/test/test.priv.h index 50f5b690..dcfa8e75 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.148 2017/08/20 16:51:33 tom Exp $ */ +/* $Id: test.priv.h,v 1.154 2017/09/06 20:07:40 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -86,10 +86,22 @@ #define HAVE_COLOR_CONTENT 0 #endif +#ifndef HAVE_COPYWIN +#define HAVE_COPYWIN 0 +#endif + #ifndef HAVE_COLOR_SET #define HAVE_COLOR_SET 0 #endif +#ifndef HAVE_DELSCREEN +#define HAVE_DELSCREEN 0 +#endif + +#ifndef HAVE_DUPWIN +#define HAVE_DUPWIN 0 +#endif + #ifndef HAVE_FILTER #define HAVE_FILTER 0 #endif @@ -122,6 +134,10 @@ #define HAVE_GETWIN 0 #endif +#ifndef HAVE_HALFDELAY +#define HAVE_HALFDELAY 0 +#endif + #ifndef HAVE_INIT_EXTENDED_COLOR #define HAVE_INIT_EXTENDED_COLOR 0 #endif @@ -154,10 +170,18 @@ #define HAVE_MENU_H 0 #endif +#ifndef HAVE_MVDERWIN +#define HAVE_MVDERWIN 0 +#endif + #ifndef HAVE_MVVLINE #define HAVE_MVVLINE 0 #endif +#ifndef HAVE_MVWIN +#define HAVE_MVWIN 0 +#endif + #ifndef HAVE_MVWVLINE #define HAVE_MVWVLINE 0 #endif @@ -170,6 +194,10 @@ #define HAVE_NC_ALLOC_H 0 #endif +#ifndef HAVE_NEWPAD +#define HAVE_NEWPAD 0 +#endif + #ifndef HAVE_PANEL_H #define HAVE_PANEL_H 0 #endif @@ -294,6 +322,10 @@ #define HAVE_VID_PUTS 0 #endif +#ifndef HAVE_WINSDELLN +#define HAVE_WINSDELLN 0 +#endif + #ifndef HAVE_WRESIZE #define HAVE_WRESIZE 0 #endif @@ -695,18 +727,18 @@ extern char *strnames[], *strcodes[], *strfnames[]; * These usually are implemented as macros, but may be functions. */ #if !defined(getcurx) && !HAVE_GETCURX -#define getcurx(win) ((win)?(win)->_curx:ERR) -#define getcury(win) ((win)?(win)->_cury:ERR) +#define getcurx(win) ((win) ? ((int)(win)->_curx) : ERR) +#define getcury(win) ((win) ? ((int)(win)->_cury) : ERR) #endif #if !defined(getbegx) && !HAVE_GETBEGX -#define getbegx(win) ((win)?(win)->_begx:ERR) -#define getbegy(win) ((win)?(win)->_begy:ERR) +#define getbegx(win) ((win) ? ((int)(win)->_begx) : ERR) +#define getbegy(win) ((win) ? ((int)(win)->_begy) : ERR) #endif #if !defined(getmaxx) && !HAVE_GETMAXX -#define getmaxx(win) ((win)?((win)->_maxx + 1):ERR) -#define getmaxy(win) ((win)?((win)->_maxy + 1):ERR) +#define getmaxx(win) ((win) ? ((int)(win)->_maxx + 1) : ERR) +#define getmaxy(win) ((win) ? ((int)(win)->_maxy + 1) : ERR) #endif /* @@ -760,6 +792,15 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define NCURSES_XNAMES 0 #endif +/* + * ncurses restores the cursor in endwin(). Other libraries may not. + */ +#ifdef NCURSES_VERSION +#define exit_curses() endwin() +#else +#define exit_curses() do { endwin(); curs_set(1); } while (0) +#endif + /* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list * (which is incompatible with legacy usage, doesn't solve any problems). */ diff --git a/test/test_addchstr.c b/test/test_addchstr.c index 4bcc25b8..0a1a1290 100644 --- a/test/test_addchstr.c +++ b/test/test_addchstr.c @@ -26,14 +26,13 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addchstr.c,v 1.21 2017/04/15 14:09:14 tom Exp $ + * $Id: test_addchstr.c,v 1.23 2017/09/06 09:27:20 tom Exp $ * * Demonstrate the waddchstr() and waddch functions. * Thomas Dickey - 2009/9/12 */ #include - #include /* diff --git a/test/test_addstr.c b/test/test_addstr.c index cc5c89fe..2bb1d02f 100644 --- a/test/test_addstr.c +++ b/test/test_addstr.c @@ -26,14 +26,13 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addstr.c,v 1.13 2017/04/15 14:56:27 tom Exp $ + * $Id: test_addstr.c,v 1.15 2017/09/06 09:27:34 tom Exp $ * * Demonstrate the waddstr() and waddch functions. * Thomas Dickey - 2009/9/12 */ #include - #include /* diff --git a/test/test_instr.c b/test/test_instr.c index fa33076c..6dd16eb3 100644 --- a/test/test_instr.c +++ b/test/test_instr.c @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_instr.c,v 1.7 2017/04/15 14:08:40 tom Exp $ + * $Id: test_instr.c,v 1.9 2017/09/06 09:27:45 tom Exp $ * * Author: Thomas E Dickey * diff --git a/test/testcurs.c b/test/testcurs.c index 7a44a2c6..0a90d817 100644 --- a/test/testcurs.c +++ b/test/testcurs.c @@ -6,7 +6,7 @@ * wrs(5/28/93) -- modified to be consistent (perform identically) with either * PDCurses or under Unix System V, R4 * - * $Id: testcurs.c,v 1.50 2015/07/05 00:11:10 tom Exp $ + * $Id: testcurs.c,v 1.52 2017/09/04 11:49:55 tom Exp $ */ #include @@ -20,127 +20,16 @@ static void display_menu(int, int); static void inputTest(WINDOW *); static void introTest(WINDOW *); static void outputTest(WINDOW *); +#if HAVE_NEWPAD static void padTest(WINDOW *); +#endif static void scrollTest(WINDOW *); #if defined(PDCURSES) && !defined(XCURSES) static void resizeTest(WINDOW *); #endif -struct commands { - NCURSES_CONST char *text; - void (*function) (WINDOW *); -}; -typedef struct commands COMMAND; - -static const COMMAND command[] = -{ - {"General Test", introTest}, - {"Pad Test", padTest}, -#if defined(PDCURSES) && !defined(XCURSES) - {"Resize Test", resizeTest}, -#endif - {"Scroll Test", scrollTest}, - {"Input Test", inputTest}, - {"Output Test", outputTest} -}; -#define MAX_OPTIONS (int) SIZEOF(command) - static int width, height; -int -main( - int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) -{ - WINDOW *win; - int key; - int old_option = (-1); - int new_option = 0; - bool quit = FALSE; - int n; - - setlocale(LC_ALL, ""); - -#ifdef PDCDEBUG - PDC_debug("testcurs started\n"); -#endif - if (!initTest(&win)) - ExitProgram(EXIT_FAILURE); - - erase(); - display_menu(old_option, new_option); - for (;;) { -#ifdef A_COLOR - if (has_colors()) { - init_pair(1, COLOR_WHITE, COLOR_BLUE); - wbkgd(win, (chtype) COLOR_PAIR(1)); - } else - wbkgd(win, A_REVERSE); -#else - wbkgd(win, A_REVERSE); -#endif - werase(win); - - noecho(); - keypad(stdscr, TRUE); - raw(); - key = getch(); - if (key < KEY_MIN && key > 0 && isalpha(key)) { - if (islower(key)) - key = toupper(key); - for (n = 0; n < MAX_OPTIONS; ++n) { - if (key == command[n].text[0]) { - display_menu(old_option, new_option = n); - key = ' '; - break; - } - } - } - switch (key) { - case 10: - case 13: - case KEY_ENTER: - erase(); - refresh(); - (*command[new_option].function) (win); - erase(); - display_menu(old_option, new_option); - break; - case KEY_UP: - new_option = ((new_option == 0) - ? new_option - : new_option - 1); - display_menu(old_option, new_option); - break; - case KEY_DOWN: - new_option = ((new_option == (MAX_OPTIONS - 1)) - ? new_option - : new_option + 1); - display_menu(old_option, new_option); - break; - case 'Q': - case 'q': - quit = TRUE; - break; - default: - beep(); - break; - case ' ': - break; - } - if (quit == TRUE) - break; - } - - delwin(win); - - endwin(); -#ifdef XCURSES - XCursesExit(); -#endif - ExitProgram(EXIT_SUCCESS); -} - static void Continue(WINDOW *win) { @@ -184,7 +73,7 @@ initTest(WINDOW **win) height = 13; /* Create a drawing window */ *win = newwin(height, width, (LINES - height) / 2, (COLS - width) / 2); if (*win == NULL) { - endwin(); + exit_curses(); return 0; } return 1; @@ -668,7 +557,7 @@ resizeTest(WINDOW *dummy GCC_UNUSED) win1 = newwin(10, 50, 14, 25); if (win1 == NULL) { - endwin(); + exit_curses(); return; } #ifdef A_COLOR @@ -696,6 +585,7 @@ resizeTest(WINDOW *dummy GCC_UNUSED) } #endif +#if HAVE_NEWPAD static void padTest(WINDOW *dummy GCC_UNUSED) { @@ -736,6 +626,28 @@ padTest(WINDOW *dummy GCC_UNUSED) delwin(pad); } } +#endif /* HAVE_NEWPAD */ + +struct commands { + NCURSES_CONST char *text; + void (*function) (WINDOW *); +}; +typedef struct commands COMMAND; + +static const COMMAND command[] = +{ + {"General Test", introTest}, +#if HAVE_NEWPAD + {"Pad Test", padTest}, +#endif +#if defined(PDCURSES) && !defined(XCURSES) + {"Resize Test", resizeTest}, +#endif + {"Scroll Test", scrollTest}, + {"Input Test", inputTest}, + {"Output Test", outputTest} +}; +#define MAX_OPTIONS (int) SIZEOF(command) static void display_menu(int old_option, int new_option) @@ -760,3 +672,97 @@ display_menu(int old_option, int new_option) "Use Up and Down Arrows to select - Enter to run - Q to quit"); refresh(); } + +int +main( + int argc GCC_UNUSED, + char *argv[]GCC_UNUSED) +{ + WINDOW *win; + int key; + int old_option = (-1); + int new_option = 0; + bool quit = FALSE; + int n; + + setlocale(LC_ALL, ""); + +#ifdef PDCDEBUG + PDC_debug("testcurs started\n"); +#endif + if (!initTest(&win)) + ExitProgram(EXIT_FAILURE); + + erase(); + display_menu(old_option, new_option); + for (;;) { +#ifdef A_COLOR + if (has_colors()) { + init_pair(1, COLOR_WHITE, COLOR_BLUE); + wbkgd(win, (chtype) COLOR_PAIR(1)); + } else + wbkgd(win, A_REVERSE); +#else + wbkgd(win, A_REVERSE); +#endif + werase(win); + + noecho(); + keypad(stdscr, TRUE); + raw(); + key = getch(); + if (key < KEY_MIN && key > 0 && isalpha(key)) { + if (islower(key)) + key = toupper(key); + for (n = 0; n < MAX_OPTIONS; ++n) { + if (key == command[n].text[0]) { + display_menu(old_option, new_option = n); + key = ' '; + break; + } + } + } + switch (key) { + case 10: + case 13: + case KEY_ENTER: + erase(); + refresh(); + (*command[new_option].function) (win); + erase(); + display_menu(old_option, new_option); + break; + case KEY_UP: + new_option = ((new_option == 0) + ? new_option + : new_option - 1); + display_menu(old_option, new_option); + break; + case KEY_DOWN: + new_option = ((new_option == (MAX_OPTIONS - 1)) + ? new_option + : new_option + 1); + display_menu(old_option, new_option); + break; + case 'Q': + case 'q': + quit = TRUE; + break; + default: + beep(); + break; + case ' ': + break; + } + if (quit == TRUE) + break; + } + + delwin(win); + + exit_curses(); +#ifdef XCURSES + XCursesExit(); +#endif + ExitProgram(EXIT_SUCCESS); +} diff --git a/test/view.c b/test/view.c index da073151..1f960b9a 100644 --- a/test/view.c +++ b/test/view.c @@ -50,7 +50,7 @@ * scroll operation worked, and the refresh() code only had to do a * partial repaint. * - * $Id: view.c,v 1.101 2017/04/15 20:14:01 tom Exp $ + * $Id: view.c,v 1.102 2017/09/04 00:39:24 tom Exp $ */ #include @@ -506,12 +506,17 @@ main(int argc, char *argv[]) break; #endif case 's': +#if HAVE_HALFDELAY if (got_number) { halfdelay(my_delay = n); } else { nodelay(stdscr, FALSE); my_delay = -1; } +#else + nodelay(stdscr, FALSE); + my_delay = -1; +#endif break; case ' ': nodelay(stdscr, TRUE); diff --git a/test/worm.c b/test/worm.c index 365266af..70c92a21 100644 --- a/test/worm.c +++ b/test/worm.c @@ -47,25 +47,20 @@ July 1995 (esr): worms is now in living color! :-) -Options: - -f fill screen with copies of 'WORM' at start. - -l set worm length - -n set number of worms - -t make worms leave droppings - -T set trace interval - -S set single-stepping during trace interval - -N suppress cursor-movement optimization - This program makes a good torture-test for the ncurses cursor-optimization code. You can use -T to set the worm move interval over which movement traces will be dumped. The program stops and waits for one character of input at the beginning and end of the interval. - $Id: worm.c,v 1.68 2017/04/15 14:15:00 tom Exp $ + $Id: worm.c,v 1.75 2017/09/08 20:00:50 tom Exp $ */ #include +#ifndef NCURSES_VERSION +#undef TRACE +#endif + #ifdef USE_PTHREADS #include #endif @@ -201,20 +196,21 @@ static const struct options { }; /* *INDENT-ON* */ +#ifdef KEY_RESIZE static void failed(const char *s) { perror(s); - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } +#endif static void cleanup(void) { USING_WINDOW(stdscr, wrefresh); - curs_set(1); - endwin(); + exit_curses(); } static void @@ -422,41 +418,70 @@ update_refs(WINDOW *win) } #endif +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: worm [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -f fill screen with copies of \"WORM\" at start" + ," -l set length of worms" + ," -n set number of worms" + ," -t leave trail of \".\"" +#ifdef TRACE + ," -T , set trace interval" + ," -N suppress cursor-movement optimization" +#endif + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); +} + int main(int argc, char *argv[]) { + int ch; int x, y; int n; struct worm *w; int *ip; bool done = FALSE; int max_refs; +#if HAVE_USE_DEFAULT_COLORS + bool opt_d = FALSE; +#endif setlocale(LC_ALL, ""); - for (x = 1; x < argc; x++) { - char *p; - p = argv[x]; - if (*p == '-') - p++; - switch (*p) { + while ((ch = getopt(argc, argv, "dfl:n:tT:N")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + opt_d = TRUE; + break; +#endif case 'f': field = "WORM"; break; case 'l': - if (++x == argc) - goto usage; - if ((length = atoi(argv[x])) < 2 || length > MAX_LENGTH) { + if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) { fprintf(stderr, "%s: Invalid length\n", *argv); - ExitProgram(EXIT_FAILURE); + usage(); } break; case 'n': - if (++x == argc) - goto usage; - if ((number = atoi(argv[x])) < 1 || number > MAX_WORMS) { + if ((number = atoi(optarg)) < 1 || number > MAX_WORMS) { fprintf(stderr, "%s: Invalid number of worms\n", *argv); - ExitProgram(EXIT_FAILURE); + usage(); } break; case 't': @@ -464,20 +489,20 @@ main(int argc, char *argv[]) break; #ifdef TRACE case 'T': - trace_start = atoi(argv[++x]); - trace_end = atoi(argv[++x]); + if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2) + usage(); break; case 'N': _nc_optimize_enable ^= OPTIMIZE_ALL; /* declared by ncurses */ break; #endif /* TRACE */ default: - usage: - fprintf(stderr, - "usage: %s [-field] [-length #] [-number #] [-trail]\n", *argv); - ExitProgram(EXIT_FAILURE); + usage(); + /* NOTREACHED */ } } + if (optind < argc) + usage(); signal(SIGINT, onsig); initscr(); @@ -495,7 +520,7 @@ main(int argc, char *argv[]) int bg = COLOR_BLACK; start_color(); #if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) + if (opt_d && (use_default_colors() == OK)) bg = -1; #endif @@ -562,8 +587,6 @@ main(int argc, char *argv[]) nodelay(stdscr, TRUE); while (!done) { - int ch; - ++sequence; if ((ch = get_input()) > 0) { #ifdef TRACE diff --git a/test/xmas.c b/test/xmas.c index 087fcd9d..fbbf4f4f 100644 --- a/test/xmas.c +++ b/test/xmas.c @@ -92,7 +92,7 @@ /******************************************************************************/ /* - * $Id: xmas.c,v 1.28 2013/04/27 19:46:53 tom Exp $ + * $Id: xmas.c,v 1.31 2017/09/08 09:21:02 tom Exp $ */ #include @@ -133,21 +133,6 @@ static WINDOW *w_holiday; static WINDOW *w_del_msg; static bool *my_pairs; -static int boxit(void); -static int seas(void); -static int greet(void); -static int fromwho(void); -static int tree(void); -static int balls(void); -static int star(void); -static int strng1(void); -static int strng2(void); -static int strng3(void); -static int strng4(void); -static int strng5(void); -static int reindeer(void); -static int blinkit(void); - static void done(int sig) GCC_NORETURN; static void @@ -183,980 +168,1017 @@ look_out(int msecs) } } -int -main(int argc GCC_UNUSED, char **argv GCC_UNUSED) +static int +boxit(void) { - int loopy; + int x = 0; - setlocale(LC_ALL, ""); + while (x < 20) { + MvAddCh(x, 7, '|'); + ++x; + } - initscr(); - noecho(); - nonl(); - refresh(); + x = 8; - CATCHALL(done); + while (x < 80) { + MvAddCh(19, x, '_'); + ++x; + } - if (has_colors()) { - start_color(); -#if HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) - my_bg = -1; -#endif + x = 0; + + while (x < 80) { + MvAddCh(22, x, '_'); + ++x; } - curs_set(0); - if ((treescrn = newwin(16, 27, 3, 53)) == 0 || - (treescrn2 = newwin(16, 27, 3, 53)) == 0 || - (treescrn3 = newwin(16, 27, 3, 53)) == 0 || - (treescrn4 = newwin(16, 27, 3, 53)) == 0 || - (treescrn5 = newwin(16, 27, 3, 53)) == 0 || - (treescrn6 = newwin(16, 27, 3, 53)) == 0 || - (treescrn7 = newwin(16, 27, 3, 53)) == 0 || - (treescrn8 = newwin(16, 27, 3, 53)) == 0 || + return (0); +} - (dotdeer0 = newwin(3, 71, 0, 8)) == 0 || +static int +seas(void) +{ + MvAddCh(4, 1, 'S'); + MvAddCh(6, 1, 'E'); + MvAddCh(8, 1, 'A'); + MvAddCh(10, 1, 'S'); + MvAddCh(12, 1, 'O'); + MvAddCh(14, 1, 'N'); + MvAddCh(16, 1, '`'); + MvAddCh(18, 1, 'S'); - (stardeer0 = newwin(4, 56, 0, 8)) == 0 || + return (0); +} - (lildeer0 = newwin(7, 53, 0, 8)) == 0 || - (lildeer1 = newwin(2, 4, 0, 0)) == 0 || - (lildeer2 = newwin(2, 4, 0, 0)) == 0 || - (lildeer3 = newwin(2, 4, 0, 0)) == 0 || +static int +greet(void) +{ + MvAddCh(3, 5, 'G'); + MvAddCh(5, 5, 'R'); + MvAddCh(7, 5, 'E'); + MvAddCh(9, 5, 'E'); + MvAddCh(11, 5, 'T'); + MvAddCh(13, 5, 'I'); + MvAddCh(15, 5, 'N'); + MvAddCh(17, 5, 'G'); + MvAddCh(19, 5, 'S'); - (middeer0 = newwin(15, 42, 0, 8)) == 0 || - (middeer1 = newwin(3, 7, 0, 0)) == 0 || - (middeer2 = newwin(3, 7, 0, 0)) == 0 || - (middeer3 = newwin(3, 7, 0, 0)) == 0 || + return (0); +} - (bigdeer0 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer1 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer2 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer3 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer4 = newwin(10, 23, 0, 0)) == 0 || +static int +fromwho(void) +{ + MvAddStr(21, 13, FROMWHO); + return (0); +} - (lookdeer0 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer1 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer2 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer3 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer4 = newwin(10, 25, 0, 0)) == 0 || +static int +tree(void) +{ + set_color(treescrn, COLOR_GREEN); + MvWAddCh(treescrn, 1, 11, (chtype) '/'); + MvWAddCh(treescrn, 2, 11, (chtype) '/'); + MvWAddCh(treescrn, 3, 10, (chtype) '/'); + MvWAddCh(treescrn, 4, 9, (chtype) '/'); + MvWAddCh(treescrn, 5, 9, (chtype) '/'); + MvWAddCh(treescrn, 6, 8, (chtype) '/'); + MvWAddCh(treescrn, 7, 7, (chtype) '/'); + MvWAddCh(treescrn, 8, 6, (chtype) '/'); + MvWAddCh(treescrn, 9, 6, (chtype) '/'); + MvWAddCh(treescrn, 10, 5, (chtype) '/'); + MvWAddCh(treescrn, 11, 3, (chtype) '/'); + MvWAddCh(treescrn, 12, 2, (chtype) '/'); - (w_holiday = newwin(1, 26, 3, 27)) == 0 || + MvWAddCh(treescrn, 1, 13, (chtype) '\\'); + MvWAddCh(treescrn, 2, 13, (chtype) '\\'); + MvWAddCh(treescrn, 3, 14, (chtype) '\\'); + MvWAddCh(treescrn, 4, 15, (chtype) '\\'); + MvWAddCh(treescrn, 5, 15, (chtype) '\\'); + MvWAddCh(treescrn, 6, 16, (chtype) '\\'); + MvWAddCh(treescrn, 7, 17, (chtype) '\\'); + MvWAddCh(treescrn, 8, 18, (chtype) '\\'); + MvWAddCh(treescrn, 9, 18, (chtype) '\\'); + MvWAddCh(treescrn, 10, 19, (chtype) '\\'); + MvWAddCh(treescrn, 11, 21, (chtype) '\\'); + MvWAddCh(treescrn, 12, 22, (chtype) '\\'); - (w_del_msg = newwin(1, 19, 23, 60)) == 0) { - endwin(); - fprintf(stderr, "Cannot create windows - screen too small\n"); - ExitProgram(EXIT_FAILURE); - } + MvWAddCh(treescrn, 4, 10, (chtype) '_'); + MvWAddCh(treescrn, 4, 14, (chtype) '_'); + MvWAddCh(treescrn, 8, 7, (chtype) '_'); + MvWAddCh(treescrn, 8, 17, (chtype) '_'); - MvWAddStr(w_del_msg, 0, 0, "Hit any key to quit"); + MvWAddStr(treescrn, 13, 0, "//////////// \\\\\\\\\\\\\\\\\\\\\\\\"); - MvWAddStr(w_holiday, 0, 0, "H A P P Y H O L I D A Y S"); + MvWAddStr(treescrn, 14, 11, "| |"); + MvWAddStr(treescrn, 15, 11, "|_|"); - /* set up the windows for our various reindeer */ + unset_color(treescrn); + wrefresh(treescrn); + wrefresh(w_del_msg); - /* lildeer1 */ - MvWAddCh(lildeer1, 0, 0, (chtype) 'V'); - MvWAddCh(lildeer1, 1, 0, (chtype) '@'); - MvWAddCh(lildeer1, 1, 1, (chtype) '<'); - MvWAddCh(lildeer1, 1, 2, (chtype) '>'); - MvWAddCh(lildeer1, 1, 3, (chtype) '~'); + return (0); +} - /* lildeer2 */ - MvWAddCh(lildeer2, 0, 0, (chtype) 'V'); - MvWAddCh(lildeer2, 1, 0, (chtype) '@'); - MvWAddCh(lildeer2, 1, 1, (chtype) '|'); - MvWAddCh(lildeer2, 1, 2, (chtype) '|'); - MvWAddCh(lildeer2, 1, 3, (chtype) '~'); +static int +balls(void) +{ + overlay(treescrn, treescrn2); - /* lildeer3 */ - MvWAddCh(lildeer3, 0, 0, (chtype) 'V'); - MvWAddCh(lildeer3, 1, 0, (chtype) '@'); - MvWAddCh(lildeer3, 1, 1, (chtype) '>'); - MvWAddCh(lildeer3, 1, 2, (chtype) '<'); - MvWAddCh(lildeer2, 1, 3, (chtype) '~'); + set_color(treescrn2, COLOR_BLUE); + MvWAddCh(treescrn2, 3, 9, (chtype) '@'); + MvWAddCh(treescrn2, 3, 15, (chtype) '@'); + MvWAddCh(treescrn2, 4, 8, (chtype) '@'); + MvWAddCh(treescrn2, 4, 16, (chtype) '@'); + MvWAddCh(treescrn2, 5, 7, (chtype) '@'); + MvWAddCh(treescrn2, 5, 17, (chtype) '@'); + MvWAddCh(treescrn2, 7, 6, (chtype) '@'); + MvWAddCh(treescrn2, 7, 18, (chtype) '@'); + MvWAddCh(treescrn2, 8, 5, (chtype) '@'); + MvWAddCh(treescrn2, 8, 19, (chtype) '@'); + MvWAddCh(treescrn2, 10, 4, (chtype) '@'); + MvWAddCh(treescrn2, 10, 20, (chtype) '@'); + MvWAddCh(treescrn2, 11, 2, (chtype) '@'); + MvWAddCh(treescrn2, 11, 22, (chtype) '@'); + MvWAddCh(treescrn2, 12, 1, (chtype) '@'); + MvWAddCh(treescrn2, 12, 23, (chtype) '@'); - /* middeer1 */ - MvWAddCh(middeer1, 0, 2, (chtype) 'y'); - MvWAddCh(middeer1, 0, 3, (chtype) 'y'); - MvWAddCh(middeer1, 1, 2, (chtype) '0'); - MvWAddCh(middeer1, 1, 3, (chtype) '('); - MvWAddCh(middeer1, 1, 4, (chtype) '='); - MvWAddCh(middeer1, 1, 5, (chtype) ')'); - MvWAddCh(middeer1, 1, 6, (chtype) '~'); - MvWAddCh(middeer1, 2, 3, (chtype) '\\'); - MvWAddCh(middeer1, 2, 4, (chtype) '/'); + unset_color(treescrn2); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /* middeer2 */ - MvWAddCh(middeer2, 0, 2, (chtype) 'y'); - MvWAddCh(middeer2, 0, 3, (chtype) 'y'); - MvWAddCh(middeer2, 1, 2, (chtype) '0'); - MvWAddCh(middeer2, 1, 3, (chtype) '('); - MvWAddCh(middeer2, 1, 4, (chtype) '='); - MvWAddCh(middeer2, 1, 5, (chtype) ')'); - MvWAddCh(middeer2, 1, 6, (chtype) '~'); - MvWAddCh(middeer2, 2, 3, (chtype) '|'); - MvWAddCh(middeer2, 2, 5, (chtype) '|'); +static int +star(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_YELLOW); - /* middeer3 */ - MvWAddCh(middeer3, 0, 2, (chtype) 'y'); - MvWAddCh(middeer3, 0, 3, (chtype) 'y'); - MvWAddCh(middeer3, 1, 2, (chtype) '0'); - MvWAddCh(middeer3, 1, 3, (chtype) '('); - MvWAddCh(middeer3, 1, 4, (chtype) '='); - MvWAddCh(middeer3, 1, 5, (chtype) ')'); - MvWAddCh(middeer3, 1, 6, (chtype) '~'); - MvWAddCh(middeer3, 2, 2, (chtype) '/'); - MvWAddCh(middeer3, 2, 6, (chtype) '\\'); + MvWAddCh(treescrn2, 0, 12, (chtype) '*'); + (void) wstandend(treescrn2); - /* bigdeer1 */ - MvWAddCh(bigdeer1, 0, 17, (chtype) '\\'); - MvWAddCh(bigdeer1, 0, 18, (chtype) '/'); - MvWAddCh(bigdeer1, 0, 20, (chtype) '\\'); - MvWAddCh(bigdeer1, 0, 21, (chtype) '/'); - MvWAddCh(bigdeer1, 1, 18, (chtype) '\\'); - MvWAddCh(bigdeer1, 1, 20, (chtype) '/'); - MvWAddCh(bigdeer1, 2, 19, (chtype) '|'); - MvWAddCh(bigdeer1, 2, 20, (chtype) '_'); - MvWAddCh(bigdeer1, 3, 18, (chtype) '/'); - MvWAddCh(bigdeer1, 3, 19, (chtype) '^'); - MvWAddCh(bigdeer1, 3, 20, (chtype) '0'); - MvWAddCh(bigdeer1, 3, 21, (chtype) '\\'); - MvWAddCh(bigdeer1, 4, 17, (chtype) '/'); - MvWAddCh(bigdeer1, 4, 18, (chtype) '/'); - MvWAddCh(bigdeer1, 4, 19, (chtype) '\\'); - MvWAddCh(bigdeer1, 4, 22, (chtype) '\\'); - MvWAddStr(bigdeer1, 5, 7, "^~~~~~~~~// ~~U"); - MvWAddStr(bigdeer1, 6, 7, "( \\_____( /"); - MvWAddStr(bigdeer1, 7, 8, "( ) /"); - MvWAddStr(bigdeer1, 8, 9, "\\\\ /"); - MvWAddStr(bigdeer1, 9, 11, "\\>/>"); + unset_color(treescrn2); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /* bigdeer2 */ - MvWAddCh(bigdeer2, 0, 17, (chtype) '\\'); - MvWAddCh(bigdeer2, 0, 18, (chtype) '/'); - MvWAddCh(bigdeer2, 0, 20, (chtype) '\\'); - MvWAddCh(bigdeer2, 0, 21, (chtype) '/'); - MvWAddCh(bigdeer2, 1, 18, (chtype) '\\'); - MvWAddCh(bigdeer2, 1, 20, (chtype) '/'); - MvWAddCh(bigdeer2, 2, 19, (chtype) '|'); - MvWAddCh(bigdeer2, 2, 20, (chtype) '_'); - MvWAddCh(bigdeer2, 3, 18, (chtype) '/'); - MvWAddCh(bigdeer2, 3, 19, (chtype) '^'); - MvWAddCh(bigdeer2, 3, 20, (chtype) '0'); - MvWAddCh(bigdeer2, 3, 21, (chtype) '\\'); - MvWAddCh(bigdeer2, 4, 17, (chtype) '/'); - MvWAddCh(bigdeer2, 4, 18, (chtype) '/'); - MvWAddCh(bigdeer2, 4, 19, (chtype) '\\'); - MvWAddCh(bigdeer2, 4, 22, (chtype) '\\'); - MvWAddStr(bigdeer2, 5, 7, "^~~~~~~~~// ~~U"); - MvWAddStr(bigdeer2, 6, 7, "(( )____( /"); - MvWAddStr(bigdeer2, 7, 7, "( / |"); - MvWAddStr(bigdeer2, 8, 8, "\\/ |"); - MvWAddStr(bigdeer2, 9, 9, "|> |>"); +static int +strng1(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_WHITE); - /* bigdeer3 */ - MvWAddCh(bigdeer3, 0, 17, (chtype) '\\'); - MvWAddCh(bigdeer3, 0, 18, (chtype) '/'); - MvWAddCh(bigdeer3, 0, 20, (chtype) '\\'); - MvWAddCh(bigdeer3, 0, 21, (chtype) '/'); - MvWAddCh(bigdeer3, 1, 18, (chtype) '\\'); - MvWAddCh(bigdeer3, 1, 20, (chtype) '/'); - MvWAddCh(bigdeer3, 2, 19, (chtype) '|'); - MvWAddCh(bigdeer3, 2, 20, (chtype) '_'); - MvWAddCh(bigdeer3, 3, 18, (chtype) '/'); - MvWAddCh(bigdeer3, 3, 19, (chtype) '^'); - MvWAddCh(bigdeer3, 3, 20, (chtype) '0'); - MvWAddCh(bigdeer3, 3, 21, (chtype) '\\'); - MvWAddCh(bigdeer3, 4, 17, (chtype) '/'); - MvWAddCh(bigdeer3, 4, 18, (chtype) '/'); - MvWAddCh(bigdeer3, 4, 19, (chtype) '\\'); - MvWAddCh(bigdeer3, 4, 22, (chtype) '\\'); - MvWAddStr(bigdeer3, 5, 7, "^~~~~~~~~// ~~U"); - MvWAddStr(bigdeer3, 6, 6, "( ()_____( /"); - MvWAddStr(bigdeer3, 7, 6, "/ / /"); - MvWAddStr(bigdeer3, 8, 5, "|/ \\"); - MvWAddStr(bigdeer3, 9, 5, "/> \\>"); + MvWAddCh(treescrn2, 3, 13, (chtype) '\''); + MvWAddCh(treescrn2, 3, 12, (chtype) ':'); + MvWAddCh(treescrn2, 3, 11, (chtype) '.'); - /* bigdeer4 */ - MvWAddCh(bigdeer4, 0, 17, (chtype) '\\'); - MvWAddCh(bigdeer4, 0, 18, (chtype) '/'); - MvWAddCh(bigdeer4, 0, 20, (chtype) '\\'); - MvWAddCh(bigdeer4, 0, 21, (chtype) '/'); - MvWAddCh(bigdeer4, 1, 18, (chtype) '\\'); - MvWAddCh(bigdeer4, 1, 20, (chtype) '/'); - MvWAddCh(bigdeer4, 2, 19, (chtype) '|'); - MvWAddCh(bigdeer4, 2, 20, (chtype) '_'); - MvWAddCh(bigdeer4, 3, 18, (chtype) '/'); - MvWAddCh(bigdeer4, 3, 19, (chtype) '^'); - MvWAddCh(bigdeer4, 3, 20, (chtype) '0'); - MvWAddCh(bigdeer4, 3, 21, (chtype) '\\'); - MvWAddCh(bigdeer4, 4, 17, (chtype) '/'); - MvWAddCh(bigdeer4, 4, 18, (chtype) '/'); - MvWAddCh(bigdeer4, 4, 19, (chtype) '\\'); - MvWAddCh(bigdeer4, 4, 22, (chtype) '\\'); - MvWAddStr(bigdeer4, 5, 7, "^~~~~~~~~// ~~U"); - MvWAddStr(bigdeer4, 6, 6, "( )______( /"); - MvWAddStr(bigdeer4, 7, 5, "(/ \\"); - MvWAddStr(bigdeer4, 8, 0, "v___= ----^"); + wattroff(treescrn2, A_BOLD | A_BLINK); + unset_color(treescrn2); - /* lookdeer1 */ - MvWAddStr(lookdeer1, 0, 16, "\\/ \\/"); - MvWAddStr(lookdeer1, 1, 17, "\\Y/ \\Y/"); - MvWAddStr(lookdeer1, 2, 19, "\\=/"); - MvWAddStr(lookdeer1, 3, 17, "^\\o o/^"); - MvWAddStr(lookdeer1, 4, 17, "//( )"); - MvWAddStr(lookdeer1, 5, 7, "^~~~~~~~~// \\O/"); - MvWAddStr(lookdeer1, 6, 7, "( \\_____( /"); - MvWAddStr(lookdeer1, 7, 8, "( ) /"); - MvWAddStr(lookdeer1, 8, 9, "\\\\ /"); - MvWAddStr(lookdeer1, 9, 11, "\\>/>"); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /* lookdeer2 */ - MvWAddStr(lookdeer2, 0, 16, "\\/ \\/"); - MvWAddStr(lookdeer2, 1, 17, "\\Y/ \\Y/"); - MvWAddStr(lookdeer2, 2, 19, "\\=/"); - MvWAddStr(lookdeer2, 3, 17, "^\\o o/^"); - MvWAddStr(lookdeer2, 4, 17, "//( )"); - MvWAddStr(lookdeer2, 5, 7, "^~~~~~~~~// \\O/"); - MvWAddStr(lookdeer2, 6, 7, "(( )____( /"); - MvWAddStr(lookdeer2, 7, 7, "( / |"); - MvWAddStr(lookdeer2, 8, 8, "\\/ |"); - MvWAddStr(lookdeer2, 9, 9, "|> |>"); +static int +strng2(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_WHITE); - /* lookdeer3 */ - MvWAddStr(lookdeer3, 0, 16, "\\/ \\/"); - MvWAddStr(lookdeer3, 1, 17, "\\Y/ \\Y/"); - MvWAddStr(lookdeer3, 2, 19, "\\=/"); - MvWAddStr(lookdeer3, 3, 17, "^\\o o/^"); - MvWAddStr(lookdeer3, 4, 17, "//( )"); - MvWAddStr(lookdeer3, 5, 7, "^~~~~~~~~// \\O/"); - MvWAddStr(lookdeer3, 6, 6, "( ()_____( /"); - MvWAddStr(lookdeer3, 7, 6, "/ / /"); - MvWAddStr(lookdeer3, 8, 5, "|/ \\"); - MvWAddStr(lookdeer3, 9, 5, "/> \\>"); + MvWAddCh(treescrn2, 5, 14, (chtype) '\''); + MvWAddCh(treescrn2, 5, 13, (chtype) ':'); + MvWAddCh(treescrn2, 5, 12, (chtype) '.'); + MvWAddCh(treescrn2, 5, 11, (chtype) ','); + MvWAddCh(treescrn2, 6, 10, (chtype) '\''); + MvWAddCh(treescrn2, 6, 9, (chtype) ':'); - /* lookdeer4 */ - MvWAddStr(lookdeer4, 0, 16, "\\/ \\/"); - MvWAddStr(lookdeer4, 1, 17, "\\Y/ \\Y/"); - MvWAddStr(lookdeer4, 2, 19, "\\=/"); - MvWAddStr(lookdeer4, 3, 17, "^\\o o/^"); - MvWAddStr(lookdeer4, 4, 17, "//( )"); - MvWAddStr(lookdeer4, 5, 7, "^~~~~~~~~// \\O/"); - MvWAddStr(lookdeer4, 6, 6, "( )______( /"); - MvWAddStr(lookdeer4, 7, 5, "(/ \\"); - MvWAddStr(lookdeer4, 8, 0, "v___= ----^"); + wattroff(treescrn2, A_BOLD | A_BLINK); + unset_color(treescrn2); - /***********************************************/ - cbreak(); - nodelay(stdscr, TRUE); - for (;;) { - clear(); - werase(treescrn); - touchwin(w_del_msg); - touchwin(treescrn); - werase(treescrn2); - touchwin(treescrn2); - werase(treescrn8); - touchwin(treescrn8); - refresh(); - look_out(150); - boxit(); - refresh(); - look_out(150); - seas(); - refresh(); - look_out(150); - greet(); - refresh(); - look_out(150); - fromwho(); - refresh(); - look_out(150); - tree(); - look_out(150); - balls(); - look_out(150); - star(); - look_out(150); - strng1(); - strng2(); - strng3(); - strng4(); - strng5(); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /* set up the windows for our blinking trees */ - /* **************************************** */ - /* treescrn3 */ +static int +strng3(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_WHITE); - overlay(treescrn, treescrn3); + MvWAddCh(treescrn2, 7, 16, (chtype) '\''); + MvWAddCh(treescrn2, 7, 15, (chtype) ':'); + MvWAddCh(treescrn2, 7, 14, (chtype) '.'); + MvWAddCh(treescrn2, 7, 13, (chtype) ','); + MvWAddCh(treescrn2, 8, 12, (chtype) '\''); + MvWAddCh(treescrn2, 8, 11, (chtype) ':'); + MvWAddCh(treescrn2, 8, 10, (chtype) '.'); + MvWAddCh(treescrn2, 8, 9, (chtype) ','); - /*balls */ - MvWAddCh(treescrn3, 4, 18, ' '); - MvWAddCh(treescrn3, 7, 6, ' '); - MvWAddCh(treescrn3, 8, 19, ' '); - MvWAddCh(treescrn3, 11, 22, ' '); + wattroff(treescrn2, A_BOLD | A_BLINK); + unset_color(treescrn2); - /*star */ - MvWAddCh(treescrn3, 0, 12, '*'); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /*strng1 */ - MvWAddCh(treescrn3, 3, 11, ' '); +static int +strng4(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_WHITE); - /*strng2 */ - MvWAddCh(treescrn3, 5, 13, ' '); - MvWAddCh(treescrn3, 6, 10, ' '); + MvWAddCh(treescrn2, 9, 17, (chtype) '\''); + MvWAddCh(treescrn2, 9, 16, (chtype) ':'); + MvWAddCh(treescrn2, 9, 15, (chtype) '.'); + MvWAddCh(treescrn2, 9, 14, (chtype) ','); + MvWAddCh(treescrn2, 10, 13, (chtype) '\''); + MvWAddCh(treescrn2, 10, 12, (chtype) ':'); + MvWAddCh(treescrn2, 10, 11, (chtype) '.'); + MvWAddCh(treescrn2, 10, 10, (chtype) ','); + MvWAddCh(treescrn2, 11, 9, (chtype) '\''); + MvWAddCh(treescrn2, 11, 8, (chtype) ':'); + MvWAddCh(treescrn2, 11, 7, (chtype) '.'); + MvWAddCh(treescrn2, 11, 6, (chtype) ','); + MvWAddCh(treescrn2, 12, 5, (chtype) '\''); - /*strng3 */ - MvWAddCh(treescrn3, 7, 16, ' '); - MvWAddCh(treescrn3, 7, 14, ' '); + wattroff(treescrn2, A_BOLD | A_BLINK); + unset_color(treescrn2); - /*strng4 */ - MvWAddCh(treescrn3, 10, 13, ' '); - MvWAddCh(treescrn3, 10, 10, ' '); - MvWAddCh(treescrn3, 11, 8, ' '); + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /*strng5 */ - MvWAddCh(treescrn3, 11, 18, ' '); - MvWAddCh(treescrn3, 12, 13, ' '); +static int +strng5(void) +{ + (void) wattrset(treescrn2, A_BOLD | A_BLINK); + set_color(treescrn2, COLOR_WHITE); - /* treescrn4 */ + MvWAddCh(treescrn2, 11, 19, (chtype) '\''); + MvWAddCh(treescrn2, 11, 18, (chtype) ':'); + MvWAddCh(treescrn2, 11, 17, (chtype) '.'); + MvWAddCh(treescrn2, 11, 16, (chtype) ','); + MvWAddCh(treescrn2, 12, 15, (chtype) '\''); + MvWAddCh(treescrn2, 12, 14, (chtype) ':'); + MvWAddCh(treescrn2, 12, 13, (chtype) '.'); + MvWAddCh(treescrn2, 12, 12, (chtype) ','); - overlay(treescrn, treescrn4); + wattroff(treescrn2, A_BOLD | A_BLINK); + unset_color(treescrn2); - /*balls */ - MvWAddCh(treescrn4, 3, 9, ' '); - MvWAddCh(treescrn4, 4, 16, ' '); - MvWAddCh(treescrn4, 7, 6, ' '); - MvWAddCh(treescrn4, 8, 19, ' '); - MvWAddCh(treescrn4, 11, 2, ' '); - MvWAddCh(treescrn4, 12, 23, ' '); - - /*star */ - (void) wstandout(treescrn4); - MvWAddCh(treescrn4, 0, 12, '*'); - (void) wstandend(treescrn4); - - /*strng1 */ - MvWAddCh(treescrn4, 3, 13, ' '); + /* save a fully lit tree */ + overlay(treescrn2, treescrn); - /*strng2 */ + wrefresh(treescrn2); + wrefresh(w_del_msg); + return (0); +} - /*strng3 */ - MvWAddCh(treescrn4, 7, 15, ' '); - MvWAddCh(treescrn4, 8, 11, ' '); +static int +blinkit(void) +{ + static int cycle; - /*strng4 */ - MvWAddCh(treescrn4, 9, 16, ' '); - MvWAddCh(treescrn4, 10, 12, ' '); - MvWAddCh(treescrn4, 11, 8, ' '); + if (cycle > 4) { + cycle = 0; + } - /*strng5 */ - MvWAddCh(treescrn4, 11, 18, ' '); - MvWAddCh(treescrn4, 12, 14, ' '); + touchwin(treescrn8); - /* treescrn5 */ + switch (cycle) { + case 0: + overlay(treescrn3, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); + break; + case 1: + overlay(treescrn4, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); + break; + case 2: + overlay(treescrn5, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); + break; + case 3: + overlay(treescrn6, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); + break; + case 4: + overlay(treescrn7, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); + break; + } + touchwin(treescrn8); - overlay(treescrn, treescrn5); + /*ALL ON************************************************** */ - /*balls */ - MvWAddCh(treescrn5, 3, 15, ' '); - MvWAddCh(treescrn5, 10, 20, ' '); - MvWAddCh(treescrn5, 12, 1, ' '); + overlay(treescrn, treescrn8); + wrefresh(treescrn8); + wrefresh(w_del_msg); - /*star */ - MvWAddCh(treescrn5, 0, 12, '*'); + ++cycle; + return (0); +} - /*strng1 */ - MvWAddCh(treescrn5, 3, 11, ' '); +static void +deer_step(WINDOW *win, int y, int x) +{ + mvwin(win, y, x); + wrefresh(win); + wrefresh(w_del_msg); + look_out(5); +} - /*strng2 */ - MvWAddCh(treescrn5, 5, 12, ' '); +static int +reindeer(void) +{ + int looper; + y_pos = 0; - /*strng3 */ - MvWAddCh(treescrn5, 7, 14, ' '); - MvWAddCh(treescrn5, 8, 10, ' '); + for (x_pos = 70; x_pos > 62; x_pos--) { + if (x_pos < 62) { + y_pos = 1; + } + for (looper = 0; looper < 4; looper++) { + MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '.'); + wrefresh(dotdeer0); + wrefresh(w_del_msg); + werase(dotdeer0); + wrefresh(dotdeer0); + wrefresh(w_del_msg); + look_out(50); + } + } - /*strng4 */ - MvWAddCh(treescrn5, 9, 15, ' '); - MvWAddCh(treescrn5, 10, 11, ' '); - MvWAddCh(treescrn5, 11, 7, ' '); + y_pos = 2; - /*strng5 */ - MvWAddCh(treescrn5, 11, 17, ' '); - MvWAddCh(treescrn5, 12, 13, ' '); + for (; x_pos > 50; x_pos--) { + for (looper = 0; looper < 4; looper++) { - /* treescrn6 */ + if (x_pos < 56) { + y_pos = 3; - overlay(treescrn, treescrn6); + MvWAddCh(stardeer0, y_pos, x_pos, (chtype) '*'); + wrefresh(stardeer0); + wrefresh(w_del_msg); + werase(stardeer0); + wrefresh(stardeer0); + wrefresh(w_del_msg); + } else { + MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '*'); + wrefresh(dotdeer0); + wrefresh(w_del_msg); + werase(dotdeer0); + wrefresh(dotdeer0); + wrefresh(w_del_msg); + } + } + } - /*balls */ - MvWAddCh(treescrn6, 6, 7, ' '); - MvWAddCh(treescrn6, 7, 18, ' '); - MvWAddCh(treescrn6, 10, 4, ' '); - MvWAddCh(treescrn6, 11, 23, ' '); + x_pos = 58; - /*star */ - (void) wstandout(treescrn6); - MvWAddCh(treescrn6, 0, 12, '*'); - (void) wstandend(treescrn6); + for (y_pos = 2; y_pos < 5; y_pos++) { - /*strng1 */ + touchwin(lildeer0); + wrefresh(lildeer0); + wrefresh(w_del_msg); - /*strng2 */ - MvWAddCh(treescrn6, 5, 11, ' '); + for (looper = 0; looper < 4; looper++) { + deer_step(lildeer3, y_pos, x_pos); + deer_step(lildeer2, y_pos, x_pos); + deer_step(lildeer1, y_pos, x_pos); + deer_step(lildeer2, y_pos, x_pos); + deer_step(lildeer3, y_pos, x_pos); - /*strng3 */ - MvWAddCh(treescrn6, 7, 13, ' '); - MvWAddCh(treescrn6, 8, 9, ' '); + touchwin(lildeer0); + wrefresh(lildeer0); + wrefresh(w_del_msg); - /*strng4 */ - MvWAddCh(treescrn6, 9, 14, ' '); - MvWAddCh(treescrn6, 10, 10, ' '); - MvWAddCh(treescrn6, 11, 6, ' '); + x_pos -= 2; + } + } - /*strng5 */ - MvWAddCh(treescrn6, 11, 16, ' '); - MvWAddCh(treescrn6, 12, 12, ' '); + x_pos = 35; - /* treescrn7 */ + for (y_pos = 5; y_pos < 10; y_pos++) { - overlay(treescrn, treescrn7); + touchwin(middeer0); + wrefresh(middeer0); + wrefresh(w_del_msg); - /*balls */ - MvWAddCh(treescrn7, 3, 15, ' '); - MvWAddCh(treescrn7, 6, 7, ' '); - MvWAddCh(treescrn7, 7, 18, ' '); - MvWAddCh(treescrn7, 10, 4, ' '); - MvWAddCh(treescrn7, 11, 22, ' '); + for (looper = 0; looper < 2; looper++) { + deer_step(middeer3, y_pos, x_pos); + deer_step(middeer2, y_pos, x_pos); + deer_step(middeer1, y_pos, x_pos); + deer_step(middeer2, y_pos, x_pos); + deer_step(middeer3, y_pos, x_pos); - /*star */ - MvWAddCh(treescrn7, 0, 12, '*'); + touchwin(middeer0); + wrefresh(middeer0); + wrefresh(w_del_msg); - /*strng1 */ - MvWAddCh(treescrn7, 3, 12, ' '); + x_pos -= 3; + } + } - /*strng2 */ - MvWAddCh(treescrn7, 5, 13, ' '); - MvWAddCh(treescrn7, 6, 9, ' '); + look_out(300); - /*strng3 */ - MvWAddCh(treescrn7, 7, 15, ' '); - MvWAddCh(treescrn7, 8, 11, ' '); + y_pos = 1; - /*strng4 */ - MvWAddCh(treescrn7, 9, 16, ' '); - MvWAddCh(treescrn7, 10, 12, ' '); - MvWAddCh(treescrn7, 11, 8, ' '); + for (x_pos = 8; x_pos < 16; x_pos++) { + deer_step(bigdeer4, y_pos, x_pos); + deer_step(bigdeer3, y_pos, x_pos); + deer_step(bigdeer2, y_pos, x_pos); + deer_step(bigdeer1, y_pos, x_pos); + deer_step(bigdeer2, y_pos, x_pos); + deer_step(bigdeer3, y_pos, x_pos); + deer_step(bigdeer4, y_pos, x_pos); + deer_step(bigdeer0, y_pos, x_pos); + } - /*strng5 */ - MvWAddCh(treescrn7, 11, 18, ' '); - MvWAddCh(treescrn7, 12, 14, ' '); + --x_pos; - look_out(150); - reindeer(); + for (looper = 0; looper < 6; looper++) { + deer_step(lookdeer4, y_pos, x_pos); + deer_step(lookdeer3, y_pos, x_pos); + deer_step(lookdeer2, y_pos, x_pos); + deer_step(lookdeer1, y_pos, x_pos); + deer_step(lookdeer2, y_pos, x_pos); + deer_step(lookdeer3, y_pos, x_pos); + deer_step(lookdeer4, y_pos, x_pos); + } - touchwin(w_holiday); - wrefresh(w_holiday); - wrefresh(w_del_msg); + deer_step(lookdeer0, y_pos, x_pos); - look_out(500); - for (loopy = 0; loopy < 100; loopy++) { - blinkit(); + for (; y_pos < 10; y_pos++) { + for (looper = 0; looper < 2; looper++) { + deer_step(bigdeer4, y_pos, x_pos); + deer_step(bigdeer3, y_pos, x_pos); + deer_step(bigdeer2, y_pos, x_pos); + deer_step(bigdeer1, y_pos, x_pos); + deer_step(bigdeer2, y_pos, x_pos); + deer_step(bigdeer3, y_pos, x_pos); + deer_step(bigdeer4, y_pos, x_pos); } - -#ifdef NOLOOP - done(0); -#endif - } - /*NOTREACHED */ -} - -static int -boxit(void) -{ - int x = 0; - - while (x < 20) { - MvAddCh(x, 7, '|'); - ++x; - } - - x = 8; - - while (x < 80) { - MvAddCh(19, x, '_'); - ++x; + deer_step(bigdeer0, y_pos, x_pos); } - x = 0; - - while (x < 80) { - MvAddCh(22, x, '_'); - ++x; - } + --y_pos; + deer_step(lookdeer3, y_pos, x_pos); return (0); } -static int -seas(void) +static void +done(int sig GCC_UNUSED) { - MvAddCh(4, 1, 'S'); - MvAddCh(6, 1, 'E'); - MvAddCh(8, 1, 'A'); - MvAddCh(10, 1, 'S'); - MvAddCh(12, 1, 'O'); - MvAddCh(14, 1, 'N'); - MvAddCh(16, 1, '`'); - MvAddCh(18, 1, 'S'); + CATCHALL(done); - return (0); -} + move(LINES - 1, 0); + refresh(); + exit_curses(); -static int -greet(void) -{ - MvAddCh(3, 5, 'G'); - MvAddCh(5, 5, 'R'); - MvAddCh(7, 5, 'E'); - MvAddCh(9, 5, 'E'); - MvAddCh(11, 5, 'T'); - MvAddCh(13, 5, 'I'); - MvAddCh(15, 5, 'N'); - MvAddCh(17, 5, 'G'); - MvAddCh(19, 5, 'S'); +#if NO_LEAKS + if (my_pairs != 0) + free(my_pairs); +#endif - return (0); + ExitProgram(EXIT_SUCCESS); } -static int -fromwho(void) +static void +usage(void) { - MvAddStr(21, 13, FROMWHO); - return (0); + static const char *msg[] = + { + "Usage: xmas [options]" + ,"" + ,"Options:" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -q execute once, then quit" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(EXIT_FAILURE); } -static int -tree(void) +int +main(int argc, char *argv[]) { - set_color(treescrn, COLOR_GREEN); - MvWAddCh(treescrn, 1, 11, (chtype) '/'); - MvWAddCh(treescrn, 2, 11, (chtype) '/'); - MvWAddCh(treescrn, 3, 10, (chtype) '/'); - MvWAddCh(treescrn, 4, 9, (chtype) '/'); - MvWAddCh(treescrn, 5, 9, (chtype) '/'); - MvWAddCh(treescrn, 6, 8, (chtype) '/'); - MvWAddCh(treescrn, 7, 7, (chtype) '/'); - MvWAddCh(treescrn, 8, 6, (chtype) '/'); - MvWAddCh(treescrn, 9, 6, (chtype) '/'); - MvWAddCh(treescrn, 10, 5, (chtype) '/'); - MvWAddCh(treescrn, 11, 3, (chtype) '/'); - MvWAddCh(treescrn, 12, 2, (chtype) '/'); - - MvWAddCh(treescrn, 1, 13, (chtype) '\\'); - MvWAddCh(treescrn, 2, 13, (chtype) '\\'); - MvWAddCh(treescrn, 3, 14, (chtype) '\\'); - MvWAddCh(treescrn, 4, 15, (chtype) '\\'); - MvWAddCh(treescrn, 5, 15, (chtype) '\\'); - MvWAddCh(treescrn, 6, 16, (chtype) '\\'); - MvWAddCh(treescrn, 7, 17, (chtype) '\\'); - MvWAddCh(treescrn, 8, 18, (chtype) '\\'); - MvWAddCh(treescrn, 9, 18, (chtype) '\\'); - MvWAddCh(treescrn, 10, 19, (chtype) '\\'); - MvWAddCh(treescrn, 11, 21, (chtype) '\\'); - MvWAddCh(treescrn, 12, 22, (chtype) '\\'); + int ch; + int loopy; +#if HAVE_USE_DEFAULT_COLORS + bool opt_d = FALSE; +#endif + bool opt_q = FALSE; - MvWAddCh(treescrn, 4, 10, (chtype) '_'); - MvWAddCh(treescrn, 4, 14, (chtype) '_'); - MvWAddCh(treescrn, 8, 7, (chtype) '_'); - MvWAddCh(treescrn, 8, 17, (chtype) '_'); + while ((ch = getopt(argc, argv, "dq")) != -1) { + switch (ch) { +#if HAVE_USE_DEFAULT_COLORS + case 'd': + opt_d = TRUE; + break; +#endif + case 'q': + opt_q = TRUE; + break; + default: + usage(); + /* NOTREACHED */ + } + } - MvWAddStr(treescrn, 13, 0, "//////////// \\\\\\\\\\\\\\\\\\\\\\\\"); + setlocale(LC_ALL, ""); - MvWAddStr(treescrn, 14, 11, "| |"); - MvWAddStr(treescrn, 15, 11, "|_|"); + initscr(); + noecho(); + nonl(); + refresh(); - unset_color(treescrn); - wrefresh(treescrn); - wrefresh(w_del_msg); + CATCHALL(done); - return (0); -} + if (has_colors()) { + start_color(); +#if HAVE_USE_DEFAULT_COLORS + if (opt_d && (use_default_colors() == OK)) + my_bg = -1; +#endif + } + curs_set(0); -static int -balls(void) -{ - overlay(treescrn, treescrn2); + if ((treescrn = newwin(16, 27, 3, 53)) == 0 || + (treescrn2 = newwin(16, 27, 3, 53)) == 0 || + (treescrn3 = newwin(16, 27, 3, 53)) == 0 || + (treescrn4 = newwin(16, 27, 3, 53)) == 0 || + (treescrn5 = newwin(16, 27, 3, 53)) == 0 || + (treescrn6 = newwin(16, 27, 3, 53)) == 0 || + (treescrn7 = newwin(16, 27, 3, 53)) == 0 || + (treescrn8 = newwin(16, 27, 3, 53)) == 0 || - set_color(treescrn2, COLOR_BLUE); - MvWAddCh(treescrn2, 3, 9, (chtype) '@'); - MvWAddCh(treescrn2, 3, 15, (chtype) '@'); - MvWAddCh(treescrn2, 4, 8, (chtype) '@'); - MvWAddCh(treescrn2, 4, 16, (chtype) '@'); - MvWAddCh(treescrn2, 5, 7, (chtype) '@'); - MvWAddCh(treescrn2, 5, 17, (chtype) '@'); - MvWAddCh(treescrn2, 7, 6, (chtype) '@'); - MvWAddCh(treescrn2, 7, 18, (chtype) '@'); - MvWAddCh(treescrn2, 8, 5, (chtype) '@'); - MvWAddCh(treescrn2, 8, 19, (chtype) '@'); - MvWAddCh(treescrn2, 10, 4, (chtype) '@'); - MvWAddCh(treescrn2, 10, 20, (chtype) '@'); - MvWAddCh(treescrn2, 11, 2, (chtype) '@'); - MvWAddCh(treescrn2, 11, 22, (chtype) '@'); - MvWAddCh(treescrn2, 12, 1, (chtype) '@'); - MvWAddCh(treescrn2, 12, 23, (chtype) '@'); + (dotdeer0 = newwin(3, 71, 0, 8)) == 0 || - unset_color(treescrn2); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + (stardeer0 = newwin(4, 56, 0, 8)) == 0 || -static int -star(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_YELLOW); + (lildeer0 = newwin(7, 53, 0, 8)) == 0 || + (lildeer1 = newwin(2, 4, 0, 0)) == 0 || + (lildeer2 = newwin(2, 4, 0, 0)) == 0 || + (lildeer3 = newwin(2, 4, 0, 0)) == 0 || - MvWAddCh(treescrn2, 0, 12, (chtype) '*'); - (void) wstandend(treescrn2); + (middeer0 = newwin(15, 42, 0, 8)) == 0 || + (middeer1 = newwin(3, 7, 0, 0)) == 0 || + (middeer2 = newwin(3, 7, 0, 0)) == 0 || + (middeer3 = newwin(3, 7, 0, 0)) == 0 || - unset_color(treescrn2); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + (bigdeer0 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer1 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer2 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer3 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer4 = newwin(10, 23, 0, 0)) == 0 || -static int -strng1(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_WHITE); + (lookdeer0 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer1 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer2 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer3 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer4 = newwin(10, 25, 0, 0)) == 0 || - MvWAddCh(treescrn2, 3, 13, (chtype) '\''); - MvWAddCh(treescrn2, 3, 12, (chtype) ':'); - MvWAddCh(treescrn2, 3, 11, (chtype) '.'); + (w_holiday = newwin(1, 26, 3, 27)) == 0 || - wattroff(treescrn2, A_BOLD | A_BLINK); - unset_color(treescrn2); + (w_del_msg = newwin(1, 19, 23, 60)) == 0) { + exit_curses(); + fprintf(stderr, "Cannot create windows - screen too small\n"); + ExitProgram(EXIT_FAILURE); + } - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + MvWAddStr(w_del_msg, 0, 0, "Hit any key to quit"); -static int -strng2(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_WHITE); + MvWAddStr(w_holiday, 0, 0, "H A P P Y H O L I D A Y S"); - MvWAddCh(treescrn2, 5, 14, (chtype) '\''); - MvWAddCh(treescrn2, 5, 13, (chtype) ':'); - MvWAddCh(treescrn2, 5, 12, (chtype) '.'); - MvWAddCh(treescrn2, 5, 11, (chtype) ','); - MvWAddCh(treescrn2, 6, 10, (chtype) '\''); - MvWAddCh(treescrn2, 6, 9, (chtype) ':'); + /* set up the windows for our various reindeer */ - wattroff(treescrn2, A_BOLD | A_BLINK); - unset_color(treescrn2); + /* lildeer1 */ + MvWAddCh(lildeer1, 0, 0, (chtype) 'V'); + MvWAddCh(lildeer1, 1, 0, (chtype) '@'); + MvWAddCh(lildeer1, 1, 1, (chtype) '<'); + MvWAddCh(lildeer1, 1, 2, (chtype) '>'); + MvWAddCh(lildeer1, 1, 3, (chtype) '~'); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + /* lildeer2 */ + MvWAddCh(lildeer2, 0, 0, (chtype) 'V'); + MvWAddCh(lildeer2, 1, 0, (chtype) '@'); + MvWAddCh(lildeer2, 1, 1, (chtype) '|'); + MvWAddCh(lildeer2, 1, 2, (chtype) '|'); + MvWAddCh(lildeer2, 1, 3, (chtype) '~'); -static int -strng3(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_WHITE); + /* lildeer3 */ + MvWAddCh(lildeer3, 0, 0, (chtype) 'V'); + MvWAddCh(lildeer3, 1, 0, (chtype) '@'); + MvWAddCh(lildeer3, 1, 1, (chtype) '>'); + MvWAddCh(lildeer3, 1, 2, (chtype) '<'); + MvWAddCh(lildeer2, 1, 3, (chtype) '~'); - MvWAddCh(treescrn2, 7, 16, (chtype) '\''); - MvWAddCh(treescrn2, 7, 15, (chtype) ':'); - MvWAddCh(treescrn2, 7, 14, (chtype) '.'); - MvWAddCh(treescrn2, 7, 13, (chtype) ','); - MvWAddCh(treescrn2, 8, 12, (chtype) '\''); - MvWAddCh(treescrn2, 8, 11, (chtype) ':'); - MvWAddCh(treescrn2, 8, 10, (chtype) '.'); - MvWAddCh(treescrn2, 8, 9, (chtype) ','); + /* middeer1 */ + MvWAddCh(middeer1, 0, 2, (chtype) 'y'); + MvWAddCh(middeer1, 0, 3, (chtype) 'y'); + MvWAddCh(middeer1, 1, 2, (chtype) '0'); + MvWAddCh(middeer1, 1, 3, (chtype) '('); + MvWAddCh(middeer1, 1, 4, (chtype) '='); + MvWAddCh(middeer1, 1, 5, (chtype) ')'); + MvWAddCh(middeer1, 1, 6, (chtype) '~'); + MvWAddCh(middeer1, 2, 3, (chtype) '\\'); + MvWAddCh(middeer1, 2, 4, (chtype) '/'); - wattroff(treescrn2, A_BOLD | A_BLINK); - unset_color(treescrn2); + /* middeer2 */ + MvWAddCh(middeer2, 0, 2, (chtype) 'y'); + MvWAddCh(middeer2, 0, 3, (chtype) 'y'); + MvWAddCh(middeer2, 1, 2, (chtype) '0'); + MvWAddCh(middeer2, 1, 3, (chtype) '('); + MvWAddCh(middeer2, 1, 4, (chtype) '='); + MvWAddCh(middeer2, 1, 5, (chtype) ')'); + MvWAddCh(middeer2, 1, 6, (chtype) '~'); + MvWAddCh(middeer2, 2, 3, (chtype) '|'); + MvWAddCh(middeer2, 2, 5, (chtype) '|'); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + /* middeer3 */ + MvWAddCh(middeer3, 0, 2, (chtype) 'y'); + MvWAddCh(middeer3, 0, 3, (chtype) 'y'); + MvWAddCh(middeer3, 1, 2, (chtype) '0'); + MvWAddCh(middeer3, 1, 3, (chtype) '('); + MvWAddCh(middeer3, 1, 4, (chtype) '='); + MvWAddCh(middeer3, 1, 5, (chtype) ')'); + MvWAddCh(middeer3, 1, 6, (chtype) '~'); + MvWAddCh(middeer3, 2, 2, (chtype) '/'); + MvWAddCh(middeer3, 2, 6, (chtype) '\\'); -static int -strng4(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_WHITE); + /* bigdeer1 */ + MvWAddCh(bigdeer1, 0, 17, (chtype) '\\'); + MvWAddCh(bigdeer1, 0, 18, (chtype) '/'); + MvWAddCh(bigdeer1, 0, 20, (chtype) '\\'); + MvWAddCh(bigdeer1, 0, 21, (chtype) '/'); + MvWAddCh(bigdeer1, 1, 18, (chtype) '\\'); + MvWAddCh(bigdeer1, 1, 20, (chtype) '/'); + MvWAddCh(bigdeer1, 2, 19, (chtype) '|'); + MvWAddCh(bigdeer1, 2, 20, (chtype) '_'); + MvWAddCh(bigdeer1, 3, 18, (chtype) '/'); + MvWAddCh(bigdeer1, 3, 19, (chtype) '^'); + MvWAddCh(bigdeer1, 3, 20, (chtype) '0'); + MvWAddCh(bigdeer1, 3, 21, (chtype) '\\'); + MvWAddCh(bigdeer1, 4, 17, (chtype) '/'); + MvWAddCh(bigdeer1, 4, 18, (chtype) '/'); + MvWAddCh(bigdeer1, 4, 19, (chtype) '\\'); + MvWAddCh(bigdeer1, 4, 22, (chtype) '\\'); + MvWAddStr(bigdeer1, 5, 7, "^~~~~~~~~// ~~U"); + MvWAddStr(bigdeer1, 6, 7, "( \\_____( /"); + MvWAddStr(bigdeer1, 7, 8, "( ) /"); + MvWAddStr(bigdeer1, 8, 9, "\\\\ /"); + MvWAddStr(bigdeer1, 9, 11, "\\>/>"); - MvWAddCh(treescrn2, 9, 17, (chtype) '\''); - MvWAddCh(treescrn2, 9, 16, (chtype) ':'); - MvWAddCh(treescrn2, 9, 15, (chtype) '.'); - MvWAddCh(treescrn2, 9, 14, (chtype) ','); - MvWAddCh(treescrn2, 10, 13, (chtype) '\''); - MvWAddCh(treescrn2, 10, 12, (chtype) ':'); - MvWAddCh(treescrn2, 10, 11, (chtype) '.'); - MvWAddCh(treescrn2, 10, 10, (chtype) ','); - MvWAddCh(treescrn2, 11, 9, (chtype) '\''); - MvWAddCh(treescrn2, 11, 8, (chtype) ':'); - MvWAddCh(treescrn2, 11, 7, (chtype) '.'); - MvWAddCh(treescrn2, 11, 6, (chtype) ','); - MvWAddCh(treescrn2, 12, 5, (chtype) '\''); + /* bigdeer2 */ + MvWAddCh(bigdeer2, 0, 17, (chtype) '\\'); + MvWAddCh(bigdeer2, 0, 18, (chtype) '/'); + MvWAddCh(bigdeer2, 0, 20, (chtype) '\\'); + MvWAddCh(bigdeer2, 0, 21, (chtype) '/'); + MvWAddCh(bigdeer2, 1, 18, (chtype) '\\'); + MvWAddCh(bigdeer2, 1, 20, (chtype) '/'); + MvWAddCh(bigdeer2, 2, 19, (chtype) '|'); + MvWAddCh(bigdeer2, 2, 20, (chtype) '_'); + MvWAddCh(bigdeer2, 3, 18, (chtype) '/'); + MvWAddCh(bigdeer2, 3, 19, (chtype) '^'); + MvWAddCh(bigdeer2, 3, 20, (chtype) '0'); + MvWAddCh(bigdeer2, 3, 21, (chtype) '\\'); + MvWAddCh(bigdeer2, 4, 17, (chtype) '/'); + MvWAddCh(bigdeer2, 4, 18, (chtype) '/'); + MvWAddCh(bigdeer2, 4, 19, (chtype) '\\'); + MvWAddCh(bigdeer2, 4, 22, (chtype) '\\'); + MvWAddStr(bigdeer2, 5, 7, "^~~~~~~~~// ~~U"); + MvWAddStr(bigdeer2, 6, 7, "(( )____( /"); + MvWAddStr(bigdeer2, 7, 7, "( / |"); + MvWAddStr(bigdeer2, 8, 8, "\\/ |"); + MvWAddStr(bigdeer2, 9, 9, "|> |>"); - wattroff(treescrn2, A_BOLD | A_BLINK); - unset_color(treescrn2); + /* bigdeer3 */ + MvWAddCh(bigdeer3, 0, 17, (chtype) '\\'); + MvWAddCh(bigdeer3, 0, 18, (chtype) '/'); + MvWAddCh(bigdeer3, 0, 20, (chtype) '\\'); + MvWAddCh(bigdeer3, 0, 21, (chtype) '/'); + MvWAddCh(bigdeer3, 1, 18, (chtype) '\\'); + MvWAddCh(bigdeer3, 1, 20, (chtype) '/'); + MvWAddCh(bigdeer3, 2, 19, (chtype) '|'); + MvWAddCh(bigdeer3, 2, 20, (chtype) '_'); + MvWAddCh(bigdeer3, 3, 18, (chtype) '/'); + MvWAddCh(bigdeer3, 3, 19, (chtype) '^'); + MvWAddCh(bigdeer3, 3, 20, (chtype) '0'); + MvWAddCh(bigdeer3, 3, 21, (chtype) '\\'); + MvWAddCh(bigdeer3, 4, 17, (chtype) '/'); + MvWAddCh(bigdeer3, 4, 18, (chtype) '/'); + MvWAddCh(bigdeer3, 4, 19, (chtype) '\\'); + MvWAddCh(bigdeer3, 4, 22, (chtype) '\\'); + MvWAddStr(bigdeer3, 5, 7, "^~~~~~~~~// ~~U"); + MvWAddStr(bigdeer3, 6, 6, "( ()_____( /"); + MvWAddStr(bigdeer3, 7, 6, "/ / /"); + MvWAddStr(bigdeer3, 8, 5, "|/ \\"); + MvWAddStr(bigdeer3, 9, 5, "/> \\>"); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + /* bigdeer4 */ + MvWAddCh(bigdeer4, 0, 17, (chtype) '\\'); + MvWAddCh(bigdeer4, 0, 18, (chtype) '/'); + MvWAddCh(bigdeer4, 0, 20, (chtype) '\\'); + MvWAddCh(bigdeer4, 0, 21, (chtype) '/'); + MvWAddCh(bigdeer4, 1, 18, (chtype) '\\'); + MvWAddCh(bigdeer4, 1, 20, (chtype) '/'); + MvWAddCh(bigdeer4, 2, 19, (chtype) '|'); + MvWAddCh(bigdeer4, 2, 20, (chtype) '_'); + MvWAddCh(bigdeer4, 3, 18, (chtype) '/'); + MvWAddCh(bigdeer4, 3, 19, (chtype) '^'); + MvWAddCh(bigdeer4, 3, 20, (chtype) '0'); + MvWAddCh(bigdeer4, 3, 21, (chtype) '\\'); + MvWAddCh(bigdeer4, 4, 17, (chtype) '/'); + MvWAddCh(bigdeer4, 4, 18, (chtype) '/'); + MvWAddCh(bigdeer4, 4, 19, (chtype) '\\'); + MvWAddCh(bigdeer4, 4, 22, (chtype) '\\'); + MvWAddStr(bigdeer4, 5, 7, "^~~~~~~~~// ~~U"); + MvWAddStr(bigdeer4, 6, 6, "( )______( /"); + MvWAddStr(bigdeer4, 7, 5, "(/ \\"); + MvWAddStr(bigdeer4, 8, 0, "v___= ----^"); -static int -strng5(void) -{ - (void) wattrset(treescrn2, A_BOLD | A_BLINK); - set_color(treescrn2, COLOR_WHITE); + /* lookdeer1 */ + MvWAddStr(lookdeer1, 0, 16, "\\/ \\/"); + MvWAddStr(lookdeer1, 1, 17, "\\Y/ \\Y/"); + MvWAddStr(lookdeer1, 2, 19, "\\=/"); + MvWAddStr(lookdeer1, 3, 17, "^\\o o/^"); + MvWAddStr(lookdeer1, 4, 17, "//( )"); + MvWAddStr(lookdeer1, 5, 7, "^~~~~~~~~// \\O/"); + MvWAddStr(lookdeer1, 6, 7, "( \\_____( /"); + MvWAddStr(lookdeer1, 7, 8, "( ) /"); + MvWAddStr(lookdeer1, 8, 9, "\\\\ /"); + MvWAddStr(lookdeer1, 9, 11, "\\>/>"); - MvWAddCh(treescrn2, 11, 19, (chtype) '\''); - MvWAddCh(treescrn2, 11, 18, (chtype) ':'); - MvWAddCh(treescrn2, 11, 17, (chtype) '.'); - MvWAddCh(treescrn2, 11, 16, (chtype) ','); - MvWAddCh(treescrn2, 12, 15, (chtype) '\''); - MvWAddCh(treescrn2, 12, 14, (chtype) ':'); - MvWAddCh(treescrn2, 12, 13, (chtype) '.'); - MvWAddCh(treescrn2, 12, 12, (chtype) ','); + /* lookdeer2 */ + MvWAddStr(lookdeer2, 0, 16, "\\/ \\/"); + MvWAddStr(lookdeer2, 1, 17, "\\Y/ \\Y/"); + MvWAddStr(lookdeer2, 2, 19, "\\=/"); + MvWAddStr(lookdeer2, 3, 17, "^\\o o/^"); + MvWAddStr(lookdeer2, 4, 17, "//( )"); + MvWAddStr(lookdeer2, 5, 7, "^~~~~~~~~// \\O/"); + MvWAddStr(lookdeer2, 6, 7, "(( )____( /"); + MvWAddStr(lookdeer2, 7, 7, "( / |"); + MvWAddStr(lookdeer2, 8, 8, "\\/ |"); + MvWAddStr(lookdeer2, 9, 9, "|> |>"); - wattroff(treescrn2, A_BOLD | A_BLINK); - unset_color(treescrn2); + /* lookdeer3 */ + MvWAddStr(lookdeer3, 0, 16, "\\/ \\/"); + MvWAddStr(lookdeer3, 1, 17, "\\Y/ \\Y/"); + MvWAddStr(lookdeer3, 2, 19, "\\=/"); + MvWAddStr(lookdeer3, 3, 17, "^\\o o/^"); + MvWAddStr(lookdeer3, 4, 17, "//( )"); + MvWAddStr(lookdeer3, 5, 7, "^~~~~~~~~// \\O/"); + MvWAddStr(lookdeer3, 6, 6, "( ()_____( /"); + MvWAddStr(lookdeer3, 7, 6, "/ / /"); + MvWAddStr(lookdeer3, 8, 5, "|/ \\"); + MvWAddStr(lookdeer3, 9, 5, "/> \\>"); - /* save a fully lit tree */ - overlay(treescrn2, treescrn); + /* lookdeer4 */ + MvWAddStr(lookdeer4, 0, 16, "\\/ \\/"); + MvWAddStr(lookdeer4, 1, 17, "\\Y/ \\Y/"); + MvWAddStr(lookdeer4, 2, 19, "\\=/"); + MvWAddStr(lookdeer4, 3, 17, "^\\o o/^"); + MvWAddStr(lookdeer4, 4, 17, "//( )"); + MvWAddStr(lookdeer4, 5, 7, "^~~~~~~~~// \\O/"); + MvWAddStr(lookdeer4, 6, 6, "( )______( /"); + MvWAddStr(lookdeer4, 7, 5, "(/ \\"); + MvWAddStr(lookdeer4, 8, 0, "v___= ----^"); - wrefresh(treescrn2); - wrefresh(w_del_msg); - return (0); -} + /***********************************************/ + cbreak(); + nodelay(stdscr, TRUE); + do { + clear(); + werase(treescrn); + touchwin(w_del_msg); + touchwin(treescrn); + werase(treescrn2); + touchwin(treescrn2); + werase(treescrn8); + touchwin(treescrn8); + refresh(); + look_out(150); + boxit(); + refresh(); + look_out(150); + seas(); + refresh(); + look_out(150); + greet(); + refresh(); + look_out(150); + fromwho(); + refresh(); + look_out(150); + tree(); + look_out(150); + balls(); + look_out(150); + star(); + look_out(150); + strng1(); + strng2(); + strng3(); + strng4(); + strng5(); -static int -blinkit(void) -{ - static int cycle; + /* set up the windows for our blinking trees */ + /* **************************************** */ + /* treescrn3 */ - if (cycle > 4) { - cycle = 0; - } + overlay(treescrn, treescrn3); - touchwin(treescrn8); + /*balls */ + MvWAddCh(treescrn3, 4, 18, ' '); + MvWAddCh(treescrn3, 7, 6, ' '); + MvWAddCh(treescrn3, 8, 19, ' '); + MvWAddCh(treescrn3, 11, 22, ' '); - switch (cycle) { - case 0: - overlay(treescrn3, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); - break; - case 1: - overlay(treescrn4, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); - break; - case 2: - overlay(treescrn5, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); - break; - case 3: - overlay(treescrn6, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); - break; - case 4: - overlay(treescrn7, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); - break; - } - touchwin(treescrn8); + /*star */ + MvWAddCh(treescrn3, 0, 12, '*'); + + /*strng1 */ + MvWAddCh(treescrn3, 3, 11, ' '); + + /*strng2 */ + MvWAddCh(treescrn3, 5, 13, ' '); + MvWAddCh(treescrn3, 6, 10, ' '); + + /*strng3 */ + MvWAddCh(treescrn3, 7, 16, ' '); + MvWAddCh(treescrn3, 7, 14, ' '); + + /*strng4 */ + MvWAddCh(treescrn3, 10, 13, ' '); + MvWAddCh(treescrn3, 10, 10, ' '); + MvWAddCh(treescrn3, 11, 8, ' '); - /*ALL ON************************************************** */ + /*strng5 */ + MvWAddCh(treescrn3, 11, 18, ' '); + MvWAddCh(treescrn3, 12, 13, ' '); - overlay(treescrn, treescrn8); - wrefresh(treescrn8); - wrefresh(w_del_msg); + /* treescrn4 */ - ++cycle; - return (0); -} + overlay(treescrn, treescrn4); -static void -deer_step(WINDOW *win, int y, int x) -{ - mvwin(win, y, x); - wrefresh(win); - wrefresh(w_del_msg); - look_out(5); -} + /*balls */ + MvWAddCh(treescrn4, 3, 9, ' '); + MvWAddCh(treescrn4, 4, 16, ' '); + MvWAddCh(treescrn4, 7, 6, ' '); + MvWAddCh(treescrn4, 8, 19, ' '); + MvWAddCh(treescrn4, 11, 2, ' '); + MvWAddCh(treescrn4, 12, 23, ' '); -static int -reindeer(void) -{ - int looper; - y_pos = 0; + /*star */ + (void) wstandout(treescrn4); + MvWAddCh(treescrn4, 0, 12, '*'); + (void) wstandend(treescrn4); - for (x_pos = 70; x_pos > 62; x_pos--) { - if (x_pos < 62) { - y_pos = 1; - } - for (looper = 0; looper < 4; looper++) { - MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '.'); - wrefresh(dotdeer0); - wrefresh(w_del_msg); - werase(dotdeer0); - wrefresh(dotdeer0); - wrefresh(w_del_msg); - look_out(50); - } - } + /*strng1 */ + MvWAddCh(treescrn4, 3, 13, ' '); - y_pos = 2; + /*strng2 */ - for (; x_pos > 50; x_pos--) { - for (looper = 0; looper < 4; looper++) { + /*strng3 */ + MvWAddCh(treescrn4, 7, 15, ' '); + MvWAddCh(treescrn4, 8, 11, ' '); - if (x_pos < 56) { - y_pos = 3; + /*strng4 */ + MvWAddCh(treescrn4, 9, 16, ' '); + MvWAddCh(treescrn4, 10, 12, ' '); + MvWAddCh(treescrn4, 11, 8, ' '); - MvWAddCh(stardeer0, y_pos, x_pos, (chtype) '*'); - wrefresh(stardeer0); - wrefresh(w_del_msg); - werase(stardeer0); - wrefresh(stardeer0); - wrefresh(w_del_msg); - } else { - MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '*'); - wrefresh(dotdeer0); - wrefresh(w_del_msg); - werase(dotdeer0); - wrefresh(dotdeer0); - wrefresh(w_del_msg); - } - } - } + /*strng5 */ + MvWAddCh(treescrn4, 11, 18, ' '); + MvWAddCh(treescrn4, 12, 14, ' '); - x_pos = 58; + /* treescrn5 */ - for (y_pos = 2; y_pos < 5; y_pos++) { + overlay(treescrn, treescrn5); - touchwin(lildeer0); - wrefresh(lildeer0); - wrefresh(w_del_msg); + /*balls */ + MvWAddCh(treescrn5, 3, 15, ' '); + MvWAddCh(treescrn5, 10, 20, ' '); + MvWAddCh(treescrn5, 12, 1, ' '); - for (looper = 0; looper < 4; looper++) { - deer_step(lildeer3, y_pos, x_pos); - deer_step(lildeer2, y_pos, x_pos); - deer_step(lildeer1, y_pos, x_pos); - deer_step(lildeer2, y_pos, x_pos); - deer_step(lildeer3, y_pos, x_pos); + /*star */ + MvWAddCh(treescrn5, 0, 12, '*'); - touchwin(lildeer0); - wrefresh(lildeer0); - wrefresh(w_del_msg); + /*strng1 */ + MvWAddCh(treescrn5, 3, 11, ' '); - x_pos -= 2; - } - } + /*strng2 */ + MvWAddCh(treescrn5, 5, 12, ' '); - x_pos = 35; + /*strng3 */ + MvWAddCh(treescrn5, 7, 14, ' '); + MvWAddCh(treescrn5, 8, 10, ' '); - for (y_pos = 5; y_pos < 10; y_pos++) { + /*strng4 */ + MvWAddCh(treescrn5, 9, 15, ' '); + MvWAddCh(treescrn5, 10, 11, ' '); + MvWAddCh(treescrn5, 11, 7, ' '); - touchwin(middeer0); - wrefresh(middeer0); - wrefresh(w_del_msg); + /*strng5 */ + MvWAddCh(treescrn5, 11, 17, ' '); + MvWAddCh(treescrn5, 12, 13, ' '); - for (looper = 0; looper < 2; looper++) { - deer_step(middeer3, y_pos, x_pos); - deer_step(middeer2, y_pos, x_pos); - deer_step(middeer1, y_pos, x_pos); - deer_step(middeer2, y_pos, x_pos); - deer_step(middeer3, y_pos, x_pos); + /* treescrn6 */ - touchwin(middeer0); - wrefresh(middeer0); - wrefresh(w_del_msg); + overlay(treescrn, treescrn6); - x_pos -= 3; - } - } + /*balls */ + MvWAddCh(treescrn6, 6, 7, ' '); + MvWAddCh(treescrn6, 7, 18, ' '); + MvWAddCh(treescrn6, 10, 4, ' '); + MvWAddCh(treescrn6, 11, 23, ' '); - look_out(300); + /*star */ + (void) wstandout(treescrn6); + MvWAddCh(treescrn6, 0, 12, '*'); + (void) wstandend(treescrn6); - y_pos = 1; + /*strng1 */ - for (x_pos = 8; x_pos < 16; x_pos++) { - deer_step(bigdeer4, y_pos, x_pos); - deer_step(bigdeer3, y_pos, x_pos); - deer_step(bigdeer2, y_pos, x_pos); - deer_step(bigdeer1, y_pos, x_pos); - deer_step(bigdeer2, y_pos, x_pos); - deer_step(bigdeer3, y_pos, x_pos); - deer_step(bigdeer4, y_pos, x_pos); - deer_step(bigdeer0, y_pos, x_pos); - } + /*strng2 */ + MvWAddCh(treescrn6, 5, 11, ' '); - --x_pos; + /*strng3 */ + MvWAddCh(treescrn6, 7, 13, ' '); + MvWAddCh(treescrn6, 8, 9, ' '); - for (looper = 0; looper < 6; looper++) { - deer_step(lookdeer4, y_pos, x_pos); - deer_step(lookdeer3, y_pos, x_pos); - deer_step(lookdeer2, y_pos, x_pos); - deer_step(lookdeer1, y_pos, x_pos); - deer_step(lookdeer2, y_pos, x_pos); - deer_step(lookdeer3, y_pos, x_pos); - deer_step(lookdeer4, y_pos, x_pos); - } + /*strng4 */ + MvWAddCh(treescrn6, 9, 14, ' '); + MvWAddCh(treescrn6, 10, 10, ' '); + MvWAddCh(treescrn6, 11, 6, ' '); - deer_step(lookdeer0, y_pos, x_pos); + /*strng5 */ + MvWAddCh(treescrn6, 11, 16, ' '); + MvWAddCh(treescrn6, 12, 12, ' '); - for (; y_pos < 10; y_pos++) { - for (looper = 0; looper < 2; looper++) { - deer_step(bigdeer4, y_pos, x_pos); - deer_step(bigdeer3, y_pos, x_pos); - deer_step(bigdeer2, y_pos, x_pos); - deer_step(bigdeer1, y_pos, x_pos); - deer_step(bigdeer2, y_pos, x_pos); - deer_step(bigdeer3, y_pos, x_pos); - deer_step(bigdeer4, y_pos, x_pos); - } - deer_step(bigdeer0, y_pos, x_pos); - } + /* treescrn7 */ - --y_pos; + overlay(treescrn, treescrn7); - deer_step(lookdeer3, y_pos, x_pos); - return (0); -} + /*balls */ + MvWAddCh(treescrn7, 3, 15, ' '); + MvWAddCh(treescrn7, 6, 7, ' '); + MvWAddCh(treescrn7, 7, 18, ' '); + MvWAddCh(treescrn7, 10, 4, ' '); + MvWAddCh(treescrn7, 11, 22, ' '); -static void -done(int sig GCC_UNUSED) -{ - CATCHALL(done); + /*star */ + MvWAddCh(treescrn7, 0, 12, '*'); - move(LINES - 1, 0); - refresh(); - endwin(); - curs_set(1); + /*strng1 */ + MvWAddCh(treescrn7, 3, 12, ' '); -#if NO_LEAKS - if (my_pairs != 0) - free(my_pairs); -#endif + /*strng2 */ + MvWAddCh(treescrn7, 5, 13, ' '); + MvWAddCh(treescrn7, 6, 9, ' '); - ExitProgram(EXIT_SUCCESS); + /*strng3 */ + MvWAddCh(treescrn7, 7, 15, ' '); + MvWAddCh(treescrn7, 8, 11, ' '); + + /*strng4 */ + MvWAddCh(treescrn7, 9, 16, ' '); + MvWAddCh(treescrn7, 10, 12, ' '); + MvWAddCh(treescrn7, 11, 8, ' '); + + /*strng5 */ + MvWAddCh(treescrn7, 11, 18, ' '); + MvWAddCh(treescrn7, 12, 14, ' '); + + look_out(150); + reindeer(); + + touchwin(w_holiday); + wrefresh(w_holiday); + wrefresh(w_del_msg); + + look_out(500); + for (loopy = 0; loopy < 100; loopy++) { + blinkit(); + } + } while (!opt_q); + done(0); }