From 00351a08b43e8b1c62e2c2d79b62ddca8531cfba Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 21 Aug 2022 00:16:12 +0000 Subject: [PATCH] ncurses 6.3 - patch 20220820 + fix some cppcheck warnings, mostly style, in ncurses and c++ libraries and progs directory. + add curses_trace to ifdef's for START_TRACE in test/test.priv.h + update config.guess --- NEWS | 8 +- VERSION | 2 +- aclocal.m4 | 41 +- c++/cursesf.h | 26 +- c++/cursesm.h | 12 +- c++/cursesp.h | 10 +- c++/cursesw.h | 14 +- c++/etip.h.in | 20 +- config.guess | 9 +- configure | 471 ++++++++++------- configure.in | 5 +- dist.mk | 4 +- include/ncurses_defs | 3 +- ncurses/base/lib_slk.c | 8 +- ncurses/tinfo/alloc_entry.c | 5 +- ncurses/tty/lib_mvcur.c | 10 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- test/aclocal.m4 | 5 +- test/configure | 860 ++++++++++++++++--------------- test/configure.in | 3 +- test/test.priv.h | 4 +- test/test_mouse.c | 6 +- 28 files changed, 844 insertions(+), 704 deletions(-) diff --git a/NEWS b/NEWS index 8dca9518..521b8c7a 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3846 2022/08/13 23:42:30 tom Exp $ +-- $Id: NEWS,v 1.3848 2022/08/20 18:30:07 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,12 @@ 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. +20220820 + + fix some cppcheck warnings, mostly style, in ncurses and c++ + libraries and progs directory. + + add curses_trace to ifdef's for START_TRACE in test/test.priv.h + + update config.guess + 20220813 + modify delscreen to more effectively delete all windows on the given screen. diff --git a/VERSION b/VERSION index 978194d7..8d283238 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20220813 +5:0:10 6.3 20220820 diff --git a/aclocal.m4 b/aclocal.m4 index 72954be3..7fc80c4d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.1007 2022/07/27 23:34:31 tom Exp $ +dnl $Id: aclocal.m4,v 1.1008 2022/08/20 20:07:55 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1731,6 +1731,42 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CPP_OVERRIDE version: 1 updated: 2022/08/20 16:07:10 +dnl --------------- +dnl Check if the C++ compiler accepts the override keyword. This is a C++-11 +dnl feature. +AC_DEFUN([CF_CPP_OVERRIDE], +[ +if test -n "$CXX"; then +AC_CACHE_CHECK(if $CXX accepts override keyword,cf_cv_cpp_override,[ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_RUN([ + +class base +{ +public: + virtual int foo(float x) = 0; +}; + + +class derived: public base +{ +public: + int foo(float x) override { return x != 0.0 ? 1 : 0; } +}; + +int main(void) { } +], + [cf_cv_cpp_override=yes], + [cf_cv_cpp_override=no], + [cf_cv_cpp_override=unknown]) + AC_LANG_RESTORE +]) +fi +test "$cf_cv_cpp_override" = yes && AC_DEFINE(CPP_HAS_OVERRIDE,1,[Define to 1 if C++ has override keyword]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CPP_PARAM_INIT version: 7 updated: 2017/01/21 11:06:25 dnl ----------------- dnl Check if the C++ compiler accepts duplicate parameter initialization. This @@ -6869,7 +6905,7 @@ fi AC_SUBST(LDCONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37 +dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ @@ -6880,6 +6916,7 @@ case "x$LINT" in ;; esac AC_SUBST(LINT_OPTS) +AC_SUBST(LINT_LIBS) ])dnl dnl --------------------------------------------------------------------------- dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37 diff --git a/c++/cursesf.h b/c++/cursesf.h index ea1aaf0d..e29e7adb 100644 --- a/c++/cursesf.h +++ b/c++/cursesf.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,7 +33,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: cursesf.h,v 1.38 2021/04/17 18:11:08 tom Exp $ +// $Id: cursesf.h,v 1.39 2022/08/20 20:52:15 tom Exp $ #ifndef NCURSES_CURSESF_H_incl #define NCURSES_CURSESF_H_incl 1 @@ -501,21 +501,21 @@ public: } // Decorations - inline void frame(const char *title=NULL, const char* btitle=NULL) { + inline void frame(const char *title=NULL, const char* btitle=NULL) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::frame(title,btitle); else OnError(E_SYSTEM_ERROR); } - inline void boldframe(const char *title=NULL, const char* btitle=NULL) { + inline void boldframe(const char *title=NULL, const char* btitle=NULL) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::boldframe(title,btitle); else OnError(E_SYSTEM_ERROR); } - inline void label(const char *topLabel, const char *bottomLabel) { + inline void label(const char *topLabel, const char *bottomLabel) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::label(topLabel,bottomLabel); else @@ -727,7 +727,7 @@ class NCURSES_CXX_IMPEXP Alpha_Field : public NCursesFieldType private: int min_field_width; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype,min_field_width)); } @@ -743,7 +743,7 @@ class NCURSES_CXX_IMPEXP Alphanumeric_Field : public NCursesFieldType private: int min_field_width; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype,min_field_width)); } @@ -760,7 +760,7 @@ private: int precision; long lower_limit, upper_limit; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype, precision,lower_limit,upper_limit)); } @@ -778,7 +778,7 @@ private: int precision; double lower_limit, upper_limit; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype, precision,lower_limit,upper_limit)); } @@ -795,7 +795,7 @@ class NCURSES_CXX_IMPEXP Regular_Expression_Field : public NCursesFieldType private: char* regex; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype,regex)); } @@ -842,7 +842,7 @@ private: int case_sensitive; int non_unique_matches; - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype, list,case_sensitive,non_unique_matches)); } @@ -877,7 +877,7 @@ public: class NCURSES_CXX_IMPEXP IPV4_Address_Field : public NCursesFieldType { private: - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype)); } @@ -912,7 +912,7 @@ protected: friend bool _nc_xx_fld_ccheck(int c, const void *); friend void* _nc_xx_fld_makearg(va_list*); - void set(NCursesFormField& f) { + void set(NCursesFormField& f) NCURSES_OVERRIDE { OnError(::set_field_type(f.get_field(),fieldtype,&f)); } diff --git a/c++/cursesm.h b/c++/cursesm.h index 383c7e12..9651195f 100644 --- a/c++/cursesm.h +++ b/c++/cursesm.h @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: cursesm.h,v 1.34 2020/05/24 01:40:20 anonymous.maarten Exp $ +// $Id: cursesm.h,v 1.35 2022/08/20 20:52:15 tom Exp $ #ifndef NCURSES_CURSESM_H_incl #define NCURSES_CURSESM_H_incl 1 @@ -182,7 +182,7 @@ public: virtual ~NCursesMenuCallbackItem() THROWS(NCursesException); - bool action(); + bool action() NCURSES_OVERRIDE; }; // This are the built-in hook functions in this C++ binding. In C++ we use @@ -512,21 +512,21 @@ public: } // Decorations - inline void frame(const char *title=NULL, const char* btitle=NULL) { + inline void frame(const char *title=NULL, const char* btitle=NULL) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::frame(title,btitle); else OnError(E_SYSTEM_ERROR); } - inline void boldframe(const char *title=NULL, const char* btitle=NULL) { + inline void boldframe(const char *title=NULL, const char* btitle=NULL) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::boldframe(title,btitle); else OnError(E_SYSTEM_ERROR); } - inline void label(const char *topLabel, const char *bottomLabel) { + inline void label(const char *topLabel, const char *bottomLabel) NCURSES_OVERRIDE { if (b_framed) NCursesPanel::label(topLabel,bottomLabel); else diff --git a/c++/cursesp.h b/c++/cursesp.h index 1eb90e95..f0bd5c9c 100644 --- a/c++/cursesp.h +++ b/c++/cursesp.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #ifndef NCURSES_CURSESP_H_incl #define NCURSES_CURSESP_H_incl 1 -// $Id: cursesp.h,v 1.35 2021/04/17 18:11:08 tom Exp $ +// $Id: cursesp.h,v 1.36 2022/08/20 20:52:15 tom Exp $ #include @@ -162,7 +162,7 @@ public: // N.B.: The panel associated with ::stdscr is always on the bottom. So // actually bottom() makes the panel the first above ::stdscr. - virtual int mvwin(int y, int x) + virtual int mvwin(int y, int x) NCURSES_OVERRIDE { OnError(::move_panel(p, y, x)); return OK; @@ -195,11 +195,11 @@ public: // Those two are rewrites of the corresponding virtual members of // NCursesWindow - virtual int refresh(); + virtual int refresh() NCURSES_OVERRIDE; // Propagate all panel changes to the virtual screen and update the // physical screen. - virtual int noutrefresh(); + virtual int noutrefresh() NCURSES_OVERRIDE; // Propagate all panel changes to the virtual screen. static void redraw(); diff --git a/c++/cursesw.h b/c++/cursesw.h index 001f6dbc..eef5a631 100644 --- a/c++/cursesw.h +++ b/c++/cursesw.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ #ifndef NCURSES_CURSESW_H_incl #define NCURSES_CURSESW_H_incl 1 -// $Id: cursesw.h,v 1.58 2021/04/17 18:11:08 tom Exp $ +// $Id: cursesw.h,v 1.59 2022/08/20 20:52:15 tom Exp $ extern "C" { # include @@ -1503,7 +1503,7 @@ public: // Put the attributed character onto the pad and immediately do a // prefresh(). - int refresh(); + int refresh() NCURSES_OVERRIDE; // If a viewport is defined the pad is displayed in this window, otherwise // this is a noop. @@ -1517,7 +1517,7 @@ public: // on the screen. refresh copies a rectangle of this size beginning // with top left corner pminrow,pmincol onto the screen and calls doupdate(). - int noutrefresh(); + int noutrefresh() NCURSES_OVERRIDE; // If a viewport is defined the pad is displayed in this window, otherwise // this is a noop. @@ -1547,7 +1547,7 @@ public: class NCURSES_CXX_IMPEXP NCursesFramedPad : public NCursesPad { protected: - virtual void OnOperation(int pad_req); + virtual void OnOperation(int pad_req) NCURSES_OVERRIDE; public: NCursesFramedPad(NCursesWindow& win, int nlines, int ncols, @@ -1562,7 +1562,7 @@ public: delete getSubWindow(); } - void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) { + void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) NCURSES_OVERRIDE { (void) view; (void) v_grid; (void) h_grid; @@ -1570,7 +1570,7 @@ public: } // Disable this call; the viewport is already defined - void setSubWindow(NCursesWindow& sub) { + void setSubWindow(NCursesWindow& sub) NCURSES_OVERRIDE { (void) sub; err_handler("Operation not allowed"); } diff --git a/c++/etip.h.in b/c++/etip.h.in index 9dbb0e70..70842ef6 100644 --- a/c++/etip.h.in +++ b/c++/etip.h.in @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: etip.h.in,v 1.48 2021/06/17 21:11:08 tom Exp $ +// $Id: etip.h.in,v 1.50 2022/08/20 20:50:00 tom Exp $ #ifndef NCURSES_ETIP_H_incl #define NCURSES_ETIP_H_incl 1 @@ -70,6 +70,10 @@ #define ETIP_NEEDS_MATH_EXCEPTION 0 #endif +#ifndef CPP_HAS_OVERRIDE +#define CPP_HAS_OVERRIDE 0 +#endif + #ifndef CPP_HAS_PARAM_INIT #define CPP_HAS_PARAM_INIT 0 #endif @@ -127,6 +131,12 @@ extern "C" { } // Language features +#if CPP_HAS_OVERRIDE +#define NCURSES_OVERRIDE override +#else +#define NCURSES_OVERRIDE /*nothing*/ +#endif + #if CPP_HAS_PARAM_INIT #define NCURSES_PARAM_INIT(value) = value #else @@ -225,7 +235,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesPanel"; } @@ -276,7 +286,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesMenu"; } @@ -327,7 +337,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesForm"; } diff --git a/config.guess b/config.guess index 160ecf09..1817bdce 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-05-08' +timestamp='2022-05-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1378,8 +1378,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE diff --git a/configure b/configure index e0a3d640..e7dff243 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.746 . +# From configure.in Revision: 1.747 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20210509. # @@ -26353,7 +26353,79 @@ echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:26356: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:26356: checking if $CXX accepts override keyword" >&5 +echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6 +if test "${cf_cv_cpp_override+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + + if test "$cross_compiling" = yes; then + cf_cv_cpp_override=unknown +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 26373 "configure" +#include "confdefs.h" + +class base +{ +public: + virtual int foo(float x) = 0; +}; + +class derived: public base +{ +public: + int foo(float x) override { return x != 0.0 ? 1 : 0; } +}; + +int main(void) { } + +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:26392: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:26397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_override=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_cpp_override=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + +fi +echo "$as_me:26419: result: $cf_cv_cpp_override" >&5 +echo "${ECHO_T}$cf_cv_cpp_override" >&6 +fi +test "$cf_cv_cpp_override" = yes && +cat >>confdefs.h <<\EOF +#define CPP_HAS_OVERRIDE 1 +EOF + +if test -n "$CXX"; then +echo "$as_me:26428: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26370,7 +26442,7 @@ ac_main_return="return" cf_cv_cpp_param_init=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 26373 "configure" +#line 26445 "configure" #include "confdefs.h" class TEST { @@ -26389,15 +26461,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26392: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26395: \$? = $ac_status" >&5 + echo "$as_me:26467: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26397: \"$ac_try\"") >&5 + { (eval echo "$as_me:26469: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26400: \$? = $ac_status" >&5 + echo "$as_me:26472: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_param_init=yes else @@ -26416,7 +26488,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26419: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:26491: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -26426,7 +26498,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:26429: checking if $CXX accepts static_cast" >&5 +echo "$as_me:26501: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26440,7 +26512,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" cat >"conftest.$ac_ext" <<_ACEOF -#line 26443 "configure" +#line 26515 "configure" #include "confdefs.h" class NCursesPanel @@ -26484,16 +26556,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26559: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26490: \$? = $ac_status" >&5 + echo "$as_me:26562: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26493: \"$ac_try\"") >&5 + { (eval echo "$as_me:26565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26496: \$? = $ac_status" >&5 + echo "$as_me:26568: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_static_cast=yes else @@ -26511,7 +26583,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26514: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:26586: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -26560,13 +26632,13 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:26563: checking for bool" >&5 +echo "$as_me:26635: checking for bool" >&5 echo $ECHO_N "checking for bool... $ECHO_C" >&6 if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 26569 "configure" +#line 26641 "configure" #include "confdefs.h" #include @@ -26602,16 +26674,16 @@ if (sizeof (bool)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26605: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26608: \$? = $ac_status" >&5 + echo "$as_me:26680: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26611: \"$ac_try\"") >&5 + { (eval echo "$as_me:26683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26614: \$? = $ac_status" >&5 + echo "$as_me:26686: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_bool=yes else @@ -26621,10 +26693,10 @@ ac_cv_type_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:26624: result: $ac_cv_type_bool" >&5 +echo "$as_me:26696: result: $ac_cv_type_bool" >&5 echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:26627: checking size of bool" >&5 +echo "$as_me:26699: checking size of bool" >&5 echo $ECHO_N "checking size of bool... $ECHO_C" >&6 if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26633,7 +26705,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 26636 "configure" +#line 26708 "configure" #include "confdefs.h" #include @@ -26666,21 +26738,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26669: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26741: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26672: \$? = $ac_status" >&5 + echo "$as_me:26744: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26675: \"$ac_try\"") >&5 + { (eval echo "$as_me:26747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26678: \$? = $ac_status" >&5 + echo "$as_me:26750: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26683 "configure" +#line 26755 "configure" #include "confdefs.h" #include @@ -26713,16 +26785,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26716: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26719: \$? = $ac_status" >&5 + echo "$as_me:26791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26722: \"$ac_try\"") >&5 + { (eval echo "$as_me:26794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26725: \$? = $ac_status" >&5 + echo "$as_me:26797: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -26738,7 +26810,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26741 "configure" +#line 26813 "configure" #include "confdefs.h" #include @@ -26771,16 +26843,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26777: \$? = $ac_status" >&5 + echo "$as_me:26849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26780: \"$ac_try\"") >&5 + { (eval echo "$as_me:26852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26783: \$? = $ac_status" >&5 + echo "$as_me:26855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -26796,7 +26868,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 26799 "configure" +#line 26871 "configure" #include "confdefs.h" #include @@ -26829,16 +26901,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26832: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26904: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26835: \$? = $ac_status" >&5 + echo "$as_me:26907: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26838: \"$ac_try\"") >&5 + { (eval echo "$as_me:26910: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26841: \$? = $ac_status" >&5 + echo "$as_me:26913: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -26851,12 +26923,12 @@ done ac_cv_sizeof_bool=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:26854: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:26926: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 26859 "configure" +#line 26931 "configure" #include "confdefs.h" #include @@ -26893,15 +26965,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26896: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26968: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26899: \$? = $ac_status" >&5 + echo "$as_me:26971: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26901: \"$ac_try\"") >&5 + { (eval echo "$as_me:26973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26904: \$? = $ac_status" >&5 + echo "$as_me:26976: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_bool=`cat conftest.val` else @@ -26917,13 +26989,13 @@ else ac_cv_sizeof_bool=0 fi fi -echo "$as_me:26920: result: $ac_cv_sizeof_bool" >&5 +echo "$as_me:26992: result: $ac_cv_sizeof_bool" >&5 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 cat >>confdefs.h <&5 +echo "$as_me:26998: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26942,7 +27014,7 @@ else else cat >"conftest.$ac_ext" <<_ACEOF -#line 26945 "configure" +#line 27017 "configure" #include "confdefs.h" #include @@ -26984,15 +27056,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26990: \$? = $ac_status" >&5 + echo "$as_me:27062: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26992: \"$ac_try\"") >&5 + { (eval echo "$as_me:27064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26995: \$? = $ac_status" >&5 + echo "$as_me:27067: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -27009,26 +27081,26 @@ fi rm -f cf_test.out fi -echo "$as_me:27012: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:27084: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:27019: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:27091: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:27025: checking for fallback type of bool" >&5 + echo "$as_me:27097: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in (i?86) cf_cv_type_of_bool=char ;; (*) cf_cv_type_of_bool=int ;; esac - echo "$as_me:27031: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:27103: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -27057,7 +27129,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:27060: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:27132: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -27074,7 +27146,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:27077: checking for $ac_word" >&5 +echo "$as_me:27149: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27091,7 +27163,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:27094: found $ac_dir/$ac_word" >&5 + echo "$as_me:27166: found $ac_dir/$ac_word" >&5 break fi done @@ -27103,10 +27175,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:27106: result: $cf_TEMP_gnat" >&5 + echo "$as_me:27178: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:27109: result: no" >&5 + echo "$as_me:27181: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -27116,7 +27188,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:27119: checking for $cf_prog_gnat version" >&5 +echo "$as_me:27191: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27127,7 +27199,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:27130: result: $cf_cv_gnat_version" >&5 +echo "$as_me:27202: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -27156,7 +27228,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:27159: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:27231: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test "$cf_gprconfig" = C then @@ -27175,10 +27247,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:27178: result: $cf_gprconfig_value" >&5 + echo "$as_me:27250: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:27181: result: missing" >&5 + echo "$as_me:27253: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -27191,7 +27263,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:27194: checking for gnat version" >&5 +echo "$as_me:27266: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27202,7 +27274,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:27205: result: $cf_cv_gnat_version" >&5 +echo "$as_me:27277: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -27211,7 +27283,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:27214: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:27286: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -27219,7 +27291,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:27222: checking for $ac_word" >&5 +echo "$as_me:27294: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27234,7 +27306,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_M4_exists="yes" -echo "$as_me:27237: found $ac_dir/$ac_word" >&5 +echo "$as_me:27309: found $ac_dir/$ac_word" >&5 break done @@ -27243,20 +27315,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:27246: result: $M4_exists" >&5 + echo "$as_me:27318: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:27249: result: no" >&5 + echo "$as_me:27321: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:27255: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:27327: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:27259: checking if GNAT works" >&5 + echo "$as_me:27331: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -27284,7 +27356,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:27287: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:27359: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -27296,7 +27368,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:27299: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:27371: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -27313,10 +27385,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:27316: result: $ADAFLAGS" >&5 + echo "$as_me:27388: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:27319: checking if GNATPREP supports -T option" >&5 +echo "$as_me:27391: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27326,11 +27398,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:27329: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:27401: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:27333: checking if GNAT supports generics" >&5 +echo "$as_me:27405: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -27340,7 +27412,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:27343: result: $cf_gnat_generics" >&5 +echo "$as_me:27415: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -27352,7 +27424,7 @@ else cf_generic_objects= fi -echo "$as_me:27355: checking if GNAT supports SIGINT" >&5 +echo "$as_me:27427: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27400,7 +27472,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:27403: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:27475: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -27413,7 +27485,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:27416: checking if GNAT supports project files" >&5 +echo "$as_me:27488: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -27476,15 +27548,15 @@ CF_EOF esac ;; esac -echo "$as_me:27479: result: $cf_gnat_projects" >&5 +echo "$as_me:27551: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:27485: checking if GNAT supports libraries" >&5 + echo "$as_me:27557: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:27487: result: $cf_gnat_libraries" >&5 + echo "$as_me:27559: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -27504,7 +27576,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:27507: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:27579: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -27516,7 +27588,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:27519: checking for ada-compiler" >&5 +echo "$as_me:27591: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -27527,12 +27599,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:27530: result: $cf_ada_compiler" >&5 +echo "$as_me:27602: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:27535: checking for ada-include" >&5 +echo "$as_me:27607: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -27568,7 +27640,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27571: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:27643: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27577,10 +27649,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:27580: result: $ADA_INCLUDE" >&5 +echo "$as_me:27652: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:27583: checking for ada-objects" >&5 +echo "$as_me:27655: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -27616,7 +27688,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27619: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:27691: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27625,10 +27697,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:27628: result: $ADA_OBJECTS" >&5 +echo "$as_me:27700: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:27631: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:27703: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -27638,14 +27710,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:27641: result: $with_ada_sharedlib" >&5 +echo "$as_me:27713: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:27648: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:27720: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -27665,7 +27737,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:27668: checking for ada-libname" >&5 +echo "$as_me:27740: checking for ada-libname" >&5 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -27681,7 +27753,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:27684: result: $ADA_LIBNAME" >&5 +echo "$as_me:27756: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -27692,13 +27764,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:27695: checking for wchar_t" >&5 + echo "$as_me:27767: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27701 "configure" +#line 27773 "configure" #include "confdefs.h" $ac_includes_default int @@ -27713,16 +27785,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27716: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27719: \$? = $ac_status" >&5 + echo "$as_me:27791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27722: \"$ac_try\"") >&5 + { (eval echo "$as_me:27794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27725: \$? = $ac_status" >&5 + echo "$as_me:27797: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_wchar_t=yes else @@ -27732,10 +27804,10 @@ ac_cv_type_wchar_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27735: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:27807: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:27738: checking size of wchar_t" >&5 +echo "$as_me:27810: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27744,7 +27816,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 27747 "configure" +#line 27819 "configure" #include "confdefs.h" $ac_includes_default int @@ -27756,21 +27828,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27759: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27831: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27762: \$? = $ac_status" >&5 + echo "$as_me:27834: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27765: \"$ac_try\"") >&5 + { (eval echo "$as_me:27837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27768: \$? = $ac_status" >&5 + echo "$as_me:27840: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 27773 "configure" +#line 27845 "configure" #include "confdefs.h" $ac_includes_default int @@ -27782,16 +27854,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27857: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27788: \$? = $ac_status" >&5 + echo "$as_me:27860: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27791: \"$ac_try\"") >&5 + { (eval echo "$as_me:27863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27794: \$? = $ac_status" >&5 + echo "$as_me:27866: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -27807,7 +27879,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 27810 "configure" +#line 27882 "configure" #include "confdefs.h" $ac_includes_default int @@ -27819,16 +27891,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27894: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27825: \$? = $ac_status" >&5 + echo "$as_me:27897: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27828: \"$ac_try\"") >&5 + { (eval echo "$as_me:27900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27831: \$? = $ac_status" >&5 + echo "$as_me:27903: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -27844,7 +27916,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 27847 "configure" +#line 27919 "configure" #include "confdefs.h" $ac_includes_default int @@ -27856,16 +27928,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27859: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27931: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27862: \$? = $ac_status" >&5 + echo "$as_me:27934: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27865: \"$ac_try\"") >&5 + { (eval echo "$as_me:27937: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27868: \$? = $ac_status" >&5 + echo "$as_me:27940: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -27878,12 +27950,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:27881: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:27953: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 27886 "configure" +#line 27958 "configure" #include "confdefs.h" $ac_includes_default int @@ -27899,15 +27971,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27902: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27974: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27905: \$? = $ac_status" >&5 + echo "$as_me:27977: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27907: \"$ac_try\"") >&5 + { (eval echo "$as_me:27979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27910: \$? = $ac_status" >&5 + echo "$as_me:27982: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -27923,7 +27995,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:27926: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:27998: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:27939: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:28011: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -27954,7 +28026,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:27957: checking for library subsets" >&5 +echo "$as_me:28029: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -28008,7 +28080,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:28011: result: $LIB_SUBSETS" >&5 +echo "$as_me:28083: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -28039,7 +28111,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:28042: checking default library suffix" >&5 +echo "$as_me:28114: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28050,10 +28122,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:28053: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:28125: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:28056: checking default library-dependency suffix" >&5 +echo "$as_me:28128: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -28136,10 +28208,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:28139: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:28211: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:28142: checking default object directory" >&5 +echo "$as_me:28214: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28155,11 +28227,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:28158: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:28230: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:28162: checking c++ library-dependency suffix" >&5 +echo "$as_me:28234: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -28252,7 +28324,7 @@ else fi fi -echo "$as_me:28255: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:28327: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -28428,19 +28500,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:28431: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:28503: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:28440: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:28512: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28443: \$? = $ac_status" >&5 + echo "$as_me:28515: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null @@ -28451,10 +28523,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28454 "configure" +#line 28526 "configure" #include "confdefs.h" -#line 28457 "configure" +#line 28529 "configure" #include int cf_ldflags_static(FILE *fp); @@ -28469,16 +28541,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28472: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28475: \$? = $ac_status" >&5 + echo "$as_me:28547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28478: \"$ac_try\"") >&5 + { (eval echo "$as_me:28550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28481: \$? = $ac_status" >&5 + echo "$as_me:28553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then # some linkers simply ignore the -dynamic @@ -28501,7 +28573,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:28504: result: $cf_ldflags_static" >&5 + echo "$as_me:28576: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test "$cf_ldflags_static" != yes @@ -28517,7 +28589,7 @@ fi ;; esac -echo "$as_me:28520: checking where we will install curses.h" >&5 +echo "$as_me:28592: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -28527,7 +28599,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:28530: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:28602: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -28535,7 +28607,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:28538: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:28610: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -28563,7 +28635,7 @@ EOF # pkgsrc uses these -echo "$as_me:28566: checking for desired basename for form library" >&5 +echo "$as_me:28638: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -28583,10 +28655,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:28586: result: $FORM_NAME" >&5 +echo "$as_me:28658: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:28589: checking for desired basename for menu library" >&5 +echo "$as_me:28661: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -28606,10 +28678,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:28609: result: $MENU_NAME" >&5 +echo "$as_me:28681: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:28612: checking for desired basename for panel library" >&5 +echo "$as_me:28684: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -28629,10 +28701,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:28632: result: $PANEL_NAME" >&5 +echo "$as_me:28704: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:28635: checking for desired basename for cxx library" >&5 +echo "$as_me:28707: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -28652,13 +28724,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:28655: result: $CXX_NAME" >&5 +echo "$as_me:28727: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:28661: checking for src modules" >&5 +echo "$as_me:28733: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -28727,7 +28799,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME" fi fi done -echo "$as_me:28730: result: $cf_cv_src_modules" >&5 +echo "$as_me:28802: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -28888,7 +28960,7 @@ case "$cf_cv_system_name" in (*-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:28891: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:28963: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -28899,7 +28971,7 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -echo "$as_me:28902: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:28974: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN @@ -28915,7 +28987,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:28918: result: $PKG_CFLAGS" >&5 +echo "$as_me:28990: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -28976,7 +29048,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 -echo "${as_me:-configure}:28979: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:29051: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -29003,7 +29075,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:29006: checking for linker search path" >&5 +echo "$as_me:29078: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -29051,7 +29123,7 @@ then cf_pathlist="$cf_pathlist /lib /usr/lib" ;; (*) - { echo "$as_me:29054: WARNING: problem with Solaris architecture" >&5 + { echo "$as_me:29126: WARNING: problem with Solaris architecture" >&5 echo "$as_me: WARNING: problem with Solaris architecture" >&2;} ;; esac @@ -29092,7 +29164,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:29095: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:29167: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` @@ -29182,7 +29254,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:29185: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:29257: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -29361,7 +29433,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:29364: error: ambiguous option: $1 + { { echo "$as_me:29436: 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;} @@ -29380,7 +29452,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:29383: error: unrecognized option: $1 + -*) { { echo "$as_me:29455: 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;} @@ -29506,7 +29578,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:29509: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:29581: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -29638,6 +29710,7 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t s,@LN_S@,$LN_S,;t t s,@cf_config_suffix@,$cf_config_suffix,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t @@ -30018,7 +30091,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:30021: creating $ac_file" >&5 + { echo "$as_me:30094: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -30036,7 +30109,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:30039: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30112: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -30049,7 +30122,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30052: error: cannot find input file: $f" >&5 + { { echo "$as_me:30125: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30065,7 +30138,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:30068: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:30141: 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;} @@ -30074,7 +30147,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:30077: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:30150: 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;} @@ -30111,7 +30184,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:30114: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:30187: 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;} @@ -30122,7 +30195,7 @@ $ac_seen" >&2;} ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:30125: WARNING: Some variables may not be substituted: + { echo "$as_me:30198: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -30171,7 +30244,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:30174: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:30247: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -30182,7 +30255,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:30185: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30258: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -30195,7 +30268,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30198: error: cannot find input file: $f" >&5 + { { echo "$as_me:30271: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30253,7 +30326,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:30256: $ac_file is unchanged" >&5 + { echo "$as_me:30329: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -30640,7 +30713,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:30643: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:30716: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 7bf3b383..b399824d 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.746 2022/07/28 20:14:30 tom Exp $ +dnl $Id: configure.in,v 1.747 2022/08/20 19:54:19 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.746 $) +AC_REVISION($Revision: 1.747 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1940,6 +1940,7 @@ if test -n "$CXX" ; then CF_BOOL_DECL CF_BOOL_SIZE CF_ETIP_DEFINES + CF_CPP_OVERRIDE CF_CPP_PARAM_INIT CF_CPP_STATIC_CAST CF_CXX_AR_FLAGS diff --git a/dist.mk b/dist.mk index 531ead2e..8b4cbe79 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1497 2022/08/13 09:43:55 tom Exp $ +# $Id: dist.mk,v 1.1498 2022/08/20 09:47:59 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20220813 +NCURSES_PATCH = 20220820 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/ncurses_defs b/include/ncurses_defs index 50b53e85..16e73018 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.101 2022/07/28 20:15:27 tom Exp $ +# $Id: ncurses_defs,v 1.102 2022/08/20 16:36:11 tom Exp $ ############################################################################## # Copyright 2018-2021,2022 Thomas E. Dickey # # Copyright 2000-2016,2017 Free Software Foundation, Inc. # @@ -58,6 +58,7 @@ HAVE_COPYWIN 1 HAVE_CURSCR 1 HAVE_CURSES_DATA_TABSIZE 1 HAVE_CURSES_DATA_TTYTYPE 1 +HAVE_CURSES_TRACE 1 HAVE_DELSCREEN 1 HAVE_DERWIN 1 HAVE_DIRENT_H diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c index f4b3ce6d..47e57e0b 100644 --- a/ncurses/base/lib_slk.c +++ b/ncurses/base/lib_slk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 1998-2010,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_slk.c,v 1.49 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $") #ifdef USE_TERM_DRIVER #define NumLabels InfoOf(SP_PARM).numlabels @@ -187,8 +187,10 @@ _nc_slk_initialize(WINDOW *stwin, int cols) || SP_PARM->_slk->labcnt <= 0 || (SP_PARM->_slk->ent = typeCalloc(slk_ent, (size_t) SP_PARM->_slk->labcnt)) - == NULL) + == NULL) { + free(SP_PARM->_slk->ent); returnCode(slk_failed(NCURSES_SP_ARG)); + } max_length = (size_t) SP_PARM->_slk->maxlen; for (i = 0; i < SP_PARM->_slk->labcnt; i++) { diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c index 10c4fc75..219c76e6 100644 --- a/ncurses/tinfo/alloc_entry.c +++ b/ncurses/tinfo/alloc_entry.c @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: alloc_entry.c,v 1.73 2022/05/08 00:11:44 tom Exp $") +MODULE_ID("$Id: alloc_entry.c,v 1.74 2022/08/20 18:03:14 tom Exp $") #define ABSENT_OFFSET -1 #define CANCELLED_OFFSET -2 @@ -106,9 +106,10 @@ _nc_save_str(const char *string) { char *result = 0; size_t old_next_free = next_free; - size_t len; if (stringbuf != NULL) { + size_t len; + if (!VALID_STRING(string)) string = ""; len = strlen(string) + 1; diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c index 79592271..ba3ee089 100644 --- a/ncurses/tty/lib_mvcur.c +++ b/ncurses/tty/lib_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -160,7 +160,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mvcur.c,v 1.156 2021/09/04 10:29:15 tom Exp $") +MODULE_ID("$Id: lib_mvcur.c,v 1.157 2022/08/20 18:28:58 tom Exp $") #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */ @@ -470,12 +470,12 @@ NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0) /* wrap up cursor-addressing mode */ { - /* leave cursor at screen bottom */ - TINFO_MVCUR(NCURSES_SP_ARGx -1, -1, screen_lines(SP_PARM) - 1, 0); - if (!SP_PARM || !IsTermInfo(SP_PARM)) return; + /* leave cursor at screen bottom */ + TINFO_MVCUR(NCURSES_SP_ARGx -1, -1, screen_lines(SP_PARM) - 1, 0); + /* set cursor to normal mode */ if (SP_PARM->_cursor != -1) { int cursor = SP_PARM->_cursor; diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index aabe8417..84887742 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220813) unstable; urgency=low +ncurses6 (6.3+20220820) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 13 Aug 2022 05:43:55 -0400 + -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index aabe8417..84887742 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220813) unstable; urgency=low +ncurses6 (6.3+20220820) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 13 Aug 2022 05:43:55 -0400 + -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 870eea54..5897d431 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220813) unstable; urgency=low +ncurses6 (6.3+20220820) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 13 Aug 2022 05:43:55 -0400 + -- Thomas E. Dickey Sat, 20 Aug 2022 05:47:59 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index f8883001..0f9f4a02 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.537 2022/08/13 09:43:55 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.538 2022/08/20 09:47:59 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "0813" +!define VERSION_MMDD "0820" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 36d9dc56..74bca996 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.3 -Release: 20220813 +Release: 20220820 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 3f0bb4b1..668b9db3 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20220813 +Release: 20220820 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index efc0c72e..b0975304 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20220813 +Release: 20220820 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 9a972621..80bf48a4 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.205 2022/07/27 23:35:25 tom Exp $ +dnl $Id: aclocal.m4,v 1.206 2022/08/20 20:13:23 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -3414,7 +3414,7 @@ case $INSTALL in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37 +dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ @@ -3425,6 +3425,7 @@ case "x$LINT" in ;; esac AC_SUBST(LINT_OPTS) +AC_SUBST(LINT_LIBS) ])dnl dnl --------------------------------------------------------------------------- dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40 diff --git a/test/configure b/test/configure index 9d331f51..d9d3af61 100755 --- a/test/configure +++ b/test/configure @@ -19014,6 +19014,7 @@ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ @@ -19071,10 +19072,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19074: checking for ${cf_func}" >&5 + echo "$as_me:19075: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19077: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19078: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19083,7 +19084,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19086 "configure" +#line 19087 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19116,16 +19117,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19120: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19122: \$? = $ac_status" >&5 + echo "$as_me:19123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19125: \"$ac_try\"") >&5 + { (eval echo "$as_me:19126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19128: \$? = $ac_status" >&5 + echo "$as_me:19129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19141,7 +19142,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19144: result: $cf_result" >&5 + echo "$as_me:19145: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <&5 + echo "$as_me:19160: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19162: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19163: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19168,7 +19169,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19171 "configure" +#line 19172 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19201,16 +19202,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19205: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19207: \$? = $ac_status" >&5 + echo "$as_me:19208: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19210: \"$ac_try\"") >&5 + { (eval echo "$as_me:19211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19213: \$? = $ac_status" >&5 + echo "$as_me:19214: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19226,7 +19227,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19229: result: $cf_result" >&5 + echo "$as_me:19230: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 19253 "configure" +#line 19254 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19270,21 +19271,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19274: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19276: \$? = $ac_status" >&5 + echo "$as_me:19277: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19279: \"$ac_try\"") >&5 + { (eval echo "$as_me:19280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19282: \$? = $ac_status" >&5 + echo "$as_me:19283: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:19287: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:19288: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:19308: 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 19314 "configure" +#line 19315 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19326,16 +19327,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19330: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19332: \$? = $ac_status" >&5 + echo "$as_me:19333: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19335: \"$ac_try\"") >&5 + { (eval echo "$as_me:19336: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19338: \$? = $ac_status" >&5 + echo "$as_me:19339: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -19343,7 +19344,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 19346 "configure" +#line 19347 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19368,16 +19369,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19374: \$? = $ac_status" >&5 + echo "$as_me:19375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19377: \"$ac_try\"") >&5 + { (eval echo "$as_me:19378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19380: \$? = $ac_status" >&5 + echo "$as_me:19381: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -19391,7 +19392,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19394: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:19395: 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 @@ -19405,11 +19406,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:19408: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:19409: 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 19412 "configure" +#line 19413 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19422,16 +19423,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19425: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19426: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19428: \$? = $ac_status" >&5 + echo "$as_me:19429: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19431: \"$ac_try\"") >&5 + { (eval echo "$as_me:19432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19434: \$? = $ac_status" >&5 + echo "$as_me:19435: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19440,7 +19441,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 19443 "configure" +#line 19444 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19453,16 +19454,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19456: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19457: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19459: \$? = $ac_status" >&5 + echo "$as_me:19460: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19462: \"$ac_try\"") >&5 + { (eval echo "$as_me:19463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19465: \$? = $ac_status" >&5 + echo "$as_me:19466: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -19473,7 +19474,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:19476: result: $cf_define_xpg5" >&5 + echo "$as_me:19477: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -19482,14 +19483,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:19485: checking for wide-character functions" >&5 + echo "$as_me:19486: 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 19492 "configure" +#line 19493 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19506,16 +19507,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19510: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19512: \$? = $ac_status" >&5 + echo "$as_me:19513: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19515: \"$ac_try\"") >&5 + { (eval echo "$as_me:19516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19518: \$? = $ac_status" >&5 + echo "$as_me:19519: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -19526,7 +19527,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19529: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:19530: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -19547,14 +19548,14 @@ EOF fi -echo "$as_me:19550: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:19551: 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 19557 "configure" +#line 19558 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19572,16 +19573,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19575: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19578: \$? = $ac_status" >&5 + echo "$as_me:19579: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19581: \"$ac_try\"") >&5 + { (eval echo "$as_me:19582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19584: \$? = $ac_status" >&5 + echo "$as_me:19585: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -19592,21 +19593,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19595: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:19596: 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:19602: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:19603: 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 19609 "configure" +#line 19610 "configure" #include "confdefs.h" #include @@ -19626,16 +19627,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19629: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19632: \$? = $ac_status" >&5 + echo "$as_me:19633: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19635: \"$ac_try\"") >&5 + { (eval echo "$as_me:19636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19638: \$? = $ac_status" >&5 + echo "$as_me:19639: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -19647,7 +19648,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19650: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:19651: 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 @@ -19656,7 +19657,7 @@ EOF # special check for test/ditto.c -echo "$as_me:19659: checking for openpty in -lutil" >&5 +echo "$as_me:19660: 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 @@ -19664,7 +19665,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19667 "configure" +#line 19668 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19683,16 +19684,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19689: \$? = $ac_status" >&5 + echo "$as_me:19690: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19692: \"$ac_try\"") >&5 + { (eval echo "$as_me:19693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19695: \$? = $ac_status" >&5 + echo "$as_me:19696: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -19703,7 +19704,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19706: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19707: 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 @@ -19711,7 +19712,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19714: checking for openpty header" >&5 +echo "$as_me:19715: 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 @@ -19738,7 +19739,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19741 "configure" +#line 19742 "configure" #include "confdefs.h" #include <$cf_header> @@ -19755,16 +19756,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19758: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19761: \$? = $ac_status" >&5 + echo "$as_me:19762: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19764: \"$ac_try\"") >&5 + { (eval echo "$as_me:19765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19767: \$? = $ac_status" >&5 + echo "$as_me:19768: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -19782,7 +19783,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:19785: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19786: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19816,7 +19817,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19819: checking for function curses_version" >&5 +echo "$as_me:19820: 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 @@ -19826,7 +19827,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 19829 "configure" +#line 19830 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19839,15 +19840,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:19842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19843: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19845: \$? = $ac_status" >&5 + echo "$as_me:19846: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:19847: \"$ac_try\"") >&5 + { (eval echo "$as_me:19848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19850: \$? = $ac_status" >&5 + echo "$as_me:19851: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -19862,14 +19863,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:19865: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:19866: 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:19872: checking for alternate character set array" >&5 +echo "$as_me:19873: 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 @@ -19879,7 +19880,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 19882 "configure" +#line 19883 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19895,16 +19896,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19898: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19899: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19901: \$? = $ac_status" >&5 + echo "$as_me:19902: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19904: \"$ac_try\"") >&5 + { (eval echo "$as_me:19905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19907: \$? = $ac_status" >&5 + echo "$as_me:19908: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -19915,7 +19916,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19918: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:19919: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19925,7 +19926,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19928: checking for wide alternate character set array" >&5 +echo "$as_me:19929: 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 @@ -19935,7 +19936,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 19938 "configure" +#line 19939 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19951,16 +19952,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19954: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19957: \$? = $ac_status" >&5 + echo "$as_me:19958: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19960: \"$ac_try\"") >&5 + { (eval echo "$as_me:19961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19963: \$? = $ac_status" >&5 + echo "$as_me:19964: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -19971,7 +19972,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19974: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:19975: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19979,7 +19980,7 @@ cat >>confdefs.h <&5 +echo "$as_me:19983: 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 @@ -19989,7 +19990,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 19992 "configure" +#line 19993 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20006,16 +20007,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20009: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20010: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20012: \$? = $ac_status" >&5 + echo "$as_me:20013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20015: \"$ac_try\"") >&5 + { (eval echo "$as_me:20016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20018: \$? = $ac_status" >&5 + echo "$as_me:20019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20025,7 +20026,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20028 "configure" +#line 20029 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20041,16 +20042,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20044: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20047: \$? = $ac_status" >&5 + echo "$as_me:20048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20050: \"$ac_try\"") >&5 + { (eval echo "$as_me:20051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20053: \$? = $ac_status" >&5 + echo "$as_me:20054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20061,7 +20062,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:20064: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20065: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -20071,10 +20072,10 @@ EOF fi -echo "$as_me:20074: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20075: 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 20077 "configure" +#line 20078 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20092,16 +20093,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20098: \$? = $ac_status" >&5 + echo "$as_me:20099: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20101: \"$ac_try\"") >&5 + { (eval echo "$as_me:20102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20104: \$? = $ac_status" >&5 + echo "$as_me:20105: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20110,7 +20111,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20113: result: $cf_result" >&5 +echo "$as_me:20114: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20131,14 +20132,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:20134: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20135: 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 20141 "configure" +#line 20142 "configure" #include "confdefs.h" #include @@ -20156,23 +20157,23 @@ mbstate_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20159: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20160: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20162: \$? = $ac_status" >&5 + echo "$as_me:20163: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20165: \"$ac_try\"") >&5 + { (eval echo "$as_me:20166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20168: \$? = $ac_status" >&5 + echo "$as_me:20169: \$? = $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 20175 "configure" +#line 20176 "configure" #include "confdefs.h" #include @@ -20191,16 +20192,16 @@ mbstate_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20194: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20195: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20197: \$? = $ac_status" >&5 + echo "$as_me:20198: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20200: \"$ac_try\"") >&5 + { (eval echo "$as_me:20201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20203: \$? = $ac_status" >&5 + echo "$as_me:20204: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -20212,7 +20213,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20215: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:20216: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -20235,14 +20236,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:20238: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:20239: 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 20245 "configure" +#line 20246 "configure" #include "confdefs.h" #include @@ -20260,23 +20261,23 @@ wchar_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20263: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20264: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20266: \$? = $ac_status" >&5 + echo "$as_me:20267: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20269: \"$ac_try\"") >&5 + { (eval echo "$as_me:20270: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20272: \$? = $ac_status" >&5 + echo "$as_me:20273: \$? = $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 20279 "configure" +#line 20280 "configure" #include "confdefs.h" #include @@ -20295,16 +20296,16 @@ wchar_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20299: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20301: \$? = $ac_status" >&5 + echo "$as_me:20302: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20304: \"$ac_try\"") >&5 + { (eval echo "$as_me:20305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20307: \$? = $ac_status" >&5 + echo "$as_me:20308: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -20316,7 +20317,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20319: result: $cf_cv_wchar_t" >&5 +echo "$as_me:20320: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -20339,14 +20340,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:20342: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:20343: 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 20349 "configure" +#line 20350 "configure" #include "confdefs.h" #include @@ -20364,23 +20365,23 @@ wint_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20367: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20370: \$? = $ac_status" >&5 + echo "$as_me:20371: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20373: \"$ac_try\"") >&5 + { (eval echo "$as_me:20374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20376: \$? = $ac_status" >&5 + echo "$as_me:20377: \$? = $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 20383 "configure" +#line 20384 "configure" #include "confdefs.h" #include @@ -20399,16 +20400,16 @@ wint_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20402: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20403: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20405: \$? = $ac_status" >&5 + echo "$as_me:20406: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20408: \"$ac_try\"") >&5 + { (eval echo "$as_me:20409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20411: \$? = $ac_status" >&5 + echo "$as_me:20412: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -20420,7 +20421,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20423: result: $cf_cv_wint_t" >&5 +echo "$as_me:20424: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -20444,10 +20445,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:20447: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20448: 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 20450 "configure" +#line 20451 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20465,16 +20466,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20471: \$? = $ac_status" >&5 + echo "$as_me:20472: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20474: \"$ac_try\"") >&5 + { (eval echo "$as_me:20475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20477: \$? = $ac_status" >&5 + echo "$as_me:20478: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20483,7 +20484,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20486: result: $cf_result" >&5 +echo "$as_me:20487: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20505,10 +20506,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:20508: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20509: 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 20511 "configure" +#line 20512 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20526,16 +20527,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20529: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20532: \$? = $ac_status" >&5 + echo "$as_me:20533: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20535: \"$ac_try\"") >&5 + { (eval echo "$as_me:20536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20538: \$? = $ac_status" >&5 + echo "$as_me:20539: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20544,7 +20545,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20547: result: $cf_result" >&5 +echo "$as_me:20548: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20566,10 +20567,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:20569: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20570: 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 20572 "configure" +#line 20573 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20587,16 +20588,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20590: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20591: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20593: \$? = $ac_status" >&5 + echo "$as_me:20594: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20596: \"$ac_try\"") >&5 + { (eval echo "$as_me:20597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20599: \$? = $ac_status" >&5 + echo "$as_me:20600: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20605,7 +20606,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20608: result: $cf_result" >&5 +echo "$as_me:20609: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20634,11 +20635,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:20637: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20638: 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 20641 "configure" +#line 20642 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20671,16 +20672,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20677: \$? = $ac_status" >&5 + echo "$as_me:20678: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20680: \"$ac_try\"") >&5 + { (eval echo "$as_me:20681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20683: \$? = $ac_status" >&5 + echo "$as_me:20684: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20690,7 +20691,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20693: result: $cf_result" >&5 +echo "$as_me:20694: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20702,14 +20703,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:20705: checking for data $cf_data in library" >&5 + echo "$as_me:20706: 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 20712 "configure" +#line 20713 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20748,16 +20749,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20754: \$? = $ac_status" >&5 + echo "$as_me:20755: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20757: \"$ac_try\"") >&5 + { (eval echo "$as_me:20758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20760: \$? = $ac_status" >&5 + echo "$as_me:20761: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20769,7 +20770,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20772 "configure" +#line 20773 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20801,15 +20802,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20807: \$? = $ac_status" >&5 + echo "$as_me:20808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20809: \"$ac_try\"") >&5 + { (eval echo "$as_me:20810: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20812: \$? = $ac_status" >&5 + echo "$as_me:20813: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20821,7 +20822,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:20824: result: $cf_result" >&5 + echo "$as_me:20825: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20838,7 +20839,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:20841: checking for X" >&5 + echo "$as_me:20842: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -20942,17 +20943,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 20945 "configure" +#line 20946 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20949: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20950: \"$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:20955: \$? = $ac_status" >&5 + echo "$as_me:20956: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20985,7 +20986,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20988 "configure" +#line 20989 "configure" #include "confdefs.h" #include int @@ -20997,16 +20998,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21000: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21003: \$? = $ac_status" >&5 + echo "$as_me:21004: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21006: \"$ac_try\"") >&5 + { (eval echo "$as_me:21007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21009: \$? = $ac_status" >&5 + echo "$as_me:21010: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -21044,7 +21045,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:21047: result: $have_x" >&5 + echo "$as_me:21048: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -21054,7 +21055,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:21057: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21058: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21081,11 +21082,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21084: checking whether -R must be followed by a space" >&5 + echo "$as_me:21085: 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 21088 "configure" +#line 21089 "configure" #include "confdefs.h" int @@ -21097,16 +21098,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21100: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21101: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21103: \$? = $ac_status" >&5 + echo "$as_me:21104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21106: \"$ac_try\"") >&5 + { (eval echo "$as_me:21107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21109: \$? = $ac_status" >&5 + echo "$as_me:21110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -21116,13 +21117,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:21119: result: no" >&5 + echo "$as_me:21120: 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 21125 "configure" +#line 21126 "configure" #include "confdefs.h" int @@ -21134,16 +21135,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21138: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21140: \$? = $ac_status" >&5 + echo "$as_me:21141: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21143: \"$ac_try\"") >&5 + { (eval echo "$as_me:21144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21146: \$? = $ac_status" >&5 + echo "$as_me:21147: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -21153,11 +21154,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:21156: result: yes" >&5 + echo "$as_me:21157: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21160: result: neither works" >&5 + echo "$as_me:21161: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21177,7 +21178,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 21180 "configure" +#line 21181 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21196,22 +21197,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21199: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21200: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21202: \$? = $ac_status" >&5 + echo "$as_me:21203: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21205: \"$ac_try\"") >&5 + { (eval echo "$as_me:21206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21208: \$? = $ac_status" >&5 + echo "$as_me:21209: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21214: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:21215: 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 @@ -21219,7 +21220,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21222 "configure" +#line 21223 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21238,16 +21239,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21242: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21244: \$? = $ac_status" >&5 + echo "$as_me:21245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21247: \"$ac_try\"") >&5 + { (eval echo "$as_me:21248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21250: \$? = $ac_status" >&5 + echo "$as_me:21251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21258,14 +21259,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21261: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21262: 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:21268: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21269: 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 @@ -21273,7 +21274,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21276 "configure" +#line 21277 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21292,16 +21293,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21298: \$? = $ac_status" >&5 + echo "$as_me:21299: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21301: \"$ac_try\"") >&5 + { (eval echo "$as_me:21302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21304: \$? = $ac_status" >&5 + echo "$as_me:21305: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21312,7 +21313,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21315: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21316: 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" @@ -21331,13 +21332,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:21334: checking for gethostbyname" >&5 + echo "$as_me:21335: 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 21340 "configure" +#line 21341 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21368,16 +21369,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21374: \$? = $ac_status" >&5 + echo "$as_me:21375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21377: \"$ac_try\"") >&5 + { (eval echo "$as_me:21378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21380: \$? = $ac_status" >&5 + echo "$as_me:21381: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -21387,11 +21388,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21390: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21391: 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:21394: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21395: 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 @@ -21399,7 +21400,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21402 "configure" +#line 21403 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21418,16 +21419,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21422: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21424: \$? = $ac_status" >&5 + echo "$as_me:21425: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21427: \"$ac_try\"") >&5 + { (eval echo "$as_me:21428: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21430: \$? = $ac_status" >&5 + echo "$as_me:21431: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21438,14 +21439,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21441: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:21442: 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:21448: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:21449: 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 @@ -21453,7 +21454,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21456 "configure" +#line 21457 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21472,16 +21473,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21475: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21476: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21478: \$? = $ac_status" >&5 + echo "$as_me:21479: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21481: \"$ac_try\"") >&5 + { (eval echo "$as_me:21482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21484: \$? = $ac_status" >&5 + echo "$as_me:21485: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21492,7 +21493,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21495: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:21496: 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" @@ -21508,13 +21509,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:21511: checking for connect" >&5 + echo "$as_me:21512: 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 21517 "configure" +#line 21518 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21545,16 +21546,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21548: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21549: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21551: \$? = $ac_status" >&5 + echo "$as_me:21552: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21554: \"$ac_try\"") >&5 + { (eval echo "$as_me:21555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21557: \$? = $ac_status" >&5 + echo "$as_me:21558: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -21564,11 +21565,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21567: result: $ac_cv_func_connect" >&5 +echo "$as_me:21568: 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:21571: checking for connect in -lsocket" >&5 + echo "$as_me:21572: 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 @@ -21576,7 +21577,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21579 "configure" +#line 21580 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21595,16 +21596,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21599: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21601: \$? = $ac_status" >&5 + echo "$as_me:21602: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21604: \"$ac_try\"") >&5 + { (eval echo "$as_me:21605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21607: \$? = $ac_status" >&5 + echo "$as_me:21608: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -21615,7 +21616,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21618: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:21619: 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" @@ -21624,13 +21625,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:21627: checking for remove" >&5 + echo "$as_me:21628: 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 21633 "configure" +#line 21634 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21661,16 +21662,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21664: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21667: \$? = $ac_status" >&5 + echo "$as_me:21668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21670: \"$ac_try\"") >&5 + { (eval echo "$as_me:21671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21673: \$? = $ac_status" >&5 + echo "$as_me:21674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -21680,11 +21681,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21683: result: $ac_cv_func_remove" >&5 +echo "$as_me:21684: 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:21687: checking for remove in -lposix" >&5 + echo "$as_me:21688: 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 @@ -21692,7 +21693,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21695 "configure" +#line 21696 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21711,16 +21712,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21714: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21717: \$? = $ac_status" >&5 + echo "$as_me:21718: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21720: \"$ac_try\"") >&5 + { (eval echo "$as_me:21721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21723: \$? = $ac_status" >&5 + echo "$as_me:21724: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -21731,7 +21732,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21734: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:21735: 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" @@ -21740,13 +21741,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:21743: checking for shmat" >&5 + echo "$as_me:21744: 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 21749 "configure" +#line 21750 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21777,16 +21778,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21780: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21781: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21783: \$? = $ac_status" >&5 + echo "$as_me:21784: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21786: \"$ac_try\"") >&5 + { (eval echo "$as_me:21787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21789: \$? = $ac_status" >&5 + echo "$as_me:21790: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -21796,11 +21797,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21799: result: $ac_cv_func_shmat" >&5 +echo "$as_me:21800: 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:21803: checking for shmat in -lipc" >&5 + echo "$as_me:21804: 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 @@ -21808,7 +21809,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21811 "configure" +#line 21812 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21827,16 +21828,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21831: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21833: \$? = $ac_status" >&5 + echo "$as_me:21834: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21836: \"$ac_try\"") >&5 + { (eval echo "$as_me:21837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21839: \$? = $ac_status" >&5 + echo "$as_me:21840: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -21847,7 +21848,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21850: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:21851: 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" @@ -21865,7 +21866,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:21868: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:21869: 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 @@ -21873,7 +21874,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21876 "configure" +#line 21877 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21892,16 +21893,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21895: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21898: \$? = $ac_status" >&5 + echo "$as_me:21899: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21901: \"$ac_try\"") >&5 + { (eval echo "$as_me:21902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21904: \$? = $ac_status" >&5 + echo "$as_me:21905: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -21912,7 +21913,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21915: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:21916: 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" @@ -21959,16 +21960,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:21962: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21963: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:21967: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21968: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:21971: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21972: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22007,16 +22008,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22010: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22011: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22015: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22016: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22019: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22020: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22055,23 +22056,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22058: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:22059: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22063: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:22064: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22067: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22068: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:22074: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22075: 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. @@ -22088,7 +22089,7 @@ else enable_warnings=no fi; -echo "$as_me:22091: result: $enable_warnings" >&5 +echo "$as_me:22092: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -22111,10 +22112,10 @@ cat > conftest.i <&5 + { echo "$as_me:22115: 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:22167: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22169: \$? = $ac_status" >&5 + echo "$as_me:22170: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22171: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:22172: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -22246,7 +22247,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 22249 "configure" +#line 22250 "configure" #include "confdefs.h" #include @@ -22261,26 +22262,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22264: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22265: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22267: \$? = $ac_status" >&5 + echo "$as_me:22268: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22270: \"$ac_try\"") >&5 + { (eval echo "$as_me:22271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22273: \$? = $ac_status" >&5 + echo "$as_me:22274: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:22276: checking for X11/Xt const-feature" >&5 +echo "$as_me:22277: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22283 "configure" +#line 22284 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -22297,16 +22298,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22300: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22301: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22303: \$? = $ac_status" >&5 + echo "$as_me:22304: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22306: \"$ac_try\"") >&5 + { (eval echo "$as_me:22307: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22309: \$? = $ac_status" >&5 + echo "$as_me:22310: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -22321,7 +22322,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22324: result: $cf_cv_const_x_string" >&5 +echo "$as_me:22325: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -22350,7 +22351,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:22370: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -22382,12 +22383,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:22385: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22386: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22388: \$? = $ac_status" >&5 + echo "$as_me:22389: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22390: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22391: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -22395,7 +22396,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:22398: checking for $CC warning options..." >&5 + { echo "$as_me:22399: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -22418,12 +22419,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:22421: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22422: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22424: \$? = $ac_status" >&5 + echo "$as_me:22425: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22426: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22427: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -22431,7 +22432,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}:22434: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22435: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22441,7 +22442,7 @@ echo "${as_me:-configure}:22434: 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}:22444: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22445: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22458,7 +22459,7 @@ fi fi -echo "$as_me:22461: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:22462: 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. @@ -22480,7 +22481,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:22483: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:22484: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -22594,23 +22595,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:22597: checking for dmalloc.h" >&5 + echo "$as_me:22598: 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 22603 "configure" +#line 22604 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22607: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22608: \"$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:22613: \$? = $ac_status" >&5 + echo "$as_me:22614: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22629,11 +22630,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22632: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:22633: 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:22636: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:22637: 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 @@ -22641,7 +22642,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22644 "configure" +#line 22645 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22660,16 +22661,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22663: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22666: \$? = $ac_status" >&5 + echo "$as_me:22667: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22669: \"$ac_try\"") >&5 + { (eval echo "$as_me:22670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22672: \$? = $ac_status" >&5 + echo "$as_me:22673: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -22680,7 +22681,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22683: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:22684: 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:22699: 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. @@ -22717,7 +22718,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:22720: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:22721: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -22831,23 +22832,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:22834: checking for dbmalloc.h" >&5 + echo "$as_me:22835: 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 22840 "configure" +#line 22841 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22844: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22845: \"$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:22850: \$? = $ac_status" >&5 + echo "$as_me:22851: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22866,11 +22867,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22869: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:22870: 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:22873: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:22874: 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 @@ -22878,7 +22879,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22881 "configure" +#line 22882 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22897,16 +22898,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22900: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22901: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22903: \$? = $ac_status" >&5 + echo "$as_me:22904: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22906: \"$ac_try\"") >&5 + { (eval echo "$as_me:22907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22909: \$? = $ac_status" >&5 + echo "$as_me:22910: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -22917,7 +22918,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22920: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:22921: 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:22936: 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. @@ -22954,7 +22955,7 @@ EOF else with_valgrind= fi; -echo "$as_me:22957: result: ${with_valgrind:-no}" >&5 +echo "$as_me:22958: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -23067,7 +23068,7 @@ fi ;; esac -echo "$as_me:23070: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23071: 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. @@ -23078,7 +23079,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:23081: result: $with_no_leaks" >&5 +echo "$as_me:23082: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -23096,7 +23097,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:23099: checking for an rpath option" >&5 + echo "$as_me:23100: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -23127,12 +23128,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:23130: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23131: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:23135: checking if we need a space after rpath option" >&5 + echo "$as_me:23136: 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" @@ -23153,7 +23154,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23156 "configure" +#line 23157 "configure" #include "confdefs.h" int @@ -23165,16 +23166,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23168: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23171: \$? = $ac_status" >&5 + echo "$as_me:23172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23174: \"$ac_try\"") >&5 + { (eval echo "$as_me:23175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23177: \$? = $ac_status" >&5 + echo "$as_me:23178: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -23184,14 +23185,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:23187: result: $cf_rpath_space" >&5 + echo "$as_me:23188: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:23194: checking if rpath-hack should be disabled" >&5 +echo "$as_me:23195: 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. @@ -23209,22 +23210,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:23212: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:23213: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:23217: checking for updated LDFLAGS" >&5 +echo "$as_me:23218: 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:23220: result: maybe" >&5 + echo "$as_me:23221: 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:23227: checking for $ac_word" >&5 +echo "$as_me:23228: 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 @@ -23239,7 +23240,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:23242: found $ac_dir/$ac_word" >&5 +echo "$as_me:23243: found $ac_dir/$ac_word" >&5 break done @@ -23247,10 +23248,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:23250: result: $cf_ldd_prog" >&5 + echo "$as_me:23251: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:23253: result: no" >&5 + echo "$as_me:23254: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23264,7 +23265,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 23267 "configure" +#line 23268 "configure" #include "confdefs.h" #include int @@ -23276,16 +23277,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23279: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23280: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23282: \$? = $ac_status" >&5 + echo "$as_me:23283: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23285: \"$ac_try\"") >&5 + { (eval echo "$as_me:23286: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23288: \$? = $ac_status" >&5 + echo "$as_me:23289: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -23313,7 +23314,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}:23316: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:23317: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -23325,11 +23326,11 @@ echo "${as_me:-configure}:23316: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23328: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23329: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23332: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23333: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -23366,7 +23367,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23369: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23370: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23379,11 +23380,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23382: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23383: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23386: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23387: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -23420,7 +23421,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23423: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23424: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23433,14 +23434,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23436: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23437: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23440: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23441: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:23443: result: no" >&5 + echo "$as_me:23444: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23530,7 +23531,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:23533: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23534: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -23709,7 +23710,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23712: error: ambiguous option: $1 + { { echo "$as_me:23713: 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;} @@ -23728,7 +23729,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23731: error: unrecognized option: $1 + -*) { { echo "$as_me:23732: 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;} @@ -23778,7 +23779,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:23781: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23782: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -23890,6 +23891,7 @@ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t s,@MAKE_PHONY@,$MAKE_PHONY,;t t s,@CTAGS@,$CTAGS,;t t @@ -24084,7 +24086,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24087: creating $ac_file" >&5 + { echo "$as_me:24089: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24102,7 +24104,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:24105: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24107: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24115,7 +24117,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24118: error: cannot find input file: $f" >&5 + { { echo "$as_me:24120: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24131,7 +24133,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:24134: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24136: 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;} @@ -24140,7 +24142,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:24143: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24145: 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;} @@ -24177,7 +24179,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:24180: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24182: 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;} @@ -24188,7 +24190,7 @@ $ac_seen" >&2;} ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:24191: WARNING: Some variables may not be substituted: + { echo "$as_me:24193: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24237,7 +24239,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:24240: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24242: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24248,7 +24250,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:24251: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24253: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24261,7 +24263,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24264: error: cannot find input file: $f" >&5 + { { echo "$as_me:24266: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24319,7 +24321,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:24322: $ac_file is unchanged" >&5 + { echo "$as_me:24324: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/test/configure.in b/test/configure.in index 0973eb37..6591f3ed 100644 --- a/test/configure.in +++ b/test/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.165 2022/07/16 18:44:46 tom Exp $ +dnl $Id: configure.in,v 1.166 2022/08/20 16:35:33 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) @@ -324,6 +324,7 @@ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ diff --git a/test/test.priv.h b/test/test.priv.h index 8fe9b640..a577da12 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -30,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.203 2022/07/27 08:26:39 tom Exp $ */ +/* $Id: test.priv.h,v 1.204 2022/08/20 16:34:24 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -1208,7 +1208,7 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) #endif -#if defined(TRACE) && HAVE__TRACEF +#if defined(TRACE) && HAVE__TRACEF && HAVE_CURSES_TRACE #define Trace(p) _tracef p #define USE_TRACE 1 #define START_TRACE() \ diff --git a/test/test_mouse.c b/test/test_mouse.c index 602df4cf..1348877f 100644 --- a/test/test_mouse.c +++ b/test/test_mouse.c @@ -22,7 +22,7 @@ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************/ /* - * $Id: test_mouse.c,v 1.22 2022/07/24 15:18:53 tom Exp $ + * $Id: test_mouse.c,v 1.23 2022/08/20 18:12:16 tom Exp $ * * Author: Leonid S Usov * @@ -97,11 +97,13 @@ static void logw(const char *fmt, ...) { int row = getcury(stdscr); - va_list args; + va_start(args, fmt); wmove(stdscr, row++, 0); vw_printw(stdscr, fmt, args); + va_end(args); + clrtoeol(); row %= (getmaxy(stdscr) - logoffset); -- 2.45.0