diff options
Diffstat (limited to 'test')
120 files changed, 5203 insertions, 4433 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 1d546285a98b..661aa579fe10 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $ +# $Id: Makefile.in,v 1.133 2025/10/18 16:08:41 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2024,2025 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -39,6 +39,8 @@ SHELL = @SHELL@ VPATH = @srcdir@ @SET_MAKE@ +@SET_DESTDIR@ +TOP_MFLAGS = DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" destdir = x = @EXEEXT@ @@ -61,10 +63,10 @@ datadir = @datadir@ real_bindir = $(libexecdir)/$(PACKAGE) -BINDIR = $(DESTDIR)$(bindir) -LIBEXECDIR = $(DESTDIR)$(libexecdir) -LIBDIR = $(DESTDIR)$(libdir) -DATADIR = $(DESTDIR)$(datadir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE) @@ -174,4 +176,10 @@ check:: done" -@rm -f headers.* +# These rules are used to allow "make -n" to work on a clean directory-tree +../include/curses.h \ +../include/ncurses_def.h \ +../include/term.h : + ( cd ../include && $(MAKE) $(TOP_MFLAGS) ) + # The rest is generated from the "programs" and "modules" files... diff --git a/test/aclocal.m4 b/test/aclocal.m4 index fdab359ae5f1..5cc56f72b0b6 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2023,2024 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 2003-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -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.221 2024/01/19 18:27:20 tom Exp $ +dnl $Id: aclocal.m4,v 1.245 2025/12/25 23:50:50 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -43,7 +43,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 7 updated: 2023/01/11 04:05:23 +dnl AM_LANGINFO_CODESET version: 8 updated: 2025/12/22 04:16:14 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -55,10 +55,10 @@ dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <langinfo.h>], - [char* cs = nl_langinfo(CODESET); (void)cs], + [char* cs = nl_langinfo(CODESET); (void)cs])], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) @@ -183,7 +183,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04 +dnl CF_ADD_INCDIR version: 18 updated: 2025/12/22 04:16:14 dnl ------------- dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it is dnl redundant. We don't normally need to add -I/usr/local/include for gcc, @@ -215,8 +215,8 @@ if test -n "$1" ; then then cf_save_CPPFLAGS=$CPPFLAGS CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir) - AC_TRY_COMPILE([#include <stdio.h>], - [printf("Hello")], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], + [printf("Hello")])], [], [cf_have_incdir=yes]) CPPFLAGS=$cf_save_CPPFLAGS @@ -312,17 +312,51 @@ done ifelse($2,,LIBS,[$2])="$cf_add_libs" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22 +dnl CF_ADD_LIB_AFTER version: 4 updated: 2025/06/14 06:46:23 dnl ---------------- dnl Add a given library after another, e.g., following the one it satisfies a dnl dependency for. dnl dnl $1 = the first library dnl $2 = its dependency +dnl $3 = variable to update (default $LIBS) AC_DEFUN([CF_ADD_LIB_AFTER],[ -CF_VERBOSE(...before $LIBS) -LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's% % %g'` -CF_VERBOSE(...after $LIBS) +cf_add_libs="[$]ifelse($3,,LIBS,[$3])" +CF_VERBOSE(...before $cf_add_libs) +for cf_add_1lib in $2; do + # filter duplicates + cf_found_2lib=no + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_found_2lib=yes + break + fi + done + # if not a duplicate, find the dependent library + if test "$cf_found_2lib" = no + then + cf_found_2lib=no + cf_add_2libs= + for cf_add_2lib in $cf_add_libs + do + test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs " + cf_add_2libs="$cf_add_2libs$cf_add_2lib" + if test "x$cf_add_2lib" = "x$1" + then + cf_found_2lib=yes + cf_add_2libs="$cf_add_2libs $cf_add_1lib" + fi + done + if test "$cf_found_2lib" = yes + then + cf_add_libs="$cf_add_2libs" + else + CF_VERBOSE(...missed $1) + fi + fi +done +CF_VERBOSE(...after $cf_add_libs) +ifelse($3,,LIBS,[$3])="$cf_add_libs" ])dnl dnl --------------------------------------------------------------------------- dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42 @@ -388,7 +422,7 @@ dnl Allow user to enable a normally-off option. AC_DEFUN([CF_ARG_ENABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14 +dnl CF_ARG_OPTION version: 6 updated: 2025/08/05 04:09:09 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus dnl values. @@ -397,7 +431,7 @@ dnl Parameters: dnl $1 = option name dnl $2 = help-string dnl $3 = action to perform if option is not default -dnl $4 = action if perform if option is default +dnl $4 = action to perform if option is default dnl $5 = default option value (either 'yes' or 'no') AC_DEFUN([CF_ARG_OPTION], [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) @@ -411,7 +445,7 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 +dnl CF_C11_NORETURN version: 5 updated: 2025/12/14 17:40:20 dnl --------------- AC_DEFUN([CF_C11_NORETURN], [ @@ -424,12 +458,12 @@ AC_MSG_RESULT($enable_stdnoreturn) if test $enable_stdnoreturn = yes; then AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn, - [AC_TRY_COMPILE([ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <stdnoreturn.h> static _Noreturn void giveup(void) { exit(0); } ], - [if (feof(stdin)) giveup()], + [if (feof(stdin)) giveup()])], cf_cv_c11_noreturn=yes, cf_cv_c11_noreturn=no) ]) @@ -548,7 +582,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CFLAGS version: 4 updated: 2021/01/02 19:22:58 +dnl CF_CHECK_CFLAGS version: 5 updated: 2025/12/15 04:04:20 dnl --------------- dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from dnl a build-configuration such as imake. These have the pitfall that they @@ -561,7 +595,7 @@ cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" CF_ADD_CFLAGS($1,yes) if test "x$cf_check_cflags" != "x$CFLAGS" ; then -AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],, +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],[printf("Hello world");])],, [CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS) if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then CF_VERBOSE(but keeping change to \$CPPFLAGS) @@ -570,7 +604,7 @@ AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CURSES_LIB version: 4 updated: 2021/09/05 17:25:40 +dnl CF_CHECK_CURSES_LIB version: 5 updated: 2025/12/24 13:18:10 dnl ------------------- dnl $1 = nominal library name, used also for header lookup dnl $2 = suffix to append to library name @@ -599,8 +633,8 @@ elif test "x${PKG_CONFIG:=none}" != xnone; then CF_APPEND_CFLAGS(`$PKG_CONFIG --cflags "$1$2"`) CF_ADD_LIBS(`$PKG_CONFIG --libs "$1$2"`) - AC_TRY_LINK([#include <$1.h>], - [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <$1.h>], + [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );])], [AC_TRY_RUN([#include <$1.h> int main(void) { (void) $3 ( ]ifelse([$4],,,[[$4]])[ ); return 0; }], @@ -629,7 +663,7 @@ if test "$cf_have_curses_lib" = no; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_CLANG_COMPILER version: 11 updated: 2025/12/14 17:46:02 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -648,12 +682,12 @@ ifelse([$2],,CLANG_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __clang__ #else #error __clang__ is not defined #endif -],[ifelse([$2],,CLANG_COMPILER,[$2])=yes +])],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) @@ -682,9 +716,9 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then AC_MSG_CHECKING(if option $cf_clang_opt works) cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <stdio.h>],[ - printf("hello!\\n");],[ + printf("hello!\\n");])],[ cf_clang_optok=yes],[ cf_clang_optok=no]) AC_MSG_RESULT($cf_clang_optok) @@ -697,7 +731,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 +dnl CF_CONST_X_STRING version: 10 updated: 2025/12/14 17:40:20 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -722,22 +756,22 @@ AC_REQUIRE([AC_PATH_XTRA]) CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) -AC_TRY_COMPILE( +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ -#include <stdlib.h> +$ac_includes_default #include <X11/Intrinsic.h> ], -[String foo = malloc(1); free((void*)foo)],[ +[String foo = malloc(1); free((void*)foo)])],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ - AC_TRY_COMPILE( + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ #undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include <stdlib.h> +$ac_includes_default #include <X11/Intrinsic.h> - ],[String foo = malloc(1); *foo = 0],[ + ],[String foo = malloc(1); *foo = 0])],[ cf_cv_const_x_string=no ],[ cf_cv_const_x_string=yes @@ -758,7 +792,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_ACS_MAP version: 8 updated: 2021/01/04 19:45:09 +dnl CF_CURSES_ACS_MAP version: 9 updated: 2025/12/24 13:18:10 dnl ----------------- dnl Check for likely values of acs_map[]: AC_DEFUN([CF_CURSES_ACS_MAP], @@ -768,11 +802,11 @@ AC_CACHE_CHECK(for alternate character set array, cf_cv_curses_acs_map,[ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> ],[ -${name}['k'] = ACS_PLUS -],[cf_cv_curses_acs_map=$name; break]) +${name}[['k']] = ACS_PLUS +])],[cf_cv_curses_acs_map=$name; break]) done ]) @@ -792,8 +826,8 @@ for cf_data in $1 do AC_MSG_CHECKING(for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}) -AC_TRY_COMPILE(CF__CURSES_HEAD, -CF__CURSES_DATA(foo,$cf_data) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__CURSES_HEAD, +CF__CURSES_DATA(foo,$cf_data))]dnl ,[cf_result=yes ],[cf_result=no]) AC_MSG_RESULT($cf_result) @@ -815,13 +849,13 @@ int main(void) }],[cf_result=yes ],[cf_result=no],[ # cross-compiling - AC_TRY_LINK(CF__CURSES_HEAD + AC_LINK_IFELSE([AC_LANG_PROGRAM(CF__CURSES_HEAD [extern char $cf_data;],[ do { ]CF__CURSES_DATA(foo,$cf_data)[ ${cf_cv_main_return:-return}(foo == 0); } while (0) -],[cf_result=yes],[cf_result=no]) +])],[cf_result=yes],[cf_result=no]) ]) AC_MSG_RESULT($cf_result) if test "$cf_result" = yes ; then @@ -839,13 +873,13 @@ dnl Check if curses.h defines the given type AC_DEFUN([CF_CURSES_CHECK_TYPE], [ AC_MSG_CHECKING(for type $1 in ${cf_cv_ncurses_header:-curses.h}) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #ifndef _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED #endif #include <${cf_cv_ncurses_header:-curses.h}>],[ $1 foo -],cf_result=yes,cf_result=no) +])],cf_result=yes,cf_result=no) AC_MSG_RESULT($cf_result) if test "$cf_result" = yes ; then CF_UPPER(cf_result,have_type_$1) @@ -901,15 +935,22 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42 +dnl CF_CURSES_FUNCS version: 22 updated: 2025/12/22 04:16:14 dnl --------------- dnl Curses-functions are a little complicated, since a lot of them are macros. +dnl +dnl $1 is a list of functions to test AC_DEFUN([CF_CURSES_FUNCS], [ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_REQUIRE([CF_XOPEN_CURSES]) AC_REQUIRE([CF_CURSES_TERM_H]) AC_REQUIRE([CF_CURSES_UNCTRL_H]) + +AC_FOREACH([AC_Func], [$1], + [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Func), + [Define if you have the `]AC_Func[' function.])])dnl + for cf_func in $1 do CF_UPPER(cf_tr_func,$cf_func) @@ -918,7 +959,7 @@ do AC_CACHE_VAL(cf_cv_func_$cf_func,[ eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then - AC_TRY_LINK(CF__CURSES_HEAD, + AC_LINK_IFELSE([AC_LANG_PROGRAM(CF__CURSES_HEAD, [ #ifndef ${cf_func} long foo = (long)(&${cf_func}); @@ -926,7 +967,7 @@ fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo); if (foo + 1234L > 5678L) ${cf_cv_main_return:-return}(foo != 0); #endif - ], + ])], [cf_result=yes], [cf_result=no]) fi @@ -941,7 +982,7 @@ if (foo + 1234L > 5678L) done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52 +dnl CF_CURSES_HEADER version: 7 updated: 2025/12/22 04:16:14 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -954,8 +995,8 @@ for cf_header in \ ncurses.h ifelse($1,,,[$1/ncurses.h]) \ curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do -AC_TRY_COMPILE([#include <${cf_header}>], - [initscr(); endwin()], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <${cf_header}>], + [initscr(); endwin()])], [cf_cv_ncurses_header=$cf_header; break],[]) done ]) @@ -968,7 +1009,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52 +dnl CF_CURSES_LIBS version: 46 updated: 2025/12/22 04:16:14 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -976,8 +1017,8 @@ AC_DEFUN([CF_CURSES_LIBS],[ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_MSG_CHECKING(if we have identified curses libraries) -AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); endwin()], +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin()])], cf_result=yes, cf_result=no) AC_MSG_RESULT($cf_result) @@ -1067,8 +1108,8 @@ if test ".$ac_cv_func_initscr" != .yes ; then LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()])], [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) @@ -1077,13 +1118,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then cf_result=no elif test "$cf_term_lib" != predefined ; then AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); endwin();], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin();])], [cf_result=no], [ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()])], [cf_result=yes], [cf_result=error]) ]) @@ -1098,7 +1139,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16 +dnl CF_CURSES_TERM_H version: 17 updated: 2025/12/22 04:16:14 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -1124,10 +1165,10 @@ esac for cf_header in $cf_header_list do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}>], - [WINDOW *x; (void)x], + [WINDOW *x; (void)x])], [cf_cv_term_header=$cf_header break], [cf_cv_term_header=no]) @@ -1139,14 +1180,14 @@ case "$cf_cv_term_header" in # us use GNU termcap. This handles the most common case. for cf_header in ncurses/term.h ncursesw/term.h do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #ifdef NCURSES_VERSION #include <${cf_header}> #else #error expected NCURSES_VERSION to be defined #endif], - [WINDOW *x; (void)x], + [WINDOW *x; (void)x])], [cf_cv_term_header=$cf_header break], [cf_cv_term_header=no]) @@ -1168,7 +1209,7 @@ case "$cf_cv_term_header" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_UNCTRL_H version: 8 updated: 2021/01/02 09:31:20 +dnl CF_CURSES_UNCTRL_H version: 9 updated: 2025/12/22 04:16:14 dnl ------------------ dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages dnl may put it in a subdirectory (along with ncurses' other headers, of @@ -1194,10 +1235,10 @@ esac for cf_header in $cf_header_list do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}>], - [WINDOW *x; (void)x], + [WINDOW *x; (void)x])], [cf_cv_unctrl_header=$cf_header break], [cf_cv_unctrl_header=no]) @@ -1223,7 +1264,7 @@ case "$cf_cv_unctrl_header" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_WACS_MAP version: 8 updated: 2021/01/04 19:45:09 +dnl CF_CURSES_WACS_MAP version: 9 updated: 2025/12/22 04:16:14 dnl ------------------ dnl Check for likely values of wacs_map[]. AC_DEFUN([CF_CURSES_WACS_MAP], @@ -1232,12 +1273,12 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[ cf_cv_curses_wacs_map=unknown for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #ifndef _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED #endif #include <${cf_cv_ncurses_header:-curses.h}>], - [void *foo = &(${name}['k']); (void)foo], + [void *foo = &(${name}[['k']]); (void)foo])], [cf_cv_curses_wacs_map=$name break]) done]) @@ -1245,7 +1286,7 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[ test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_WACS_SYMBOLS version: 4 updated: 2021/01/04 19:45:09 +dnl CF_CURSES_WACS_SYMBOLS version: 5 updated: 2025/12/22 04:16:14 dnl ---------------------- dnl Do a check to see if the WACS_xxx constants are defined compatibly with dnl X/Open Curses. In particular, NetBSD's implementation of the WACS_xxx @@ -1258,21 +1299,21 @@ AC_CACHE_CHECK(for wide alternate character constants, cf_cv_curses_wacs_symbols cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #ifndef _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED #endif #include <${cf_cv_ncurses_header:-curses.h}>], [cchar_t *foo = WACS_PLUS; - ${cf_cv_curses_wacs_map}['k'] = *WACS_PLUS; (void)foo], + ${cf_cv_curses_wacs_map}[['k']] = *WACS_PLUS; (void)foo])], [cf_cv_curses_wacs_symbols=yes]) else - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #ifndef _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED #endif #include <${cf_cv_ncurses_header:-curses.h}>], - [cchar_t *foo = WACS_PLUS; (void)foo], + [cchar_t *foo = WACS_PLUS; (void)foo])], [cf_cv_curses_wacs_symbols=yes]) fi ]) @@ -1369,7 +1410,7 @@ if test "$enable_rpath_hack" = yes ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_ENABLE_STRING_HACKS version: 6 updated: 2021/01/05 19:23:48 +dnl CF_ENABLE_STRING_HACKS version: 7 updated: 2025/11/11 20:09:36 dnl ---------------------- dnl On a few platforms, the compiler and/or loader nags with untruthful dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect, @@ -1380,10 +1421,10 @@ dnl functions versus the total of incorrect uses. Samples of a few thousand dnl instances are meaningless compared to the hundreds of millions of lines of dnl existing C code. dnl -dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some +dnl strlcat/strlcpy are standard as of POSIX.1-2024, and are available on some dnl platforms, in implementations of varying quality. Likewise, snprintf is dnl standard - but evolved through phases, and older implementations are likely -dnl to yield surprising results, as documented in manpages on various systems. +dnl to yield surprising results, as documented in man pages on various systems. AC_DEFUN([CF_ENABLE_STRING_HACKS], [ AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings) @@ -1439,9 +1480,9 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LIBRARY version: 11 updated: 2021/01/02 09:31:20 +dnl CF_FIND_LIBRARY version: 13 updated: 2025/12/22 04:16:14 dnl --------------- -dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We +dnl Look for a non-standard library, given parameters for AC_LINK_IFELSE. We dnl prefer a standard location, and use -L options only if we do not find the dnl library in the standard library location(s). dnl $1 = library name @@ -1451,7 +1492,7 @@ dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name dnl $6 = flag, nonnull if failure should not cause an error-exit dnl -dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had +dnl Sets the variable "$cf_libdir" as a side effect, so we can see if we had dnl to use a -L option. AC_DEFUN([CF_FIND_LIBRARY], [ @@ -1462,7 +1503,7 @@ AC_DEFUN([CF_FIND_LIBRARY], cf_save_LIBS="$LIBS" AC_MSG_CHECKING(for $5 in -l$1) LIBS="-l$1 $LIBS" - AC_TRY_LINK([$3],[$4], + AC_LINK_IFELSE([AC_LANG_PROGRAM([$3],[$4])], [AC_MSG_RESULT(yes) eval 'cf_cv_have_lib_'"$1"'=yes' ], @@ -1472,7 +1513,7 @@ AC_DEFUN([CF_FIND_LIBRARY], do AC_MSG_CHECKING(for -l$1 in $cf_libdir) LIBS="-L$cf_libdir -l$1 $cf_save_LIBS" - AC_TRY_LINK([$3],[$4], + AC_LINK_IFELSE([AC_LANG_PROGRAM([$3],[$4])], [AC_MSG_RESULT(yes) eval 'cf_cv_have_lib_'"$1"'=yes' break], @@ -1489,7 +1530,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42 +dnl CF_FIND_LINKAGE version: 23 updated: 2025/12/22 04:16:14 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -1512,7 +1553,7 @@ dnl $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3 AC_DEFUN([CF_FIND_LINKAGE],[ # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. +# will be set on completion of the AC_LINK_IFELSE below. cf_cv_header_path_$3= cf_cv_library_path_$3= @@ -1520,7 +1561,7 @@ CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) cf_save_LIBS="$LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -1528,7 +1569,7 @@ AC_TRY_LINK([$1],[$2],[ LIBS="-l$3 $7 $cf_save_LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -1550,7 +1591,7 @@ AC_TRY_LINK([$1],[$2],[ CF_VERBOSE(... testing $cf_cv_header_path_$3) CPPFLAGS="$cf_save_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3) - AC_TRY_COMPILE([$1],[$2],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) cf_cv_find_linkage_$3=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -1570,7 +1611,7 @@ AC_TRY_LINK([$1],[$2],[ ifelse([$6],,,[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in system) cf_cv_find_linkage_$3=yes]) CPPFLAGS="$cf_save_CPPFLAGS" @@ -1586,7 +1627,7 @@ AC_TRY_LINK([$1],[$2],[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) cf_cv_find_linkage_$3=yes cf_cv_library_file_$3="-l$3" @@ -1685,19 +1726,36 @@ rm -f core]) test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 4 updated: 2025/12/23 18:53:34 dnl --------------- dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more dnl widely supported, but "deprecated" (2008), so we will use the latter if it dnl is available, to reduce compiler warnings. AC_DEFUN([CF_FUNC_GETTIME],[ -AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ - AC_TRY_LINK([#include <time.h>], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +#include <time.h> + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts])], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -1712,7 +1770,7 @@ AC_CHECK_LIB(bsd, gettimeofday, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34 +dnl CF_FUNC_OPENPTY version: 8 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for openpty() function, along with <pty.h> header. It may need the dnl "util" library as well. @@ -1724,13 +1782,13 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ test "$cf_cv_lib_util" = yes && { CF_ADD_LIB(util) } for cf_header in pty.h libutil.h util.h do - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <$cf_header> ],[ int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); (void)x; -],[ +])],[ cf_cv_func_openpty=$cf_header break ],[ @@ -1741,7 +1799,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25 +dnl CF_GCC_ATTRIBUTES version: 28 updated: 2025/12/25 18:43:31 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary @@ -1768,7 +1826,8 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - AC_CHECKING([for $CC __attribute__ directives]) + AC_MSG_CHECKING([for $CC __attribute__ directives]) + test -n "$verbose" && AC_MSG_RESULT() cat > "conftest.$ac_ext" <<EOF #line __oline__ "${as_me:-configure}" #include <stdio.h> @@ -1796,7 +1855,7 @@ EOF do CF_UPPER(cf_ATTRIBUTE,$cf_attribute) cf_directive="__attribute__(($cf_attribute))" - echo "checking for $CC $cf_directive" 1>&AC_FD_CC + echo "checking for $CC $cf_directive" 1>&AS_MESSAGE_LOG_FD case "$cf_attribute" in (printf) @@ -1871,7 +1930,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 45 updated: 2025/12/24 09:07:25 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1912,7 +1971,8 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ @@ -1935,7 +1995,8 @@ then CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" @@ -1985,20 +2046,21 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 +dnl CF_GETOPT_HEADER version: 10 updated: 2025/12/14 17:40:20 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h AC_DEFUN([CF_GETOPT_HEADER], -[ -AC_HAVE_HEADERS(unistd.h getopt.h) +[AC_REQUIRE([AC_HEADER_STDC]) + +AC_CHECK_HEADERS(getopt.h) AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <$cf_header>], -[int x = optind; char *y = optarg; (void)x; (void)y], +[int x = optind; char *y = optarg; (void)x; (void)y])], [cf_cv_getopt_header=$cf_header break]) done @@ -2011,7 +2073,27 @@ if test "$cf_cv_getopt_header" = getopt.h ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_GNU_SOURCE version: 11 updated: 2025/12/14 17:40:20 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -2027,14 +2109,14 @@ AC_DEFUN([CF_GNU_SOURCE], cf_gnu_xopen_source=ifelse($1,,500,$1) AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[ -AC_TRY_COMPILE([#include <sys/types.h>],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 return 0; #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 return 0; #else # error not GNU C library - #endif], + #endif])], [cf_cv_gnu_library=yes], [cf_cv_gnu_library=no]) ]) @@ -2047,14 +2129,14 @@ if test x$cf_cv_gnu_library = xyes; then AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[ cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE) - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) return 0; #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) return 0; #else # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old - #endif], + #endif])], [cf_cv_gnu_library_219=yes], [cf_cv_gnu_library_219=no]) CPPFLAGS="$cf_save" @@ -2064,7 +2146,7 @@ if test x$cf_cv_gnu_library = xyes; then cf_save="$CPPFLAGS" AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[ CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <limits.h> #include <sys/types.h> ],[ @@ -2072,7 +2154,7 @@ if test x$cf_cv_gnu_library = xyes; then return 0; #else # error GNU C library is too old - #endif], + #endif])], [cf_cv_gnu_dftsrc_219=yes], [cf_cv_gnu_dftsrc_219=no]) ]) @@ -2084,17 +2166,17 @@ if test x$cf_cv_gnu_library = xyes; then if test "x$cf_cv_gnu_dftsrc_219" != xyes; then AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifndef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be defined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_save="$CPPFLAGS" CF_ADD_CFLAGS(-D_GNU_SOURCE) - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifdef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be undefined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_cv_gnu_source=yes]) CPPFLAGS="$cf_save" @@ -2105,10 +2187,10 @@ if test x$cf_cv_gnu_library = xyes; then then AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[ CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE) - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifdef _DEFAULT_SOURCE #error expected _DEFAULT_SOURCE to be undefined - #endif], + #endif])], [cf_cv_default_source=no], [cf_cv_default_source=yes]) ]) @@ -2345,7 +2427,45 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_INSTALL_PREFIX version: 2 updated: 2025/10/18 11:14:21 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +SET_DESTDIR= +test -n "$DESTDIR" && SET_DESTDIR="DESTDIR=$DESTDIR" +AC_SUBST(SET_DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 10 updated: 2025/12/14 17:40:20 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -2368,12 +2488,12 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __INTEL_COMPILER #else #error __INTEL_COMPILER is not defined #endif -],[ifelse([$2],,INTEL_COMPILER,[$2])=yes +])],[ifelse([$2],,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" @@ -2383,7 +2503,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04 +dnl CF_LD_RPATH_OPT version: 10 updated: 2025/12/15 04:04:20 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -2431,7 +2551,7 @@ then AC_MSG_CHECKING(if we need a space after rpath option) cf_save_LIBS="$LIBS" CF_ADD_LIBS(${LD_RPATH_OPT}$libdir) - AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], cf_rpath_space=no, cf_rpath_space=yes) LIBS="$cf_save_LIBS" AC_MSG_RESULT($cf_rpath_space) test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " @@ -2469,7 +2589,7 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl CF_MAKE_PHONY version: 4 updated: 2025/12/24 12:27:29 dnl ------------- dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which dnl acts as a placeholder. @@ -2540,7 +2660,7 @@ CF_EOF fi break done - ) >&AC_FD_CC 2>&1 + ) >&AS_MESSAGE_LOG_FD 2>&1 cf_cv_make_PHONY="`cat conftest.tmp`" rm -rf conftest* ]) @@ -2589,7 +2709,7 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MATH_LIB version: 11 updated: 2022/07/27 19:01:48 +dnl CF_MATH_LIB version: 12 updated: 2025/12/22 04:16:14 dnl ----------- dnl Checks for libraries. At least one UNIX system, Apple Macintosh dnl Rhapsody 5.5, does not have -lm. We cannot use the simpler @@ -2598,12 +2718,12 @@ AC_DEFUN([CF_MATH_LIB], [ AC_CACHE_CHECK(if -lm needed for math functions, cf_cv_need_libm,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <stdio.h> #include <stdlib.h> #include <math.h> ], - [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], + [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)])], [cf_cv_need_libm=no], [cf_cv_need_libm=yes])]) @@ -2614,12 +2734,12 @@ then LIBS="$LIBS -lm" AC_CACHE_CHECK(if -lm is available for math functions, cf_cv_have_libm,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <stdio.h> #include <stdlib.h> #include <math.h> ], - [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], + [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)])], [cf_cv_have_libm=yes], [cf_cv_have_libm=no])]) LIBS="$cf_save_LIBS" @@ -2668,30 +2788,30 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32 +dnl CF_MSG_LOG version: 6 updated: 2025/12/14 17:51:46 dnl ---------- dnl Write a debug message to config.log, along with the line number in the dnl configure script. AC_DEFUN([CF_MSG_LOG],[ -echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC +echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AS_MESSAGE_LOG_FD ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58 +dnl CF_NCURSES_CC_CHECK version: 7 updated: 2025/12/22 04:16:14 dnl ------------------- dnl Check if we can compile with ncurses' header file dnl $1 is the cache variable to set dnl $2 is the header-file to include dnl $3 is the root name (ncurses or ncursesw) AC_DEFUN([CF_NCURSES_CC_CHECK],[ - AC_TRY_COMPILE([ -]ifelse($3,ncursesw,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +]ifelse([$3],ncursesw,[ #define _XOPEN_SOURCE_EXTENDED #undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ #define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ ])[ #include <$2>],[ #ifdef NCURSES_VERSION -]ifelse($3,ncursesw,[ +]ifelse([$3],ncursesw,[ #ifndef WACS_BSSB #error WACS_BSSB is not defined #endif @@ -2704,12 +2824,12 @@ printf("old\\n"); #error __NCURSES_H is not defined #endif #endif - ] + ])]dnl ,[$1=$2] ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 +dnl CF_NCURSES_CONFIG version: 30 updated: 2025/12/22 04:16:14 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -2747,8 +2867,8 @@ if test "x${PKG_CONFIG:=none}" != xnone; then CF_ADD_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tigetstr((char *)0);], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tigetstr((char *)0);])], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); }], @@ -2770,11 +2890,12 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac + CF_REQUIRE_PKG($cf_ncuconfig_root) CF_APPEND_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tigetstr((char *)0);], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tigetstr((char *)0);])], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); }], @@ -2898,12 +3019,12 @@ dnl if it is valid. AC_DEFUN([CF_NCURSES_EXT_FUNCS], [ AC_CACHE_CHECK(for ncurses extended functions,cf_cv_ncurses_ext_funcs,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}>], [ int x = NCURSES_EXT_FUNCS -],[cf_cv_ncurses_ext_funcs=defined],[ -AC_TRY_LINK([ +])],[cf_cv_ncurses_ext_funcs=defined],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}>], [ (void) assume_default_colors (0, 0); @@ -2917,7 +3038,7 @@ AC_TRY_LINK([ (void) resizeterm (0, 0); (void) use_default_colors (); (void) use_extended_names (0); - (void) wresize (0, 0, 0);], + (void) wresize (0, 0, 0);])], [cf_cv_ncurses_ext_funcs=yes], [cf_cv_ncurses_ext_funcs=no]) ]) @@ -2925,7 +3046,7 @@ AC_TRY_LINK([ test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extensions]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_HEADER version: 7 updated: 2021/01/04 19:33:05 +dnl CF_NCURSES_HEADER version: 8 updated: 2025/12/22 04:16:14 dnl ----------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -2952,10 +3073,10 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[ CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1) if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&AC_FD_MSG + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&AS_MESSAGE_FD break fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&AS_MESSAGE_FD done CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break @@ -2991,7 +3112,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 21 updated: 2021/09/04 06:37:12 +dnl CF_NCURSES_LIBS version: 22 updated: 2025/12/22 04:16:14 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -3048,8 +3169,8 @@ if test -n "$cf_ncurses_LIBS" ; then LIBS="$q" fi done - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tigetstr((char *)0);], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tigetstr((char *)0);])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) LIBS="$cf_ncurses_SAVE"]) @@ -3059,13 +3180,12 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_PTHREADS version: 2 updated: 2016/04/22 05:07:41 +dnl CF_NCURSES_PTHREADS version: 3 updated: 2024/07/06 13:57:42 dnl ------------------- -dnl Use this followup check to ensure that we link with pthreads if ncurses -dnl uses it. +dnl Use this followup check, e.g., in CF_WITH_NCURSES_ETC, to ensure that we +dnl link with pthreads if ncurses uses it. AC_DEFUN([CF_NCURSES_PTHREADS],[ -: ${cf_nculib_root:=ifelse($1,,ncurses,$1)} -AC_CHECK_LIB($cf_nculib_root,_nc_init_pthreads, +AC_CHECK_FUNC(_nc_init_pthreads, cf_cv_ncurses_pthreads=yes, cf_cv_ncurses_pthreads=no) if test "$cf_cv_ncurses_pthreads" = yes @@ -3074,7 +3194,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 +dnl CF_NCURSES_VERSION version: 19 updated: 2025/12/22 04:16:14 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3125,7 +3245,7 @@ Autoconf "old" ; #endif EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out" + cf_try="$ac_cpp conftest.$ac_ext 2>&AS_MESSAGE_LOG_FD | grep '^Autoconf ' >conftest.out" AC_TRY_EVAL(cf_try) if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%' conftest.out` @@ -3160,14 +3280,14 @@ dnl Check for NetBSD's form.h, which is incompatible with SVr4 and ncurses. dnl Some workarounds are needed in client programs to allow them to compile. AC_DEFUN([CF_NETBSD_FORM_H],[ AC_CACHE_CHECK(for NetBSD form.h,cf_cv_netbsd_form_h,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #include <form.h> ],[ FORM *form; int y = current_field(form)->cursor_ypos; int x = current_field(form)->cursor_xpos; -],[cf_cv_netbsd_form_h=yes +])],[cf_cv_netbsd_form_h=yes ],[cf_cv_netbsd_form_h=no]) ]) @@ -3180,13 +3300,13 @@ dnl Check for NetBSD's menu.h, which is incompatible with SVr4 and ncurses. dnl Some workarounds are needed in client programs to allow them to compile. AC_DEFUN([CF_NETBSD_MENU_H],[ AC_CACHE_CHECK(for NetBSD menu.h,cf_cv_netbsd_menu_h,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #include <menu.h> ],[ MENU *menu; int y = menu->max_item_width; -],[cf_cv_netbsd_menu_h=yes +])],[cf_cv_netbsd_menu_h=yes ],[cf_cv_netbsd_menu_h=no]) ]) @@ -3232,44 +3352,44 @@ case ".$with_cflags" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 20 updated: 2025/12/16 04:09:03 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not "[$]$1"])],$2) ;; esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PDCURSES_X11 version: 15 updated: 2021/01/02 09:31:20 +dnl CF_PDCURSES_X11 version: 16 updated: 2025/12/22 04:16:14 dnl --------------- dnl Configure for PDCurses' X11 library AC_DEFUN([CF_PDCURSES_X11],[ @@ -3295,10 +3415,10 @@ AC_CHECK_LIB(X11,XOpenDisplay, [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS]) AC_CACHE_CHECK(for XCurses library,cf_cv_lib_XCurses,[ CF_ADD_LIBS(-lXCurses) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <xcurses.h> char *XCursesProgramName = "test"; -],[XCursesExit();], +],[XCursesExit();])], [cf_cv_lib_XCurses=yes], [cf_cv_lib_XCurses=no]) ]) @@ -3352,7 +3472,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25 +dnl CF_POSIX_C_SOURCE version: 13 updated: 2025/12/14 17:40:20 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3381,10 +3501,10 @@ CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE) AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CF_MSG_LOG(if the symbol is already defined go no further) - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif], +#endif])], [cf_cv_posix_c_source=no], [cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in @@ -3400,10 +3520,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ ;; esac if test "$cf_want_posix_source" = yes ; then - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifdef _POSIX_SOURCE #error _POSIX_SOURCE is defined -#endif],[], +#endif])],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) @@ -3411,10 +3531,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CPPFLAGS="$cf_trim_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source) CF_MSG_LOG(if the second compile does not leave our definition intact error) - AC_TRY_COMPILE([#include <sys/types.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif],, +#endif])],, [cf_cv_posix_c_source=no]) CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" @@ -3431,7 +3551,7 @@ fi # cf_cv_posix_visible ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_VISIBLE version: 1 updated: 2018/12/31 20:46:17 +dnl CF_POSIX_VISIBLE version: 2 updated: 2025/12/14 17:40:20 dnl ---------------- dnl POSIX documents test-macros which an application may set before any system dnl headers are included to make features available. @@ -3447,14 +3567,14 @@ dnl conflicting definition. AC_DEFUN([CF_POSIX_VISIBLE], [ AC_CACHE_CHECK(if the POSIX test-macros are already defined,cf_cv_posix_visible,[ -AC_TRY_COMPILE([#include <stdio.h>],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],[ #if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) #error conflicting symbols found #endif -],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) +])],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) ]) ])dnl dnl --------------------------------------------------------------------------- @@ -3499,15 +3619,25 @@ CF_ACVERSION_CHECK(2.52, CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 13 updated: 2025/10/21 16:28:49 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +if test "x$INSTALL" = "x./install-sh -c"; then + if test -f /usr/sbin/install ; then + case "$host_os" in + (linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + INSTALL=/usr/sbin/install + ;; + esac + fi +fi +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -3517,14 +3647,17 @@ case $INSTALL in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 +dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ AC_CHECK_PROGS(LINT, lint cppcheck splint) case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac AC_SUBST(LINT_OPTS) @@ -3566,6 +3699,30 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -3577,7 +3734,7 @@ CFLAGS="$cf_save_CFLAGS_$1" CPPFLAGS="$cf_save_CPPFLAGS_$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_RPATH_HACK version: 13 updated: 2021/01/03 18:30:50 +dnl CF_RPATH_HACK version: 14 updated: 2025/12/15 04:04:20 dnl ------------- AC_DEFUN([CF_RPATH_HACK], [AC_REQUIRE([AC_PROG_FGREP])dnl @@ -3593,8 +3750,8 @@ if test -n "$LD_RPATH_OPT" ; then then cf_rpath_oops= -AC_TRY_LINK([#include <stdio.h>], - [printf("Hello");], +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], + [printf("Hello");])], [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`]) @@ -3720,7 +3877,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIGWINCH version: 7 updated: 2023/02/18 17:41:25 +dnl CF_SIGWINCH version: 8 updated: 2025/12/23 18:53:34 dnl ----------- dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all dnl programs need this test). @@ -3732,18 +3889,18 @@ dnl break that part of the interface as well. AC_DEFUN([CF_SIGWINCH], [ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <sys/signal.h> -],[int x = SIGWINCH; (void)x], +],[int x = SIGWINCH; (void)x])], [cf_cv_define_sigwinch=yes], - [AC_TRY_COMPILE([ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #undef _XOPEN_SOURCE #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include <sys/types.h> #include <sys/signal.h> -],[int x = SIGWINCH; (void)x], +],[int x = SIGWINCH; (void)x])], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) ]) @@ -3755,7 +3912,7 @@ cf_cv_fixup_sigwinch=unknown cf_sigwinch=32 while test "$cf_sigwinch" != 1 do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #undef _XOPEN_SOURCE #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE @@ -3765,7 +3922,7 @@ do #if SIGWINCH != $cf_sigwinch #error SIGWINCH is not $cf_sigwinch #endif -int x = SIGWINCH; (void)x], +int x = SIGWINCH; (void)x])], [cf_cv_fixup_sigwinch=$cf_sigwinch break]) @@ -3779,7 +3936,7 @@ done fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIG_ATOMIC_T version: 5 updated: 2020/03/10 18:53:47 +dnl CF_SIG_ATOMIC_T version: 6 updated: 2025/12/24 12:27:29 dnl --------------- dnl signal handler, but there are some gcc dependencies in that recommendation. dnl Try anyway. @@ -3792,7 +3949,7 @@ AC_CACHE_VAL(cf_cv_sig_atomic_t,[ "sig_atomic_t" \ "int" do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <signal.h> #include <stdio.h> @@ -3805,7 +3962,7 @@ static void handler(int sig) x = 5; }], [signal(SIGINT, handler); - x = 1], + x = 1])], [cf_cv_sig_atomic_t=$cf_type], [cf_cv_sig_atomic_t=no]) test "$cf_cv_sig_atomic_t" != no && break @@ -3839,7 +3996,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SYS_TIME_SELECT version: 6 updated: 2015/04/18 08:56:57 +dnl CF_SYS_TIME_SELECT version: 7 updated: 2025/12/24 12:27:29 dnl ------------------ dnl Check if we can include <sys/time.h> with <sys/select.h>; this breaks on dnl older SCO configurations. @@ -3847,7 +4004,7 @@ AC_DEFUN([CF_SYS_TIME_SELECT], [ AC_MSG_CHECKING(if sys/time.h works with sys/select.h) AC_CACHE_VAL(cf_cv_sys_time_select,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> @@ -3855,14 +4012,14 @@ AC_TRY_COMPILE([ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif -],[],[cf_cv_sys_time_select=yes], +],[])],[cf_cv_sys_time_select=yes], [cf_cv_sys_time_select=no]) ]) AC_MSG_RESULT($cf_cv_sys_time_select) test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 6 updated: 2021/01/02 09:31:20 +dnl CF_TERM_HEADER version: 7 updated: 2025/12/22 04:16:14 dnl -------------- dnl Look for term.h, which is part of X/Open curses. It defines the interface dnl to terminfo database. Usually it is in the same include-path as curses.h, @@ -3880,10 +4037,10 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -AC_TRY_COMPILE([#include <stdio.h> +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -],[int x = auto_left_margin; (void)x],[ +],[int x = auto_left_margin; (void)x])],[ cf_cv_term_header="$cf_test"],[ cf_cv_term_header=unknown ]) @@ -3938,7 +4095,7 @@ then else cf_return="return value" fi - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_cv_term_header> @@ -3946,7 +4103,7 @@ static $cf_ret outc($cf_arg value) { $cf_return; } ],[ tputs("hello", 0, outc); ${cf_cv_main_return:-return}(0); -],[ +])],[ CF_VERBOSE([prototype $cf_ret func($cf_arg value)]) cat >>confdefs.h <<EOF #define TPUTS_ARG $cf_arg @@ -3962,23 +4119,7 @@ EOF fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRIM_X_LIBS version: 3 updated: 2015/04/12 15:39:00 -dnl -------------- -dnl Trim extra base X libraries added as a workaround for inconsistent library -dnl dependencies returned by "new" pkg-config files. -AC_DEFUN([CF_TRIM_X_LIBS],[ - for cf_trim_lib in Xmu Xt X11 - do - case "$LIBS" in - (*-l$cf_trim_lib\ *-l$cf_trim_lib*) - LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` - CF_VERBOSE(..trimmed $LIBS) - ;; - esac - done -]) -dnl --------------------------------------------------------------------------- -dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15 +dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54 dnl ----------------- dnl This is a simple wrapper to use for pkg-config, for libraries which may be dnl available in that form. @@ -3995,6 +4136,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then cf_pkgconfig_libs="`$PKG_CONFIG --libs "$1" 2>/dev/null`" CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs) CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs) + CF_REQUIRE_PKG($1) CF_ADD_CFLAGS($cf_pkgconfig_incs) CF_ADD_LIBS($cf_pkgconfig_libs) ifelse([$2],,:,[$2]) @@ -4005,17 +4147,17 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 +dnl CF_TRY_XOPEN_SOURCE version: 5 updated: 2025/12/14 17:40:20 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)], [cf_cv_xopen_source=no], [cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE) - AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)], [cf_cv_xopen_source=no], [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) CPPFLAGS="$cf_save" @@ -4039,20 +4181,20 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 +dnl CF_UTF8_LIB version: 12 updated: 2025/12/22 04:16:14 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ -AC_HAVE_HEADERS(wchar.h) +AC_CHECK_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #ifdef HAVE_WCHAR_H #include <wchar.h> #endif -],[putwc(0,0);], +],[putwc(0,0);])], [cf_cv_utf8_lib=yes], [CF_FIND_LINKAGE([ #include <libutf8.h>],[putwc(0,0);],utf8, @@ -4070,15 +4212,15 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 +dnl CF_VERBOSE version: 4 updated: 2025/12/14 17:51:46 dnl ---------- dnl Use AC_VERBOSE w/o the warnings AC_DEFUN([CF_VERBOSE], -[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG +[test -n "$verbose" && echo " $1" 1>&AS_MESSAGE_FD CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34 +dnl CF_WCHAR_TYPE version: 6 updated: 2025/12/24 12:27:29 dnl ------------- dnl Check if type wide-character type $1 is declared, and if so, which header dnl file is needed. The second parameter is used to set a shell variable when @@ -4088,16 +4230,16 @@ AC_DEFUN([CF_WCHAR_TYPE], [ # This is needed on Tru64 5.0 to declare $1 AC_CACHE_CHECK(if we must include wchar.h to declare $1,cf_cv_$1,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> #ifdef HAVE_LIBUTF8_H #include <libutf8.h> #endif], - [$1 state; (void)state], + [$1 state; (void)state])], [cf_cv_$1=no], - [AC_TRY_COMPILE([ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -4105,7 +4247,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include <libutf8.h> #endif], - [$1 value; (void) value], + [$1 value; (void) value])], [cf_cv_$1=yes], [cf_cv_$1=unknown])])]) @@ -4211,7 +4353,7 @@ AC_MSG_RESULT([$]$1) AC_SUBST($1) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06 +dnl CF_WITH_NCURSES_ETC version: 7 updated: 2025/01/12 13:41:15 dnl ------------------- dnl Use this macro for programs which use any variant of "curses", e.g., dnl "ncurses", and "PDCurses". Programs that can use curses and some unrelated @@ -4262,7 +4404,7 @@ case $cf_cv_screen in (ncurses*) CF_NCURSES_CONFIG($cf_cv_screen) ;; -(pdcurses) +(pdcurses*) CF_PDCURSES_X11 ;; (*) @@ -4292,6 +4434,26 @@ then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_SYSTYPE version: 2 updated: 2025/12/14 18:08:20 +dnl --------------- +dnl For testing, override the derived host system-type which is used to decide +dnl things such as the linker commands used to build shared libraries. This is +dnl normally chosen automatically based on the type of system which you are +dnl building on. We use it for testing the configure script. +dnl +dnl This is different from the --host option: it is used only for testing parts +dnl of the configure script which would not be reachable with --host since that +dnl relies on the build environment being real, rather than mocked up. +AC_DEFUN([CF_WITH_SYSTYPE],[ +CF_CHECK_CACHE([AC_CANONICAL_TARGET]) +AC_ARG_WITH(system-type, + [ --with-system-type=XXX test: override derived host system-type], +[AC_MSG_WARN(overriding system type to $withval) + cf_cv_system_name=$withval + host_os=$withval +]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 dnl ---------------- AC_DEFUN([CF_WITH_VALGRIND],[ @@ -4386,7 +4548,7 @@ fi AC_SUBST(no_x11_rgb) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12 +dnl CF_XOPEN_CURSES version: 21 updated: 2025/12/22 04:16:14 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -4398,7 +4560,7 @@ AC_DEFUN([CF_XOPEN_CURSES], AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[ cf_cv_need_xopen_extension=unknown -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ #if defined(NCURSES_VERSION_PATCH) @@ -4409,7 +4571,7 @@ $ac_includes_default #ifdef NCURSES_WIDECHAR #error prefer to fall-through on the second checks #endif - static char dummy[10]; + static char dummy[[10]]; cchar_t check; int check2 = curs_set((int)sizeof(check)); long x = winnstr(stdscr, dummy, 5); @@ -4419,16 +4581,16 @@ $ac_includes_default (void)x; (void)y1; (void)x1; - ], + ])], [cf_cv_need_xopen_extension=none], [ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #define $cf_try_xopen_extension 1 $ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ - static char dummy[10]; + static char dummy[[10]]; cchar_t check; int check2 = curs_set((int)sizeof(check)); long x = winnstr(stdscr, dummy, 5); @@ -4438,7 +4600,7 @@ $ac_includes_default (void)x; (void)y1; (void)x1; - ], + ])], [cf_cv_need_xopen_extension=$cf_try_xopen_extension; break]) done ]) @@ -4452,7 +4614,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27 +dnl CF_XOPEN_SOURCE version: 71 updated: 2025/12/14 17:40:20 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -4512,9 +4674,12 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -4566,7 +4731,7 @@ case "$host_os" in # Some of these niche implementations use copy/paste, double-check... if test "$cf_cv_xopen_source" = no ; then CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) - AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)],,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) fi @@ -4582,19 +4747,19 @@ dnl which is still not guaranteed to provide all of the entrypoints that dnl _XOPEN_SOURCE would yield. if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) - AC_TRY_COMPILE([#include <stdlib.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>],[ #ifndef _XOPEN_SOURCE #error _XOPEN_SOURCE is not defined -#endif], +#endif])], [cf_XOPEN_SOURCE_set=yes], [cf_XOPEN_SOURCE_set=no]) AC_MSG_RESULT($cf_XOPEN_SOURCE_set) if test "$cf_XOPEN_SOURCE_set" = yes then - AC_TRY_COMPILE([#include <stdlib.h>],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>],[ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -#endif], +#endif])], [cf_XOPEN_SOURCE_set_ok=yes], [cf_XOPEN_SOURCE_set_ok=no]) if test "$cf_XOPEN_SOURCE_set_ok" = no @@ -4608,7 +4773,7 @@ fi fi # cf_cv_posix_visible ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 25 updated: 2023/01/11 04:05:23 +dnl CF_X_ATHENA version: 27 updated: 2025/12/22 04:16:14 dnl ----------- dnl Check for Xaw (Athena) libraries dnl @@ -4678,16 +4843,14 @@ if test "$PKG_CONFIG" != none ; then CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena) AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) - CF_TRIM_X_LIBS - AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <X11/Xmu/CharSet.h> ],[ int check = XmuCompareISOLatin1("big", "small"); (void)check; -],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])]) +])],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])]) if test "$cf_cv_xaw_compat" = no then @@ -4705,7 +4868,6 @@ int check = XmuCompareISOLatin1("big", "small"); ],[ CF_ADD_LIB_AFTER($cf_first_lib,-lXmu) ]) - CF_TRIM_X_LIBS ;; esac fi @@ -4722,7 +4884,7 @@ if test -z "$cf_x_athena_lib" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_CPPFLAGS version: 9 updated: 2020/12/31 10:54:15 +dnl CF_X_ATHENA_CPPFLAGS version: 10 updated: 2025/12/22 04:16:14 dnl -------------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -4747,9 +4909,9 @@ do else AC_MSG_CHECKING(for $cf_test) fi - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <X11/Intrinsic.h> -#include <$cf_test>],[], +#include <$cf_test>],[])], [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) @@ -4769,7 +4931,7 @@ elif test "$cf_x_athena_inc" != default ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 14 updated: 2023/01/11 04:05:23 +dnl CF_X_ATHENA_LIBS version: 15 updated: 2025/12/22 04:16:14 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -4801,12 +4963,12 @@ do test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_libs" CF_ADD_LIBS($cf_libs) AC_MSG_CHECKING(for $cf_test in $cf_libs) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <X11/Intrinsic.h> #include <X11/$cf_x_athena_root/SimpleMenu.h> ],[ -$cf_test((XtAppContext) 0)], +$cf_test((XtAppContext) 0)])], [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) @@ -4839,7 +5001,7 @@ CF_TRY_PKG_CONFIG(Xext,,[ [CF_ADD_LIB(Xext)])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 27 updated: 2023/01/11 04:05:23 +dnl CF_X_TOOLKIT version: 28 updated: 2025/12/15 04:04:20 dnl ------------ dnl Check for X Toolkit libraries AC_DEFUN([CF_X_TOOLKIT], @@ -4873,7 +5035,7 @@ CF_TRY_PKG_CONFIG(xt,[ (*) # we have an "xt" package, but it may omit Xt's dependency on X11 AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <X11/Xlib.h> ],[ @@ -4881,7 +5043,7 @@ $ac_includes_default int rc2 = XClearWindow((Display*) 0, (Window) 0); int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0); int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0); -],[cf_cv_xt_x11_compat=yes],[cf_cv_xt_x11_compat=no])]) +])],[cf_cv_xt_x11_compat=yes],[cf_cv_xt_x11_compat=no])]) if test "$cf_cv_xt_x11_compat" = no then CF_VERBOSE(work around broken X11 dependency) @@ -4892,11 +5054,11 @@ $ac_includes_default esac AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include <X11/Shell.h> ],[int num = IceConnectionNumber(0); (void) num -],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])]) +])],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])]) if test "$cf_cv_xt_ice_compat" = no then diff --git a/test/back_ground.c b/test/back_ground.c index c53c2a36bf8c..c63126a42df4 100644 --- a/test/back_ground.c +++ b/test/back_ground.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021,2022 Thomas E. Dickey * + * Copyright 2021-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $ + * $Id: back_ground.c,v 1.15 2025/07/05 15:18:31 tom Exp $ */ #include <test.priv.h> @@ -40,7 +40,7 @@ static int default_bg = COLOR_BLACK; static int default_fg = COLOR_WHITE; -static wchar_t wide_fill = L' '; +static wchar_t fill_char = L' '; static wchar_t decode_wchar(const char *value) @@ -78,7 +78,7 @@ test_background(void) } dump_window(stdscr); - blank[0] = wide_fill; + blank[0] = fill_char; blank[1] = L'\0'; printw("Initializing pair 1 to red/%s\n", color_name(default_bg)); @@ -182,11 +182,12 @@ usage(int ok) ," -a invoke assume_default_colors, repeat to use in init_pair" #endif ," -b XXX specify background color" + ," -B XXX specify background character" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors, repeat to use in init_pair" #endif ," -f XXX specify foreground color" - ," -l FILE log window-dumps to this file" + ," -L FILE log window-dumps to this file" ," -w fill background with stipple pattern" ," -W CODE fill background with this Unicode value" }; @@ -214,7 +215,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:wW:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:W:ab:df:w")) != -1) { switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': @@ -224,6 +225,17 @@ main(int argc, char *argv[]) case 'b': default_bg = color_code(optarg); break; + case 'B': + if (strlen(optarg) > 1) { + char *check = NULL; + long value = strtol(optarg, &check, 0); + if (*check != '\0') + usage(FALSE); + fill_char = (wchar_t) value; + } else { + fill_char = (wchar_t) *optarg; + } + break; #if HAVE_USE_DEFAULT_COLORS case 'd': ++d_option; @@ -232,21 +244,18 @@ main(int argc, char *argv[]) case 'f': default_fg = color_code(optarg); break; - case 'l': + case 'L': if (!open_dump(optarg)) usage(FALSE); break; case 'w': - wide_fill = L'\u2591'; + fill_char = L'\u2591'; break; case 'W': - wide_fill = decode_wchar(optarg); + fill_char = decode_wchar(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/background.c b/test/background.c index 5942debbb45b..68b824b4371d 100644 --- a/test/background.c +++ b/test/background.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2003-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $ + * $Id: background.c,v 1.30 2025/07/05 15:21:56 tom Exp $ */ #define NEED_COLOR_CODE 1 @@ -37,6 +37,7 @@ static int default_bg = COLOR_BLACK; static int default_fg = COLOR_WHITE; +static unsigned char fill_char = ' '; static void test_background(void) @@ -45,6 +46,7 @@ test_background(void) int row; int chr; + printw("Background character %#x\n", fill_char); if (pair_content(0, &f, &b) == ERR) { printw("pair 0 contains no data\n"); } else { @@ -54,13 +56,13 @@ test_background(void) printw("Initializing pair 1 to red/%s\n", color_name(default_bg)); init_pair(1, COLOR_RED, (NCURSES_COLOR_T) default_bg); - bkgdset((chtype) (' ' | COLOR_PAIR(1))); + bkgdset((chtype) (fill_char | COLOR_PAIR(1))); printw("RED/BLACK\n"); dump_window(stdscr); printw("Initializing pair 2 to %s/blue\n", color_name(default_fg)); init_pair(2, (NCURSES_COLOR_T) default_fg, COLOR_BLUE); - bkgdset((chtype) (' ' | COLOR_PAIR(2))); + bkgdset((chtype) (fill_char | COLOR_PAIR(2))); printw("This line should be %s/blue\n", color_name(default_fg)); dump_window(stdscr); @@ -98,33 +100,33 @@ test_background(void) printw("j\n"); dump_window(stdscr); - bkgdset((chtype) (' ' | COLOR_PAIR(0))); + bkgdset((chtype) (fill_char | COLOR_PAIR(0))); printw("Default Colors\n"); dump_window(stdscr); printw("Resetting colors to pair 1\n"); - bkgdset((chtype) (' ' | COLOR_PAIR(1))); + bkgdset((chtype) (fill_char | COLOR_PAIR(1))); printw("This line should be red/%s\n", color_name(default_bg)); dump_window(stdscr); printw("Setting screen to pair 0\n"); - bkgd((chtype) (' ' | COLOR_PAIR(0))); + bkgd((chtype) (fill_char | COLOR_PAIR(0))); dump_window(stdscr); printw("Setting screen to pair 1\n"); - bkgd((chtype) (' ' | COLOR_PAIR(1))); + bkgd((chtype) (fill_char | COLOR_PAIR(1))); dump_window(stdscr); printw("Setting screen to pair 2\n"); - bkgd((chtype) (' ' | COLOR_PAIR(2))); + bkgd((chtype) (fill_char | COLOR_PAIR(2))); dump_window(stdscr); printw("Setting screen to pair 3\n"); - bkgd((chtype) (' ' | COLOR_PAIR(3))); + bkgd((chtype) (fill_char | COLOR_PAIR(3))); dump_window(stdscr); printw("Setting screen to pair 0\n"); - bkgd((chtype) (' ' | COLOR_PAIR(0))); + bkgd((chtype) (fill_char | COLOR_PAIR(0))); dump_window(stdscr); } @@ -141,11 +143,12 @@ usage(int ok) ," -a invoke assume_default_colors, repeat to use in init_pair" #endif ," -b XXX specify background color" + ," -B XXX specify background character" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors, repeat to use in init_pair" #endif ," -f XXX specify foreground color" - ," -l FILE log window-dumps to this file" + ," -L FILE log window-dumps to this file" }; size_t n; @@ -171,7 +174,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:ab:df:")) != -1) { switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': @@ -181,6 +184,17 @@ main(int argc, char *argv[]) case 'b': default_bg = color_code(optarg); break; + case 'B': + if (strlen(optarg) > 1) { + char *check = NULL; + long value = strtol(optarg, &check, 0); + if (*check != '\0') + usage(FALSE); + fill_char = (unsigned char) value; + } else { + fill_char = (unsigned char) *optarg; + } + break; #if HAVE_USE_DEFAULT_COLORS case 'd': ++d_option; @@ -189,15 +203,12 @@ main(int argc, char *argv[]) case 'f': default_fg = color_code(optarg); break; - case 'l': + case 'L': if (!open_dump(optarg)) usage(FALSE); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/blue.c b/test/blue.c index 90f240b62634..f7e563698126 100644 --- a/test/blue.c +++ b/test/blue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ *****************************************************************************/ /* - * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $ + * $Id: blue.c,v 1.58 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -437,7 +437,7 @@ game_finished(int deal) static void use_pc_display(void) { - char *check = nl_langinfo(CODESET); + const char *check = nl_langinfo(CODESET); if (!strcmp(check, "UTF-8")) { #if USE_WIDEC_SUPPORT suits = uglyphs; @@ -448,13 +448,13 @@ use_pc_display(void) !strcmp(check, "CP437") || !strcmp(check, "IBM850") || !strcmp(check, "CP850")) { - char *smacs = tigetstr("smacs"); - char *smpch = tigetstr("smpch"); + const char *smacs = tigetstr("smacs"); + const char *smpch = tigetstr("smpch"); /* * The ncurses library makes this check to decide whether to allow * the alternate character set for the (normally) nonprinting codes. */ - if (smacs != 0 && smpch != 0 && !strcmp(smacs, smpch)) { + if (smacs != NULL && smpch != NULL && !strcmp(smacs, smpch)) { suits = glyphs; } } @@ -492,11 +492,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/bs.6 b/test/bs.6 index 12295a319580..03021f65e6e7 100644 --- a/test/bs.6 +++ b/test/bs.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020,2021 Thomas E. Dickey * +.\" Copyright 2020-2021,2024 Thomas E. Dickey * .\" Copyright 1998,2006 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,46 +27,69 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: bs.6,v 1.5 2021/06/17 21:20:30 tom Exp $ -.TH BATTLESHIPS 6 2021-06-17 ncurses-examples Games +.\" $Id: bs.6,v 1.8 2024/06/15 20:32:28 tom Exp $ +.TH BATTLESHIPS 6 2024-06-15 ncurses-examples Games +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} .SH NAME -bs \- battleships game +bs \- +battleships game .SH SYNOPSIS -battle [ -b | -s ] [ -c ] +battle [ \-b | \-s ] [ \-c ] .SH DESCRIPTION This program allows you to play the familiar Battleships game against the -computer on a 10x10 board. The interface is visual and largely -self-explanatory; you place your ships and pick your shots by moving the -cursor around the `sea' with the rogue/hack motion keys hjklyubn. +computer on a 10x10 board. +The interface is visual and largely self-explanatory; +you place your ships and pick your shots by moving the +cursor around the \*(``sea\*('' with the rogue/hack motion keys hjklyubn. .PP -Note that when selecting a ship to place, you must type the capital letter -(these are, after all, capital ships). During ship placement, the `r' command +Note that when selecting a ship to place, +you must type the capital letter +(these are, after all, capital ships). +During ship placement, +the \*(``r\*('' command may be used to ignore the current position and randomly place your currently -selected ship. The `R' command will place all remaining ships randomly. The ^L -command (form feed, ASCII 12) will force a screen redraw). +selected ship. +The \*(``R\*('' command will place all remaining ships randomly. +The ^L command (form feed, +ASCII 12) will force a screen redraw). .PP The command-line arguments control game modes. .nf - -b selects a `blitz' variant - -s selects a `salvo' variant - -c permits ships to be placed adjacently + \-b selects a \*(``blitz\*('' variant + \-s selects a \*(``salvo\*('' variant + \-c permits ships to be placed adjacently .fi -The `blitz' variant allows a side to shoot for as long as it continues to -score hits. +The \*(``blitz\*('' variant allows a side to shoot +for as long as it continues to score hits. .PP -The `salvo' game allows a player one shot per turn for each of his/her ships -still afloat. This puts a premium scoring hits early and knocking out some +The \*(``salvo\*('' game allows a player one shot per turn +for each of his/her ships still afloat. +This puts a premium scoring hits early and knocking out some ships and also makes much harder the situation where you face a superior force with only your PT-boat. .PP -Normally, ships must be separated by at least one square of open water. The --c option disables this check and allows them to close-pack. +Normally, ships must be separated by at least one square of open water. +The \-c option disables this check and allows them to close-pack. .PP -The algorithm the computer uses once it has found a ship to sink is provably -optimal. The dispersion criterion for the random-fire algorithm may not be. +The algorithm the computer uses +once it has found a ship to sink is provably optimal. +The dispersion criterion for the random-fire algorithm may not be. .SH AUTHORS -Originally written by one Bruce Holloway in 1986. Salvo mode added by Chuck A. -DeGaul (cbosgd!cad). Visual user interface, `closepack' option, code rewrite -and manual page by Eric S. Raymond <esr@snark.thyrsus.com> August 1989. +Originally written by Bruce Holloway in 1986. +Salvo mode added by Chuck A. DeGaul (cbosgd!cad). +Visual user interface, +\*(``closepack\*('' option, +code rewrite, +and manual page by Eric S. Raymond +<esr@snark.thyrsus.com> August 1989. diff --git a/test/bs.c b/test/bs.c index c7569cf207fd..4bb0ede7bada 100644 --- a/test/bs.c +++ b/test/bs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ * v2.0 featuring strict ANSI/POSIX conformance, November 1993. * v2.1 with ncurses mouse support, September 1995 * - * $Id: bs.c,v 1.79 2023/05/27 20:13:10 tom Exp $ + * $Id: bs.c,v 1.83 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -147,7 +147,7 @@ typedef struct { bool placed; /* has it been placed on the board? */ } ship_t; -static bool checkplace(int b, ship_t * ss, int vis); +static bool checkplace(int b, const ship_t * ss, int vis); #define SHIPIT(name, symbol, length) { name, 0, symbol, length, 0,0, 0, FALSE } @@ -224,12 +224,12 @@ intro(void) { const char *tmpname; - srand((unsigned) (time(0L) + getpid())); /* Kick the random number generator */ + srand((unsigned) (time(NULL) + getpid())); /* Kick the random number generator */ InitAndCatch(initscr(), uninitgame); - if ((tmpname = getlogin()) != 0 && - (your_name = strdup(tmpname)) != 0) { + if ((tmpname = getlogin()) != NULL && + (your_name = strdup(tmpname)) != NULL) { your_name[0] = (char) toupper(UChar(your_name[0])); } else { your_name = strdup(dftname); @@ -475,7 +475,7 @@ initgame(void) } else if (c == FF) { (void) clearok(stdscr, TRUE); (void) refresh(); - } else if (ss == 0) { + } else if (ss == NULL) { beep(); /* simple to verify, unlikely to happen */ } else if (c == 'r') { prompt(1, "Random-placing your %s", ss->name); @@ -686,7 +686,7 @@ collidecheck(int b, int y, int x) } static bool -checkplace(int b, ship_t * ss, int vis) +checkplace(int b, const ship_t * ss, int vis) { int l, xend, yend; @@ -877,7 +877,7 @@ plyturn(void) m = " You'll pick up survivors from my %s, I hope...!"; break; } - if (m != 0) { + if (m != NULL) { (void) printw(m, ss->name); } (void) beep(); @@ -1193,7 +1193,7 @@ usage(int ok) ,USAGE_COMMON ,"Options:" ," -b play a blitz game" - ," -c ships may be adjacent" + ," -p ships may be packed/adjacent" ," -s play a salvo game" }; size_t n; @@ -1212,7 +1212,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "bps")) != -1) { switch (ch) { case 'b': blitz = 1; @@ -1230,14 +1230,11 @@ main(int argc, char *argv[]) ExitProgram(EXIT_FAILURE); } break; - case 'c': + case 'p': closepack = 1; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/cardfile.c b/test/cardfile.c index 092483b02c00..e44d72421a10 100644 --- a/test/cardfile.c +++ b/test/cardfile.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1999-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: cardfile.c,v 1.51 2022/12/04 00:40:11 tom Exp $ + * $Id: cardfile.c,v 1.55 2025/07/05 15:21:56 tom Exp $ * * File format: text beginning in column 1 is a title; other text is content. */ @@ -47,7 +47,7 @@ #define pair_1 1 #define pair_2 2 -#define isVisible(cardp) ((cardp)->panel != 0) +#define isVisible(cardp) ((cardp)->panel != NULL) enum { MY_CTRL_x = MAX_FORM_COMMAND @@ -100,7 +100,7 @@ add_title(const char *title) { CARD *card, *p, *q; - for (p = all_cards, q = 0; p != 0; q = p, p = p->link) { + for (p = all_cards, q = NULL; p != NULL; q = p, p = p->link) { int cmp = strcmp(p->title, title); if (cmp == 0) return p; @@ -112,7 +112,7 @@ add_title(const char *title) card->title = strdup(title); card->content = strdup(""); - if (q == 0) { + if (q == NULL) { card->link = all_cards; all_cards = card; } else { @@ -132,7 +132,7 @@ add_content(CARD * card, const char *content) if ((total = strlen(content)) != 0) { size_t offset; - if (card->content != 0 && (offset = strlen(card->content)) != 0) { + if (card->content != NULL && (offset = strlen(card->content)) != 0) { total += 1 + offset; card->content = typeRealloc(char, total + 1, card->content); if (card->content) { @@ -141,7 +141,7 @@ add_content(CARD * card, const char *content) } } else { offset = 0; - if (card->content != 0) + if (card->content != NULL) free(card->content); card->content = typeMalloc(char, total + 1); } @@ -161,11 +161,11 @@ new_card(void) } static CARD * -find_card(char *title) +find_card(const char *title) { CARD *card; - for (card = all_cards; card != 0; card = card->link) + for (card = all_cards; card != NULL; card = card->link) if (!strcmp(card->title, title)) break; @@ -173,21 +173,21 @@ find_card(char *title) } static void -read_data(char *fname) +read_data(const char *fname) { FILE *fp; - if ((fp = fopen(fname, "r")) != 0) { - CARD *card = 0; + if ((fp = fopen(fname, "r")) != NULL) { + CARD *card = NULL; char buffer[BUFSIZ]; while (fgets(buffer, sizeof(buffer), fp)) { trim(buffer); if (isspace(UChar(*buffer))) { - if (card == 0) + if (card == NULL) card = add_title(""); add_content(card, buffer); - } else if ((card = find_card(buffer)) == 0) { + } else if ((card = find_card(buffer)) == NULL) { card = add_title(buffer); } } @@ -205,17 +205,17 @@ write_data(const char *fname) if (!strcmp(fname, default_name)) fname = "cardfile.out"; - if ((fp = fopen(fname, "w")) != 0) { - CARD *p = 0; + if ((fp = fopen(fname, "w")) != NULL) { + CARD *p = NULL; - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { FIELD **f = form_fields(p->form); int n; - for (n = 0; f[n] != 0; n++) { + for (n = 0; f[n] != NULL; n++) { char *s = field_buffer(f[n], 0); - if (s != 0 - && (s = strdup(s)) != 0) { + if (s != NULL + && (s = strdup(s)) != NULL) { trim(s); fprintf(fp, "%s%s\n", n ? "\t" : "", s); free(s); @@ -237,7 +237,7 @@ count_cards(void) CARD *p; int count = 0; - for (p = all_cards; p != 0; p = p->link) + for (p = all_cards; p != NULL; p = p->link) count++; return count; @@ -263,7 +263,7 @@ order_cards(CARD * first, int depth) static CARD * next_card(CARD * now) { - if (now->link != 0) { + if (now->link != NULL) { CARD *tst = now->link; if (isVisible(tst)) now = tst; @@ -280,7 +280,7 @@ static CARD * prev_card(CARD * now) { CARD *p; - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { if (p->link == now) { if (!isVisible(p)) p = prev_card(p); @@ -341,7 +341,7 @@ form_virtualize(WINDOW *w) } static FIELD ** -make_fields(CARD * p, int form_high, int form_wide) +make_fields(const CARD * p, int form_high, int form_wide) { FIELD **f = typeCalloc(FIELD *, (size_t) 3); @@ -355,7 +355,7 @@ make_fields(CARD * p, int form_high, int form_wide) set_field_just(f[1], JUSTIFY_LEFT); field_opts_off(f[1], O_BLANK); - f[2] = 0; + f[2] = NULL; return f; } @@ -375,7 +375,7 @@ free_form_fields(FIELD **f) { int n; - for (n = 0; f[n] != 0; ++n) { + for (n = 0; f[n] != NULL; ++n) { free_field(f[n]); } free(f); @@ -385,7 +385,7 @@ free_form_fields(FIELD **f) /*******************************************************************************/ static void -cardfile(char *fname) +cardfile(const char *fname) { WINDOW *win; CARD *p; @@ -414,9 +414,9 @@ cardfile(char *fname) x = 0; /* make a panel for each CARD */ - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { - if ((win = newwin(panel_high, panel_wide, y, x)) == 0) + if ((win = newwin(panel_high, panel_wide, y, x)) == NULL) break; wbkgd(win, (chtype) COLOR_PAIR(pair_2)); @@ -478,7 +478,7 @@ cardfile(char *fname) x = 0; show_legend(); - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { FIELD **oldf = form_fields(p->form); WINDOW *olds = form_sub(p->form); @@ -528,7 +528,7 @@ cardfile(char *fname) } } #if NO_LEAKS - while (all_cards != 0) { + while (all_cards != NULL) { p = all_cards; all_cards = all_cards->link; @@ -558,7 +558,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" }; size_t n; for (n = 0; n < SIZEOF(msg); n++) @@ -578,16 +578,13 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "C")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/chgat.c b/test/chgat.c index 2c2b539120c4..18bc9e9c4e79 100644 --- a/test/chgat.c +++ b/test/chgat.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,16 +27,17 @@ * authorization. * ****************************************************************************/ /* - * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $ + * $Id: chgat.c,v 1.25 2025/07/05 15:21:56 tom Exp $ * * test-driver for chgat/wchgat/mvchgat/mvwchgat */ #include <test.priv.h> -#include <popup_msg.h> #if HAVE_CHGAT +#include <popup_msg.h> + #define SHOW(n) ((n) == ERR ? "ERR" : "OK") #define COLOR_DEFAULT (-1) @@ -76,7 +77,7 @@ color_params(size_t state, short *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -113,7 +114,7 @@ video_params(size_t state, attr_t *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -150,24 +151,24 @@ show_status(WINDOW *win, STATUS * sp) getyx(win, y, x); wmove(win, 0, 0); wprintw(win, "Count %d", sp->count); - if (sp->v_msg != 0) + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wclrtoeol(win); wmove(win, y, x); } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, sp->y_beg + 1, sp->x_beg + 1); - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); - if (win2 != 0) { + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -179,7 +180,7 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) delwin(win1); touchwin(win); } else { - if (win1 != 0) + if (win1 != NULL) delwin(win1); beep(); } @@ -203,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp) static void show_help(WINDOW *win) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -217,7 +218,7 @@ show_help(WINDOW *win) ,"= resets count to zero." ,"- negates count." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, msgs); @@ -229,14 +230,14 @@ update_status(WINDOW *win, STATUS * sp) switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } @@ -375,11 +376,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/clip_printw.c b/test/clip_printw.c index c34a1e09ff34..4ce067bd9135 100644 --- a/test/clip_printw.c +++ b/test/clip_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: clip_printw.c,v 1.23 2023/09/30 19:57:44 tom Exp $ + * $Id: clip_printw.c,v 1.27 2025/07/05 15:21:56 tom Exp $ * * demonstrate how to use printw with/without wrapping. */ @@ -122,7 +122,7 @@ color_params(unsigned state, int *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -161,7 +161,7 @@ video_params(unsigned state, attr_t *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -201,9 +201,9 @@ show_status(WINDOW *win, STATUS * sp) wmove(win, 0, 0); wprintw(win, "Clip %s", sp->single ? "line" : "window"); wprintw(win, " Count %d", sp->count); - if (sp->v_msg != 0) + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wprintw(win, " (%d)", sp->status); wclrtoeol(win); @@ -212,21 +212,21 @@ show_status(WINDOW *win, STATUS * sp) } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN), sp->x_max - (2 * MARGIN), sp->y_beg + MARGIN, sp->x_beg + MARGIN); - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { WINDOW *win2 = derwin(win1, sp->y_max - (2 * MARGIN) - 2, sp->x_max - (2 * MARGIN) - 2, (win == stdscr) ? Y_BASE : Y_BASE, MARGIN); - if (win2 != 0) { + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -268,7 +268,7 @@ init_status(WINDOW *win, STATUS * sp) static void show_help(WINDOW *win) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -283,7 +283,7 @@ show_help(WINDOW *win) ,". calls vw_printw at the current position with the given count." ,"= resets count to zero." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, msgs); @@ -297,14 +297,14 @@ update_status(WINDOW *win, STATUS * sp) switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } @@ -396,7 +396,7 @@ test_clipping(WINDOW *win) need = (unsigned) want - 1; _nc_STRCPY(fmt, "%c%s%c", sizeof(fmt)); } - if ((buffer = typeMalloc(char, need + 1)) != 0) { + if ((buffer = typeMalloc(char, need + 1)) != NULL) { for (j = 0; j < need; ++j) { buffer[j] = (char) ('A' + (j % 26)); } @@ -444,11 +444,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/color_content.c b/test/color_content.c index d08dffb09fb5..0e496ac1e9bb 100644 --- a/test/color_content.c +++ b/test/color_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_content.c,v 1.19 2023/02/25 16:48:02 tom Exp $ + * $Id: color_content.c,v 1.23 2025/07/05 15:21:56 tom Exp $ */ #define NEED_TIME_H @@ -186,7 +186,7 @@ run_test(void) my_color_t g; my_color_t b; if (ColorContent(color, &r, &g, &b) == OK) { - if (expected != 0) { + if (expected != NULL) { if (r != expected[color].r) success = FALSE; if (g != expected[color].g) @@ -220,10 +220,10 @@ usage(int ok) ,"Options:" ," -f COLOR first color value to test (default: 0)" ," -i interactive, showing test-progress" - ," -l COLOR last color value to test (default: max_colors-1)" + ," -F COLOR last color value to test (default: max_colors-1)" ," -n do not initialize color pairs" ," -p print data for color content instead of testing" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s initialize pairs sequentially rather than random" #if USE_EXTENDED_COLOR ," -x use extended color pairs/values" @@ -243,7 +243,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) { switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) @@ -252,7 +252,7 @@ main(int argc, char *argv[]) case 'i': i_opt = 1; break; - case 'l': + case 'F': if ((l_opt = atoi(optarg)) <= 0) usage(FALSE); break; @@ -274,11 +274,8 @@ main(int argc, char *argv[]) x_opt = 1; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/color_name.h b/test/color_name.h index 867396ca5f70..6f884a3424e4 100644 --- a/test/color_name.h +++ b/test/color_name.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2011-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_name.h,v 1.9 2021/04/24 23:25:29 tom Exp $ + * $Id: color_name.h,v 1.11 2024/12/07 22:17:24 tom Exp $ */ #ifndef __COLORNAME_H @@ -62,15 +62,15 @@ static int color_code(const char *color) { int result = 0; - char *endp = 0; - size_t n; + char *endp = NULL; if ((result = (int) strtol(color, &endp, 0)) >= 0 - && (endp == 0 || *endp == 0)) { + && (endp == NULL || *endp == 0)) { ; } else if (!strcmp(color, "default")) { result = -1; } else { + size_t n; for (n = 0; n < SIZEOF(the_color_names); ++n) { if (!strcmp(the_color_names[n], color)) { result = (int) n; @@ -87,7 +87,7 @@ static const char * color_name(int color) { static char temp[20]; - const char *result = 0; + const char *result = NULL; if (color >= (int) SIZEOF(the_color_names)) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%d", color); diff --git a/test/color_set.c b/test/color_set.c index 5510a0fdba44..370f0bdc0017 100644 --- a/test/color_set.c +++ b/test/color_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2020,2022 Thomas E. Dickey * + * Copyright 2020,2022,2025 Thomas E. Dickey * * Copyright 2003-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_set.c,v 1.12 2022/12/10 23:36:59 tom Exp $ + * $Id: color_set.c,v 1.13 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -64,11 +64,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/combine.c b/test/combine.c index eca72b80711f..968420cd3acd 100644 --- a/test/combine.c +++ b/test/combine.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021,2022 Thomas E. Dickey * + * Copyright 2021-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $ + * $Id: combine.c,v 1.28 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -37,7 +37,7 @@ #include <dump_window.h> #include <popup_msg.h> -static int c_opt; +static int k_opt; static int r_opt; static int @@ -68,7 +68,7 @@ do_row(int row, int base_ch, int over_ch) move(row, col); printw("[U+%04X]", over_ch); do { - if (c_opt) { + if (k_opt) { wchar_t source[2]; cchar_t target; attr_t attr = reverse ? A_REVERSE : A_NORMAL; @@ -174,7 +174,7 @@ show_help(WINDOW *current) ++d; } popup_msg2(current, msgs); - for (s = 0; msgs[s] != 0; ++s) { + for (s = 0; msgs[s] != NULL; ++s) { free(msgs[s]); } free(msgs); @@ -191,8 +191,8 @@ usage(int ok) ,"Demonstrate combining-characters." ,"" ,"Options:" - ," -c use cchar_t data rather than wchar_t string" - ," -l FILE log window-dumps to this file" + ," -k use cchar_t data rather than wchar_t string" + ," -L FILE log window-dumps to this file" ," -r draw even-numbered rows in reverse-video" }; unsigned n; @@ -215,12 +215,12 @@ main(int argc, char *argv[]) bool log_option = FALSE; const char *dump_log = "combine.log"; - while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "kL:r")) != -1) { switch (ch) { - case 'c': - c_opt = TRUE; + case 'k': + k_opt = TRUE; break; - case 'l': + case 'L': log_option = TRUE; if (!open_dump(optarg)) usage(FALSE); @@ -228,11 +228,8 @@ main(int argc, char *argv[]) case 'r': r_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -273,7 +270,7 @@ main(int argc, char *argv[]) left_at = next_char(left_at); break; case 'c': - c_opt = !c_opt; + k_opt = !k_opt; break; case 'r': r_opt = !r_opt; diff --git a/test/configure b/test/configure index 4f155cd78d0e..b9b2aff3019f 100755 --- a/test/configure +++ b/test/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20231210. +# Generated by Autoconf 2.52.20250126. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -480,6 +480,10 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; + -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* ) + echo "$as_me: WARNING: unsupported option: $ac_option" >&2 + ;; + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } @@ -676,11 +680,6 @@ EOF cat <<\EOF -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - X features: --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR @@ -688,6 +687,7 @@ X features: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] EOF fi @@ -695,21 +695,24 @@ if test -n "$ac_init_help"; then cat <<\EOF -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + General Options: + --with-system-type=XXX test: override derived host system-type --disable-stripping do not strip (debug info) installed executables --with-strip-program=XX specify program to use when stripping in install --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD --disable-echo do not display "compiling" commands + --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix + --enable-install-prefix merge DESTDIR with installation prefix Curses Version-dependent Options: --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables --disable-widec disable checks for wide-character functions @@ -809,7 +812,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20231210. Invocation command line was +generated by GNU Autoconf 2.52.20250126. Invocation command line was $ $0 $@ @@ -933,7 +936,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:936: loading site script $ac_site_file" >&5 + { echo "$as_me:939: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -944,7 +947,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:947: loading cache $cache_file" >&5 + { echo "$as_me:950: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -952,7 +955,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:955: creating cache $cache_file" >&5 + { echo "$as_me:958: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -968,21 +971,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:971: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:974: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:975: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:978: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:981: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:984: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:983: former value: $ac_old_val" >&5 + { echo "$as_me:986: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:985: current value: $ac_new_val" >&5 + { echo "$as_me:988: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1001,9 +1004,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1004: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1007: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1006: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1009: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1032,10 +1035,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1038: \$? = $ac_status" >&5 + echo "$as_me:1041: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1067,7 +1070,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1070: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1073: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1077,11 +1080,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1083: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1084: checking build system type" >&5 +echo "$as_me:1087: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1090,24 +1093,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1093: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1096: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1100: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1102: result: $ac_cv_build" >&5 +echo "$as_me:1105: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1110: checking host system type" >&5 +echo "$as_me:1112: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1116,18 +1118,46 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1121: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1124: result: $ac_cv_host" >&5 +echo "$as_me:1126: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then + echo "$as_me:1134: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || + { { echo "$as_me:1143: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1148: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- system_name="$host_os" else system_name="`(uname -s -r) 2>/dev/null`" @@ -1147,31 +1177,28 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1180: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1184: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1156: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1186: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi -test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +# Check whether --with-system-type or --without-system-type was given. +if test "${with_system_type+set}" = set; then + withval="$with_system_type" + { echo "$as_me:1194: WARNING: overriding system type to $withval" >&5 +echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + host_os=$withval + +fi; -echo "$as_me:1174: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1201: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1191,11 +1218,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1194: result: yes" >&5 + echo "$as_me:1221: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1198: result: no" >&5 + echo "$as_me:1225: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1209,7 +1236,7 @@ ac_main_return="return" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1212: checking for $ac_word" >&5 +echo "$as_me:1239: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1224,7 +1251,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1227: found $ac_dir/$ac_word" >&5 +echo "$as_me:1254: found $ac_dir/$ac_word" >&5 break done @@ -1232,10 +1259,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1235: result: $CC" >&5 + echo "$as_me:1262: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1238: result: no" >&5 + echo "$as_me:1265: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1244,7 +1271,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1247: checking for $ac_word" >&5 +echo "$as_me:1274: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1259,7 +1286,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1262: found $ac_dir/$ac_word" >&5 +echo "$as_me:1289: found $ac_dir/$ac_word" >&5 break done @@ -1267,10 +1294,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1270: result: $ac_ct_CC" >&5 + echo "$as_me:1297: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1273: result: no" >&5 + echo "$as_me:1300: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1283,7 +1310,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1286: checking for $ac_word" >&5 +echo "$as_me:1313: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1298,7 +1325,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1301: found $ac_dir/$ac_word" >&5 +echo "$as_me:1328: found $ac_dir/$ac_word" >&5 break done @@ -1306,10 +1333,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1309: result: $CC" >&5 + echo "$as_me:1336: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1312: result: no" >&5 + echo "$as_me:1339: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1318,7 +1345,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1321: checking for $ac_word" >&5 +echo "$as_me:1348: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1333,7 +1360,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1336: found $ac_dir/$ac_word" >&5 +echo "$as_me:1363: found $ac_dir/$ac_word" >&5 break done @@ -1341,10 +1368,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1344: result: $ac_ct_CC" >&5 + echo "$as_me:1371: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1347: result: no" >&5 + echo "$as_me:1374: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1357,7 +1384,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1360: checking for $ac_word" >&5 +echo "$as_me:1387: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1377,7 +1404,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1380: found $ac_dir/$ac_word" >&5 +echo "$as_me:1407: found $ac_dir/$ac_word" >&5 break done @@ -1399,10 +1426,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1402: result: $CC" >&5 + echo "$as_me:1429: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1405: result: no" >&5 + echo "$as_me:1432: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1413,7 +1440,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1416: checking for $ac_word" >&5 +echo "$as_me:1443: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1428,7 +1455,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1431: found $ac_dir/$ac_word" >&5 +echo "$as_me:1458: found $ac_dir/$ac_word" >&5 break done @@ -1436,10 +1463,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1439: result: $CC" >&5 + echo "$as_me:1466: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1442: result: no" >&5 + echo "$as_me:1469: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1452,7 +1479,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1455: checking for $ac_word" >&5 +echo "$as_me:1482: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1467,7 +1494,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1470: found $ac_dir/$ac_word" >&5 +echo "$as_me:1497: found $ac_dir/$ac_word" >&5 break done @@ -1475,10 +1502,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1478: result: $ac_ct_CC" >&5 + echo "$as_me:1505: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1481: result: no" >&5 + echo "$as_me:1508: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1490,32 +1517,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1493: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1520: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1498:" \ +echo "$as_me:1525:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1501: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1528: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1504: \$? = $ac_status" >&5 + echo "$as_me:1531: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1506: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1533: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1509: \$? = $ac_status" >&5 + echo "$as_me:1536: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1511: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1538: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1514: \$? = $ac_status" >&5 + echo "$as_me:1541: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1518 "configure" +#line 1545 "configure" #include "confdefs.h" int @@ -1531,13 +1558,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1534: checking for C compiler default output" >&5 +echo "$as_me:1561: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1537: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1564: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1540: \$? = $ac_status" >&5 + echo "$as_me:1567: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1560,34 +1587,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1563: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1590: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1569: result: $ac_file" >&5 +echo "$as_me:1596: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1574: checking whether the C compiler works" >&5 +echo "$as_me:1601: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1580: \"$ac_try\"") >&5 + { (eval echo "$as_me:1607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1583: \$? = $ac_status" >&5 + echo "$as_me:1610: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1590: error: cannot run C compiled programs. + { { echo "$as_me:1617: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1595,24 +1622,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1598: result: yes" >&5 +echo "$as_me:1625: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1605: checking whether we are cross compiling" >&5 +echo "$as_me:1632: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1607: result: $cross_compiling" >&5 +echo "$as_me:1634: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1610: checking for executable suffix" >&5 +echo "$as_me:1637: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1615: \$? = $ac_status" >&5 + echo "$as_me:1642: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1628,25 +1655,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1631: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1658: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1637: result: $ac_cv_exeext" >&5 +echo "$as_me:1664: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1643: checking for object suffix" >&5 +echo "$as_me:1670: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1649 "configure" +#line 1676 "configure" #include "confdefs.h" int @@ -1658,10 +1685,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1664: \$? = $ac_status" >&5 + echo "$as_me:1691: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1673,24 +1700,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1676: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1703: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1683: result: $ac_cv_objext" >&5 +echo "$as_me:1710: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1687: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1714: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1693 "configure" +#line 1720 "configure" #include "confdefs.h" int @@ -1705,16 +1732,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1711: \$? = $ac_status" >&5 + echo "$as_me:1738: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1714: \"$ac_try\"") >&5 + { (eval echo "$as_me:1741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1717: \$? = $ac_status" >&5 + echo "$as_me:1744: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1726,19 +1753,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1729: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1756: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1735: checking whether $CC accepts -g" >&5 +echo "$as_me:1762: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1741 "configure" +#line 1768 "configure" #include "confdefs.h" int @@ -1750,16 +1777,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1756: \$? = $ac_status" >&5 + echo "$as_me:1783: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1759: \"$ac_try\"") >&5 + { (eval echo "$as_me:1786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1762: \$? = $ac_status" >&5 + echo "$as_me:1789: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1769,7 +1796,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1772: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1799: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1796,16 +1823,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1802: \$? = $ac_status" >&5 + echo "$as_me:1829: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1805: \"$ac_try\"") >&5 + { (eval echo "$as_me:1832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1808: \$? = $ac_status" >&5 + echo "$as_me:1835: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1817,7 +1844,7 @@ if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1820 "configure" +#line 1847 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1830,16 +1857,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1836: \$? = $ac_status" >&5 + echo "$as_me:1863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1839: \"$ac_try\"") >&5 + { (eval echo "$as_me:1866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1842: \$? = $ac_status" >&5 + echo "$as_me:1869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1849,7 +1876,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1852 "configure" +#line 1879 "configure" #include "confdefs.h" $ac_declaration int @@ -1861,16 +1888,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1867: \$? = $ac_status" >&5 + echo "$as_me:1894: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1870: \"$ac_try\"") >&5 + { (eval echo "$as_me:1897: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1873: \$? = $ac_status" >&5 + echo "$as_me:1900: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1900,11 +1927,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1903: checking version of $CC" >&5 + echo "$as_me:1930: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1907: result: $GCC_VERSION" >&5 + echo "$as_me:1934: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1913,12 +1940,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1916: checking if this is really Intel C compiler" >&5 + echo "$as_me:1943: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 1921 "configure" +#line 1948 "configure" #include "confdefs.h" int @@ -1935,16 +1962,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1965: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1941: \$? = $ac_status" >&5 + echo "$as_me:1968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1944: \"$ac_try\"") >&5 + { (eval echo "$as_me:1971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1947: \$? = $ac_status" >&5 + echo "$as_me:1974: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1955,7 +1982,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1958: result: $INTEL_COMPILER" >&5 + echo "$as_me:1985: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1964,11 +1991,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1967: checking if this is really Clang C compiler" >&5 + echo "$as_me:1994: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 1971 "configure" +#line 1998 "configure" #include "confdefs.h" int @@ -1985,16 +2012,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1991: \$? = $ac_status" >&5 + echo "$as_me:2018: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1994: \"$ac_try\"") >&5 + { (eval echo "$as_me:2021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1997: \$? = $ac_status" >&5 + echo "$as_me:2024: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -2004,7 +2031,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2007: result: $CLANG_COMPILER" >&5 + echo "$as_me:2034: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -2013,30 +2040,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2043: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:2023: checking version of $CC" >&5 + echo "$as_me:2050: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:2027: result: $CLANG_VERSION" >&5 + echo "$as_me:2054: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:2034: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2061: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2039 "configure" +#line 2066 "configure" #include "confdefs.h" #include <stdio.h> @@ -2050,16 +2077,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2053: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2056: \$? = $ac_status" >&5 + echo "$as_me:2083: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2059: \"$ac_try\"") >&5 + { (eval echo "$as_me:2086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2062: \$? = $ac_status" >&5 + echo "$as_me:2089: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2070,13 +2097,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2073: result: $cf_clang_optok" >&5 + echo "$as_me:2100: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2106: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2085,7 +2112,7 @@ echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2115: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2093,7 +2120,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2096 "configure" +#line 2123 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2140,16 +2167,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2146: \$? = $ac_status" >&5 + echo "$as_me:2173: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2149: \"$ac_try\"") >&5 + { (eval echo "$as_me:2176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2152: \$? = $ac_status" >&5 + echo "$as_me:2179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2166,10 +2193,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2169: result: none needed" >&5 + echo "$as_me:2196: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2177,13 +2204,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2180: checking \$CFLAGS variable" >&5 +echo "$as_me:2207: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2184: result: broken" >&5 + echo "$as_me:2211: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2186: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2291,18 +2318,18 @@ fi done ;; (*) - echo "$as_me:2294: result: ok" >&5 + echo "$as_me:2321: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2299: checking \$CC variable" >&5 +echo "$as_me:2326: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2303: result: broken" >&5 + echo "$as_me:2330: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2305: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2419,24 +2446,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2434: result: ok" >&5 + echo "$as_me:2461: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2439: checking for inline" >&5 +echo "$as_me:2466: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2444,7 +2471,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 2447 "configure" +#line 2474 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo (void) {return 0; } @@ -2453,16 +2480,16 @@ $ac_kw int foo (void) {return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2459: \$? = $ac_status" >&5 + echo "$as_me:2486: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2462: \"$ac_try\"") >&5 + { (eval echo "$as_me:2489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2465: \$? = $ac_status" >&5 + echo "$as_me:2492: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -2473,7 +2500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:2476: result: $ac_cv_c_inline" >&5 +echo "$as_me:2503: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2492,7 +2519,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2495: checking for $ac_word" >&5 +echo "$as_me:2522: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2507,7 +2534,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:2510: found $ac_dir/$ac_word" >&5 +echo "$as_me:2537: found $ac_dir/$ac_word" >&5 break done @@ -2515,10 +2542,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:2518: result: $GREP" >&5 + echo "$as_me:2545: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:2521: result: no" >&5 + echo "$as_me:2548: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2526,7 +2553,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:2529: checking for egrep" >&5 +echo "$as_me:2556: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2538,7 +2565,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2541: checking for $ac_word" >&5 +echo "$as_me:2568: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2555,7 +2582,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:2558: found $ac_dir/$ac_word" >&5 + echo "$as_me:2585: found $ac_dir/$ac_word" >&5 break fi done @@ -2566,10 +2593,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2569: result: $EGREP" >&5 + echo "$as_me:2596: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2572: result: no" >&5 + echo "$as_me:2599: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2577,12 +2604,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2607: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2612: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2592,7 +2619,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:2595: checking how to run the C preprocessor" >&5 +echo "$as_me:2622: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2613,18 +2640,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2616 "configure" +#line 2643 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2621: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2648: \"$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:2627: \$? = $ac_status" >&5 + echo "$as_me:2654: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2647,17 +2674,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2650 "configure" +#line 2677 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2654: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2681: \"$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:2660: \$? = $ac_status" >&5 + echo "$as_me:2687: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2694,7 +2721,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2697: result: $CPP" >&5 +echo "$as_me:2724: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2704,18 +2731,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2707 "configure" +#line 2734 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2712: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2739: \"$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:2718: \$? = $ac_status" >&5 + echo "$as_me:2745: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2738,17 +2765,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2741 "configure" +#line 2768 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2745: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2772: \"$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:2751: \$? = $ac_status" >&5 + echo "$as_me:2778: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2776,7 +2803,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2806: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2792,7 +2819,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2795: checking for $ac_word" >&5 +echo "$as_me:2822: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2807,7 +2834,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2810: found $ac_dir/$ac_word" >&5 +echo "$as_me:2837: found $ac_dir/$ac_word" >&5 break done @@ -2815,16 +2842,27 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2818: result: $AWK" >&5 + echo "$as_me:2845: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2821: result: no" >&5 + echo "$as_me:2848: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2837,7 +2875,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2840: checking for a BSD compatible install" >&5 +echo "$as_me:2878: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2886,7 +2924,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2889: result: $INSTALL" >&5 +echo "$as_me:2927: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2897,8 +2935,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case $INSTALL in -(/*) +if test "x$INSTALL" = "x./install-sh -c"; then + if test -f /usr/sbin/install ; then + case "$host_os" in + (linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + INSTALL=/usr/sbin/install + ;; + esac + fi +fi +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` @@ -2907,7 +2954,7 @@ case $INSTALL in ;; esac -echo "$as_me:2910: checking if you want to install stripped executables" >&5 +echo "$as_me:2957: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -2924,7 +2971,7 @@ else enable_stripping=yes fi; -echo "$as_me:2927: result: $enable_stripping" >&5 +echo "$as_me:2974: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -2935,7 +2982,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:2938: checking if install accepts -p option" >&5 +echo "$as_me:2985: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2966,10 +3013,10 @@ else rm -rf ./conftest* fi -echo "$as_me:2969: result: $cf_cv_install_p" >&5 +echo "$as_me:3016: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:2972: checking if install needs to be told about ownership" >&5 +echo "$as_me:3019: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -2980,7 +3027,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:2983: result: $with_install_o" >&5 +echo "$as_me:3030: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -2991,7 +3038,7 @@ fi if test -n "$INSTALL_OPT_S" then - echo "$as_me:2994: checking if you want to specify strip-program" >&5 + echo "$as_me:3041: checking if you want to specify strip-program" >&5 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 # Check whether --with-strip-program or --without-strip-program was given. @@ -3001,11 +3048,11 @@ if test "${with_strip_program+set}" = set; then else with_strip_program=no fi; - echo "$as_me:3004: result: $with_strip_program" >&5 + echo "$as_me:3051: result: $with_strip_program" >&5 echo "${ECHO_T}$with_strip_program" >&6 if test "$with_strip_program" != no then - echo "$as_me:3008: checking if strip-program is supported with this installer" >&5 + echo "$as_me:3055: checking if strip-program is supported with this installer" >&5 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` check_install_strip=no @@ -3026,11 +3073,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH done fi fi - echo "$as_me:3029: result: $check_install_strip" >&5 + echo "$as_me:3076: result: $check_install_strip" >&5 echo "${ECHO_T}$check_install_strip" >&6 case "$check_install_strip" in (no) - { echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5 + { echo "$as_me:3080: WARNING: $cf_install_program does not support strip program option" >&5 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} with_strip_program=no ;; @@ -3045,7 +3092,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option chmod +x "$INSTALL" test -n "$verbose" && echo " created $INSTALL" 1>&6 -echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5 +echo "${as_me:-configure}:3095: testing created $INSTALL ..." 1>&5 ;; (option) @@ -3059,7 +3106,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3062: checking for $ac_word" >&5 +echo "$as_me:3109: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3074,7 +3121,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3077: found $ac_dir/$ac_word" >&5 +echo "$as_me:3124: found $ac_dir/$ac_word" >&5 break done @@ -3082,10 +3129,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3085: result: $LINT" >&5 + echo "$as_me:3132: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3088: result: no" >&5 + echo "$as_me:3135: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3093,12 +3140,15 @@ fi done case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac -echo "$as_me:3101: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3151: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3153,14 +3203,14 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3206: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= -echo "$as_me:3163: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3213: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3187,7 +3237,7 @@ else fi fi -echo "$as_me:3190: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3240: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3198,7 +3248,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3201: checking for $ac_word" >&5 +echo "$as_me:3251: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3213,7 +3263,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3216: found $ac_dir/$ac_word" >&5 +echo "$as_me:3266: found $ac_dir/$ac_word" >&5 break done @@ -3221,10 +3271,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3224: result: $CTAGS" >&5 + echo "$as_me:3274: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3227: result: no" >&5 + echo "$as_me:3277: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3235,7 +3285,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3238: checking for $ac_word" >&5 +echo "$as_me:3288: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3250,7 +3300,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3253: found $ac_dir/$ac_word" >&5 +echo "$as_me:3303: found $ac_dir/$ac_word" >&5 break done @@ -3258,10 +3308,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3261: result: $ETAGS" >&5 + echo "$as_me:3311: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3264: result: no" >&5 + echo "$as_me:3314: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3270,7 +3320,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3273: checking for $ac_word" >&5 +echo "$as_me:3323: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3285,7 +3335,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3288: found $ac_dir/$ac_word" >&5 +echo "$as_me:3338: found $ac_dir/$ac_word" >&5 break done @@ -3294,17 +3344,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3347: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3300: result: no" >&5 + echo "$as_me:3350: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3307: checking for $ac_word" >&5 +echo "$as_me:3357: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3319,7 +3369,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:3322: found $ac_dir/$ac_word" >&5 +echo "$as_me:3372: found $ac_dir/$ac_word" >&5 break done @@ -3328,10 +3378,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3381: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3334: result: no" >&5 + echo "$as_me:3384: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3351,14 +3401,14 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3354: checking if -lm needed for math functions" >&5 +echo "$as_me:3404: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3361 "configure" +#line 3411 "configure" #include "confdefs.h" #include <stdio.h> @@ -3374,16 +3424,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3377: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3380: \$? = $ac_status" >&5 + echo "$as_me:3430: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3383: \"$ac_try\"") >&5 + { (eval echo "$as_me:3433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3386: \$? = $ac_status" >&5 + echo "$as_me:3436: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -3393,7 +3443,7 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3396: result: $cf_cv_need_libm" >&5 +echo "$as_me:3446: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes @@ -3401,14 +3451,14 @@ then cf_save_LIBS="$LIBS" LIBS="$LIBS -lm" - echo "$as_me:3404: checking if -lm is available for math functions" >&5 + echo "$as_me:3454: checking if -lm is available for math functions" >&5 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 if test "${cf_cv_have_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3411 "configure" +#line 3461 "configure" #include "confdefs.h" #include <stdio.h> @@ -3424,16 +3474,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3427: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3477: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3430: \$? = $ac_status" >&5 + echo "$as_me:3480: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3433: \"$ac_try\"") >&5 + { (eval echo "$as_me:3483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3436: \$? = $ac_status" >&5 + echo "$as_me:3486: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_libm=yes else @@ -3443,7 +3493,7 @@ cf_cv_have_libm=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3446: result: $cf_cv_have_libm" >&5 +echo "$as_me:3496: result: $cf_cv_have_libm" >&5 echo "${ECHO_T}$cf_cv_have_libm" >&6 LIBS="$cf_save_LIBS" @@ -3498,7 +3548,7 @@ includesubdir="" cf_cv_screen=curses cf_cv_libtype= -echo "$as_me:3501: checking for fgrep" >&5 +echo "$as_me:3551: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3510,7 +3560,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3513: checking for $ac_word" >&5 +echo "$as_me:3563: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3527,7 +3577,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:3530: found $ac_dir/$ac_word" >&5 + echo "$as_me:3580: found $ac_dir/$ac_word" >&5 break fi done @@ -3538,10 +3588,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:3541: result: $FGREP" >&5 + echo "$as_me:3591: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:3544: result: no" >&5 + echo "$as_me:3594: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3549,16 +3599,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3602: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:3607: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:3611: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -3575,17 +3625,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:3578: result: $enable_stdnoreturn" >&5 +echo "$as_me:3628: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:3582: checking for C11 _Noreturn feature" >&5 +echo "$as_me:3632: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3588 "configure" +#line 3638 "configure" #include "confdefs.h" $ac_includes_default @@ -3601,16 +3651,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3654: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3607: \$? = $ac_status" >&5 + echo "$as_me:3657: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3610: \"$ac_try\"") >&5 + { (eval echo "$as_me:3660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3613: \$? = $ac_status" >&5 + echo "$as_me:3663: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -3621,7 +3671,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:3674: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -3660,10 +3710,12 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5 -echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + echo "$as_me:3713: checking for $CC __attribute__ directives" >&5 +echo $ECHO_N "checking for $CC __attribute__ directives... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:3715: result: " >&5 +echo "${ECHO_T}" >&6 cat > "conftest.$ac_ext" <<EOF -#line 3666 "${as_me:-configure}" +#line 3718 "${as_me:-configure}" #include <stdio.h> #include "confdefs.h" #include "conftest.h" @@ -3713,12 +3765,12 @@ EOF ;; esac - if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3719: \$? = $ac_status" >&5 + echo "$as_me:3771: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3773: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -3777,7 +3829,7 @@ fi rm -rf ./conftest* fi -echo "$as_me:3780: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3832: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -3787,7 +3839,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:3790: result: $enable_string_hacks" >&5 +echo "$as_me:3842: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -3796,15 +3848,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:3799: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3851: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:3801: checking for strlcat" >&5 + echo "$as_me:3853: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3807 "configure" +#line 3859 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3835,16 +3887,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3838: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3890: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3841: \$? = $ac_status" >&5 + echo "$as_me:3893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3844: \"$ac_try\"") >&5 + { (eval echo "$as_me:3896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3847: \$? = $ac_status" >&5 + echo "$as_me:3899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -3854,7 +3906,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3909: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -3864,7 +3916,7 @@ EOF else - echo "$as_me:3867: checking for strlcat in -lbsd" >&5 + echo "$as_me:3919: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3872,7 +3924,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 3875 "configure" +#line 3927 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3891,16 +3943,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3894: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3946: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3897: \$? = $ac_status" >&5 + echo "$as_me:3949: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3900: \"$ac_try\"") >&5 + { (eval echo "$as_me:3952: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3903: \$? = $ac_status" >&5 + echo "$as_me:3955: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -3911,7 +3963,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3914: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3966: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -3934,23 +3986,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3937: checking for $ac_header" >&5 +echo "$as_me:3989: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3943 "configure" +#line 3995 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3947: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3999: \"$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:3953: \$? = $ac_status" >&5 + echo "$as_me:4005: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3969,7 +4021,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:4024: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -3990,13 +4042,13 @@ fi for ac_func in strlcpy snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3993: checking for $ac_func" >&5 +echo "$as_me:4045: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3999 "configure" +#line 4051 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -4027,16 +4079,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4030: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4082: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4033: \$? = $ac_status" >&5 + echo "$as_me:4085: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4036: \"$ac_try\"") >&5 + { (eval echo "$as_me:4088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4039: \$? = $ac_status" >&5 + echo "$as_me:4091: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -4046,7 +4098,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:4101: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -4058,14 +4110,14 @@ done fi -echo "$as_me:4061: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:4113: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4068 "configure" +#line 4120 "configure" #include "confdefs.h" #include <stdio.h> int @@ -4084,16 +4136,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4090: \$? = $ac_status" >&5 + echo "$as_me:4142: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4093: \"$ac_try\"") >&5 + { (eval echo "$as_me:4145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4096: \$? = $ac_status" >&5 + echo "$as_me:4148: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -4104,7 +4156,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4107: result: $cf_cv_posix_visible" >&5 +echo "$as_me:4159: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -4142,18 +4194,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:4149: checking if this is the GNU C library" >&5 +echo "$as_me:4201: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4156 "configure" +#line 4208 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4172,16 +4224,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4227: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4178: \$? = $ac_status" >&5 + echo "$as_me:4230: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4181: \"$ac_try\"") >&5 + { (eval echo "$as_me:4233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4184: \$? = $ac_status" >&5 + echo "$as_me:4236: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -4192,7 +4244,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4195: result: $cf_cv_gnu_library" >&5 +echo "$as_me:4247: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -4200,7 +4252,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:4203: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:4255: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4212,7 +4264,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4215 "configure" +#line 4267 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4231,16 +4283,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4286: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4237: \$? = $ac_status" >&5 + echo "$as_me:4289: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4240: \"$ac_try\"") >&5 + { (eval echo "$as_me:4292: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4243: \$? = $ac_status" >&5 + echo "$as_me:4295: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -4252,12 +4304,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:4255: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:4307: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:4260: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:4312: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4362,7 +4414,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4365 "configure" +#line 4417 "configure" #include "confdefs.h" #include <limits.h> @@ -4382,16 +4434,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4388: \$? = $ac_status" >&5 + echo "$as_me:4440: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4391: \"$ac_try\"") >&5 + { (eval echo "$as_me:4443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4394: \$? = $ac_status" >&5 + echo "$as_me:4446: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -4402,7 +4454,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4405: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:4457: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -4411,14 +4463,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:4414: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:4466: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4421 "configure" +#line 4473 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4433,16 +4485,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4439: \$? = $ac_status" >&5 + echo "$as_me:4491: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4442: \"$ac_try\"") >&5 + { (eval echo "$as_me:4494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4445: \$? = $ac_status" >&5 + echo "$as_me:4497: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4549,7 +4601,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4552 "configure" +#line 4604 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4564,16 +4616,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4619: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4570: \$? = $ac_status" >&5 + echo "$as_me:4622: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4573: \"$ac_try\"") >&5 + { (eval echo "$as_me:4625: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4576: \$? = $ac_status" >&5 + echo "$as_me:4628: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4588,12 +4640,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4591: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4643: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:4596: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4648: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4603,7 +4655,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4606 "configure" +#line 4658 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4618,16 +4670,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4673: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4624: \$? = $ac_status" >&5 + echo "$as_me:4676: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4627: \"$ac_try\"") >&5 + { (eval echo "$as_me:4679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4630: \$? = $ac_status" >&5 + echo "$as_me:4682: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -4638,7 +4690,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4641: result: $cf_cv_default_source" >&5 +echo "$as_me:4693: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -4653,6 +4705,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6 fi ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -4675,16 +4730,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:4678: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4733: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:4684: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4739: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4687 "configure" +#line 4742 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4699,16 +4754,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4757: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4705: \$? = $ac_status" >&5 + echo "$as_me:4760: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4708: \"$ac_try\"") >&5 + { (eval echo "$as_me:4763: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4711: \$? = $ac_status" >&5 + echo "$as_me:4766: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -4729,7 +4784,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 4732 "configure" +#line 4787 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4744,16 +4799,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4802: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4750: \$? = $ac_status" >&5 + echo "$as_me:4805: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4753: \"$ac_try\"") >&5 + { (eval echo "$as_me:4808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4756: \$? = $ac_status" >&5 + echo "$as_me:4811: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4764,7 +4819,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4822: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4772,10 +4827,10 @@ echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4830: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4778 "configure" +#line 4833 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4790,16 +4845,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4796: \$? = $ac_status" >&5 + echo "$as_me:4851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4799: \"$ac_try\"") >&5 + { (eval echo "$as_me:4854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4802: \$? = $ac_status" >&5 + echo "$as_me:4857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4815,7 +4870,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4818: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4873: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4932,7 +4987,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:4935: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:4990: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -4964,14 +5019,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:4967: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5022: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4974 "configure" +#line 5029 "configure" #include "confdefs.h" $ac_includes_default @@ -4989,16 +5044,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5047: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4995: \$? = $ac_status" >&5 + echo "$as_me:5050: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4998: \"$ac_try\"") >&5 + { (eval echo "$as_me:5053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5001: \$? = $ac_status" >&5 + echo "$as_me:5056: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5010,7 +5065,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 5013 "configure" +#line 5068 "configure" #include "confdefs.h" $ac_includes_default @@ -5028,16 +5083,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5034: \$? = $ac_status" >&5 + echo "$as_me:5089: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5037: \"$ac_try\"") >&5 + { (eval echo "$as_me:5092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5040: \$? = $ac_status" >&5 + echo "$as_me:5095: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5052,7 +5107,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5055: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5110: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5212,16 +5267,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:5215: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:5270: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:5221: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:5276: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5224 "configure" +#line 5279 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -5236,16 +5291,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5294: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5242: \$? = $ac_status" >&5 + echo "$as_me:5297: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5245: \"$ac_try\"") >&5 + { (eval echo "$as_me:5300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5248: \$? = $ac_status" >&5 + echo "$as_me:5303: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -5266,7 +5321,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 5269 "configure" +#line 5324 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -5281,16 +5336,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5287: \$? = $ac_status" >&5 + echo "$as_me:5342: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5290: \"$ac_try\"") >&5 + { (eval echo "$as_me:5345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5293: \$? = $ac_status" >&5 + echo "$as_me:5348: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5301,7 +5356,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5359: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -5309,10 +5364,10 @@ echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:5367: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5315 "configure" +#line 5370 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -5327,16 +5382,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5385: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5333: \$? = $ac_status" >&5 + echo "$as_me:5388: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5336: \"$ac_try\"") >&5 + { (eval echo "$as_me:5391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5339: \$? = $ac_status" >&5 + echo "$as_me:5394: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5352,7 +5407,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5355: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:5410: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -5465,10 +5520,10 @@ fi # cf_cv_posix_visible if test "$cf_cv_xopen_source" = no ; then test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 -echo "${as_me:-configure}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5523: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5471 "configure" +#line 5526 "configure" #include "confdefs.h" $ac_includes_default @@ -5486,23 +5541,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5544: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5492: \$? = $ac_status" >&5 + echo "$as_me:5547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5495: \"$ac_try\"") >&5 + { (eval echo "$as_me:5550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5498: \$? = $ac_status" >&5 + echo "$as_me:5553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:5560: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} CPPFLAGS="$cf_save_xopen_cppflags" fi @@ -5525,7 +5580,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5583: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -5537,7 +5592,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5595: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -5625,7 +5680,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5683: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -5635,7 +5690,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5693: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -5645,7 +5700,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:5648: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5703: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -5657,10 +5712,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:5660: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5715: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 5663 "configure" +#line 5718 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -5675,16 +5730,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5681: \$? = $ac_status" >&5 + echo "$as_me:5736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5684: \"$ac_try\"") >&5 + { (eval echo "$as_me:5739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5687: \$? = $ac_status" >&5 + echo "$as_me:5742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -5693,12 +5748,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:5696: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:5751: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 5701 "configure" +#line 5756 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -5713,16 +5768,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5719: \$? = $ac_status" >&5 + echo "$as_me:5774: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5722: \"$ac_try\"") >&5 + { (eval echo "$as_me:5777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5725: \$? = $ac_status" >&5 + echo "$as_me:5780: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -5733,19 +5788,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5791: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:5741: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5796: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5748 "configure" +#line 5803 "configure" #include "confdefs.h" $ac_includes_default @@ -5763,16 +5818,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5769: \$? = $ac_status" >&5 + echo "$as_me:5824: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5772: \"$ac_try\"") >&5 + { (eval echo "$as_me:5827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5775: \$? = $ac_status" >&5 + echo "$as_me:5830: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5784,7 +5839,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 5787 "configure" +#line 5842 "configure" #include "confdefs.h" $ac_includes_default @@ -5802,16 +5857,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5808: \$? = $ac_status" >&5 + echo "$as_me:5863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5811: \"$ac_try\"") >&5 + { (eval echo "$as_me:5866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5814: \$? = $ac_status" >&5 + echo "$as_me:5869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5826,7 +5881,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5829: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5884: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5973,13 +6028,13 @@ fi fi fi # cf_cv_posix_visible -echo "$as_me:5976: checking for ANSI C header files" >&5 +echo "$as_me:6031: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5982 "configure" +#line 6037 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5987,13 +6042,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:5990: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6045: \"$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:5996: \$? = $ac_status" >&5 + echo "$as_me:6051: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6015,7 +6070,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6018 "configure" +#line 6073 "configure" #include "confdefs.h" #include <string.h> @@ -6033,7 +6088,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6036 "configure" +#line 6091 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6054,7 +6109,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 6057 "configure" +#line 6112 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -6080,15 +6135,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6083: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6138: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6086: \$? = $ac_status" >&5 + echo "$as_me:6141: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6088: \"$ac_try\"") >&5 + { (eval echo "$as_me:6143: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6091: \$? = $ac_status" >&5 + echo "$as_me:6146: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6101,7 +6156,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:6104: result: $ac_cv_header_stdc" >&5 +echo "$as_me:6159: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -6117,28 +6172,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6120: checking for $ac_header" >&5 +echo "$as_me:6175: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6126 "configure" +#line 6181 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6187: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6135: \$? = $ac_status" >&5 + echo "$as_me:6190: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6138: \"$ac_try\"") >&5 + { (eval echo "$as_me:6193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6141: \$? = $ac_status" >&5 + echo "$as_me:6196: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -6148,7 +6203,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6206: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -6158,13 +6213,13 @@ EOF fi done -echo "$as_me:6161: checking whether exit is declared" >&5 +echo "$as_me:6216: checking whether exit is declared" >&5 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6167 "configure" +#line 6222 "configure" #include "confdefs.h" $ac_includes_default int @@ -6179,16 +6234,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6237: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6185: \$? = $ac_status" >&5 + echo "$as_me:6240: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6188: \"$ac_try\"") >&5 + { (eval echo "$as_me:6243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6191: \$? = $ac_status" >&5 + echo "$as_me:6246: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -6198,10 +6253,10 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:6256: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 -echo "$as_me:6204: checking for signal global datatype" >&5 +echo "$as_me:6259: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6213,7 +6268,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6216 "configure" +#line 6271 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6237,16 +6292,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6295: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6243: \$? = $ac_status" >&5 + echo "$as_me:6298: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6246: \"$ac_try\"") >&5 + { (eval echo "$as_me:6301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6249: \$? = $ac_status" >&5 + echo "$as_me:6304: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -6260,7 +6315,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6263: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:6318: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF @@ -6269,14 +6324,14 @@ EOF # Work around breakage on OS X -echo "$as_me:6272: checking if SIGWINCH is defined" >&5 +echo "$as_me:6327: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6279 "configure" +#line 6334 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6291,23 +6346,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6297: \$? = $ac_status" >&5 + echo "$as_me:6352: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6300: \"$ac_try\"") >&5 + { (eval echo "$as_me:6355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6303: \$? = $ac_status" >&5 + echo "$as_me:6358: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 6310 "configure" +#line 6365 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6325,16 +6380,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6331: \$? = $ac_status" >&5 + echo "$as_me:6386: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6334: \"$ac_try\"") >&5 + { (eval echo "$as_me:6389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6337: \$? = $ac_status" >&5 + echo "$as_me:6392: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -6348,11 +6403,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6351: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6406: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:6355: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6410: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6363,7 +6418,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 6366 "configure" +#line 6421 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6385,16 +6440,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6391: \$? = $ac_status" >&5 + echo "$as_me:6446: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6394: \"$ac_try\"") >&5 + { (eval echo "$as_me:6449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6397: \$? = $ac_status" >&5 + echo "$as_me:6452: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -6408,7 +6463,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6466: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -6418,13 +6473,13 @@ fi # Checks for CODESET support. -echo "$as_me:6421: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:6476: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6427 "configure" +#line 6482 "configure" #include "confdefs.h" $ac_includes_default @@ -6438,16 +6493,16 @@ char* cs = nl_langinfo(CODESET); (void)cs } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6441: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6496: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6444: \$? = $ac_status" >&5 + echo "$as_me:6499: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6447: \"$ac_try\"") >&5 + { (eval echo "$as_me:6502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6450: \$? = $ac_status" >&5 + echo "$as_me:6505: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else @@ -6458,7 +6513,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6516: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test "$am_cv_langinfo_codeset" = yes; then @@ -6468,7 +6523,7 @@ EOF fi -echo "$as_me:6471: checking if you want to use pkg-config" >&5 +echo "$as_me:6526: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -6478,7 +6533,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:6481: result: $cf_pkg_config" >&5 +echo "$as_me:6536: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -6490,7 +6545,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:6493: checking for $ac_word" >&5 +echo "$as_me:6548: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6507,7 +6562,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6510: found $ac_dir/$ac_word" >&5 + echo "$as_me:6565: found $ac_dir/$ac_word" >&5 break fi done @@ -6518,10 +6573,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:6521: result: $PKG_CONFIG" >&5 + echo "$as_me:6576: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:6524: result: no" >&5 + echo "$as_me:6579: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6530,7 +6585,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:6533: checking for $ac_word" >&5 +echo "$as_me:6588: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6547,7 +6602,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6550: found $ac_dir/$ac_word" >&5 + echo "$as_me:6605: found $ac_dir/$ac_word" >&5 break fi done @@ -6559,10 +6614,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:6617: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:6565: result: no" >&5 + echo "$as_me:6620: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6586,37 +6641,35 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in -(.\$\(*\)*|.\'*\'*) +case "x$PKG_CONFIG" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in - (.NONE/*) + case "x$PKG_CONFIG" in + (xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6608: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:6661: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:6615: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:6668: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:6619: checking if you want to see long compiling messages" >&5 +echo "$as_me:6672: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -6650,10 +6703,55 @@ else ECHO_CC='' fi; -echo "$as_me:6653: result: $enableval" >&5 +echo "$as_me:6706: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:6656: checking for ncurses wrap-prefix" >&5 +echo "$as_me:6709: checking for an installation directory prefix" >&5 +echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 + +# Check whether --with-install-prefix or --without-install-prefix was given. +if test "${with_install_prefix+set}" = set; then + withval="$with_install_prefix" + case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac +fi; +echo "$as_me:6722: result: ${DESTDIR:-(none)}" >&5 +echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + +SET_DESTDIR= +test -n "$DESTDIR" && SET_DESTDIR="DESTDIR=$DESTDIR" + +echo "$as_me:6728: checking if installation directory prefix should be merged" >&5 +echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6 + +# Check whether --enable-install-prefix or --disable-install-prefix was given. +if test "${enable_install_prefix+set}" = set; then + enableval="$enable_install_prefix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_install_prefix=yes + else + cf_install_prefix=no + fi +else + enableval=no + cf_install_prefix=no + +fi; +echo "$as_me:6745: result: $cf_install_prefix" >&5 +echo "${ECHO_T}$cf_install_prefix" >&6 + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +echo "$as_me:6754: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -6663,10 +6761,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:6764: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:6669: checking if you want to check for wide-character functions" >&5 +echo "$as_me:6767: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6683,10 +6781,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:6686: result: $cf_enable_widec" >&5 +echo "$as_me:6784: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:6689: checking for specific curses-directory" >&5 +echo "$as_me:6787: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -6696,7 +6794,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:6699: result: $cf_cv_curses_dir" >&5 +echo "$as_me:6797: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" @@ -6708,26 +6806,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6826: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6763,7 +6859,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 6766 "configure" +#line 6862 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6775,16 +6871,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6781: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6784: \"$ac_try\"") >&5 + { (eval echo "$as_me:6880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6787: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6801,7 +6897,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6900: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6837,7 +6933,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6936: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6850,7 +6946,7 @@ fi cf_cv_screen=curses -echo "$as_me:6853: checking for specified curses library type" >&5 +echo "$as_me:6949: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -6894,13 +6990,13 @@ fi; fi; fi; -echo "$as_me:6897: result: $cf_cv_screen" >&5 +echo "$as_me:6993: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:6903: checking for extra include directories" >&5 +echo "$as_me:6999: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6926,7 +7022,7 @@ case "$host_os" in esac fi -echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:7025: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -6936,7 +7032,7 @@ then fi -echo "$as_me:6939: checking if we have identified curses headers" >&5 +echo "$as_me:7035: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6948,7 +7044,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 6951 "configure" +#line 7047 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -6960,16 +7056,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7059: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6966: \$? = $ac_status" >&5 + echo "$as_me:7062: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 + { (eval echo "$as_me:7065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6972: \$? = $ac_status" >&5 + echo "$as_me:7068: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -6980,11 +7076,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6983: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:7079: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:6987: error: No curses header-files found" >&5 + { { echo "$as_me:7083: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6994,23 +7090,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6997: checking for $ac_header" >&5 +echo "$as_me:7093: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7003 "configure" +#line 7099 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7007: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7103: \"$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:7013: \$? = $ac_status" >&5 + echo "$as_me:7109: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7029,7 +7125,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7128: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -7039,7 +7135,7 @@ EOF fi done -echo "$as_me:7042: checking for terminfo header" >&5 +echo "$as_me:7138: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7057,7 +7153,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7060 "configure" +#line 7156 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -7072,16 +7168,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7171: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7078: \$? = $ac_status" >&5 + echo "$as_me:7174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7081: \"$ac_try\"") >&5 + { (eval echo "$as_me:7177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7084: \$? = $ac_status" >&5 + echo "$as_me:7180: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7097,7 +7193,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7100: result: $cf_cv_term_header" >&5 +echo "$as_me:7196: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7129,7 +7225,7 @@ EOF ;; esac -echo "$as_me:7132: checking for ncurses version" >&5 +echo "$as_me:7228: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7155,10 +7251,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:7158: \"$cf_try\"") >&5 + { (eval echo "$as_me:7254: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7161: \$? = $ac_status" >&5 + echo "$as_me:7257: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -7168,7 +7264,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 7171 "configure" +#line 7267 "configure" #include "confdefs.h" $ac_includes_default @@ -7195,15 +7291,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7294: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7201: \$? = $ac_status" >&5 + echo "$as_me:7297: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7203: \"$ac_try\"") >&5 + { (eval echo "$as_me:7299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7206: \$? = $ac_status" >&5 + echo "$as_me:7302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7217,17 +7313,17 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:7220: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:7316: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:7227: checking if we have identified curses libraries" >&5 +echo "$as_me:7323: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7230 "configure" +#line 7326 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7239,16 +7335,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7338: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7245: \$? = $ac_status" >&5 + echo "$as_me:7341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7248: \"$ac_try\"") >&5 + { (eval echo "$as_me:7344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7251: \$? = $ac_status" >&5 + echo "$as_me:7347: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7257,13 +7353,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:7260: result: $cf_result" >&5 +echo "$as_me:7356: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:7266: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:7362: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7271,7 +7367,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7274 "configure" +#line 7370 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7290,16 +7386,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7293: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7389: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7296: \$? = $ac_status" >&5 + echo "$as_me:7392: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7299: \"$ac_try\"") >&5 + { (eval echo "$as_me:7395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7302: \$? = $ac_status" >&5 + echo "$as_me:7398: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -7310,7 +7406,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7313: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:7409: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then @@ -7340,7 +7436,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:7343: checking for initscr in -lcur_colr" >&5 + echo "$as_me:7439: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7348,7 +7444,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7351 "configure" +#line 7447 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7367,16 +7463,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7466: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7373: \$? = $ac_status" >&5 + echo "$as_me:7469: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7376: \"$ac_try\"") >&5 + { (eval echo "$as_me:7472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7379: \$? = $ac_status" >&5 + echo "$as_me:7475: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -7387,7 +7483,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7390: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:7486: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test "$ac_cv_lib_cur_colr_initscr" = yes; then @@ -7411,7 +7507,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:7414: checking for initscr in -lHcurses" >&5 + echo "$as_me:7510: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7419,7 +7515,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7422 "configure" +#line 7518 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7438,16 +7534,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7441: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7537: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7444: \$? = $ac_status" >&5 + echo "$as_me:7540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7447: \"$ac_try\"") >&5 + { (eval echo "$as_me:7543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7450: \$? = $ac_status" >&5 + echo "$as_me:7546: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -7458,7 +7554,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7461: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:7557: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test "$ac_cv_lib_Hcurses_initscr" = yes; then @@ -7516,7 +7612,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7615: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7545,7 +7641,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7644: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7576,7 +7672,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7675: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7611,7 +7707,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7710: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7655,13 +7751,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:7658: checking for tgoto" >&5 + echo "$as_me:7754: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7664 "configure" +#line 7760 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -7692,16 +7788,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7695: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7791: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7698: \$? = $ac_status" >&5 + echo "$as_me:7794: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7701: \"$ac_try\"") >&5 + { (eval echo "$as_me:7797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7704: \$? = $ac_status" >&5 + echo "$as_me:7800: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -7711,7 +7807,7 @@ ac_cv_func_tgoto=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7714: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:7810: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test "$ac_cv_func_tgoto" = yes; then cf_term_lib=predefined @@ -7720,7 +7816,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:7723: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:7819: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7728,7 +7824,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7731 "configure" +#line 7827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7747,16 +7843,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7750: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7753: \$? = $ac_status" >&5 + echo "$as_me:7849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7756: \"$ac_try\"") >&5 + { (eval echo "$as_me:7852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7759: \$? = $ac_status" >&5 + echo "$as_me:7855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -7767,7 +7863,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7770: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:7866: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -7790,10 +7886,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:7793: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:7889: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7796 "configure" +#line 7892 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7805,16 +7901,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7904: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7811: \$? = $ac_status" >&5 + echo "$as_me:7907: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7814: \"$ac_try\"") >&5 + { (eval echo "$as_me:7910: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7817: \$? = $ac_status" >&5 + echo "$as_me:7913: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7823,16 +7919,16 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7826: result: $cf_result" >&5 + echo "$as_me:7922: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:7832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:7928: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7835 "configure" +#line 7931 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7844,16 +7940,16 @@ initscr(); endwin(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7943: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7850: \$? = $ac_status" >&5 + echo "$as_me:7946: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7853: \"$ac_try\"") >&5 + { (eval echo "$as_me:7949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7856: \$? = $ac_status" >&5 + echo "$as_me:7952: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -7862,7 +7958,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7865 "configure" +#line 7961 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7874,16 +7970,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7877: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7973: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7880: \$? = $ac_status" >&5 + echo "$as_me:7976: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7883: \"$ac_try\"") >&5 + { (eval echo "$as_me:7979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7886: \$? = $ac_status" >&5 + echo "$as_me:7982: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7895,13 +7991,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7898: result: $cf_result" >&5 + echo "$as_me:7994: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:7904: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:8000: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -7913,23 +8009,23 @@ fi for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7916: checking for $ac_header" >&5 +echo "$as_me:8012: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7922 "configure" +#line 8018 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7926: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8022: \"$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:7932: \$? = $ac_status" >&5 + echo "$as_me:8028: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7948,7 +8044,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8047: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -7958,7 +8054,7 @@ EOF fi done -echo "$as_me:7961: checking for multibyte character support" >&5 +echo "$as_me:8057: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7966,7 +8062,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7969 "configure" +#line 8065 "configure" #include "confdefs.h" $ac_includes_default @@ -7983,16 +8079,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8082: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7989: \$? = $ac_status" >&5 + echo "$as_me:8085: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7992: \"$ac_try\"") >&5 + { (eval echo "$as_me:8088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7995: \$? = $ac_status" >&5 + echo "$as_me:8091: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -8000,16 +8096,16 @@ else cat "conftest.$ac_ext" >&5 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. +# will be set on completion of the AC_LINK_IFELSE below. cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8103: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8012 "configure" +#line 8108 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8022,16 +8118,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8025: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8121: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8028: \$? = $ac_status" >&5 + echo "$as_me:8124: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8031: \"$ac_try\"") >&5 + { (eval echo "$as_me:8127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8034: \$? = $ac_status" >&5 + echo "$as_me:8130: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -8045,7 +8141,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8048 "configure" +#line 8144 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8058,16 +8154,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8157: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8064: \$? = $ac_status" >&5 + echo "$as_me:8160: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8067: \"$ac_try\"") >&5 + { (eval echo "$as_me:8163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8070: \$? = $ac_status" >&5 + echo "$as_me:8166: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -8084,9 +8180,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:8183: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8185: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8177,7 +8273,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8276: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -8185,7 +8281,7 @@ echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 8188 "configure" +#line 8284 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8198,21 +8294,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8297: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8204: \$? = $ac_status" >&5 + echo "$as_me:8300: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8207: \"$ac_try\"") >&5 + { (eval echo "$as_me:8303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8210: \$? = $ac_status" >&5 + echo "$as_me:8306: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8311: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -8230,7 +8326,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8329: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -8305,13 +8401,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:8308: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8404: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 8314 "configure" +#line 8410 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8324,21 +8420,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8330: \$? = $ac_status" >&5 + echo "$as_me:8426: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8333: \"$ac_try\"") >&5 + { (eval echo "$as_me:8429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8336: \$? = $ac_status" >&5 + echo "$as_me:8432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8437: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -8380,7 +8476,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8383: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8479: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -8418,7 +8514,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8421 "configure" +#line 8517 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8430,16 +8526,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8436: \$? = $ac_status" >&5 + echo "$as_me:8532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8439: \"$ac_try\"") >&5 + { (eval echo "$as_me:8535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8442: \$? = $ac_status" >&5 + echo "$as_me:8538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8456,7 +8552,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8555: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8492,7 +8588,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8591: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8522,13 +8618,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8525: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8621: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:8528: result: yes" >&5 + echo "$as_me:8624: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8531: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8627: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -8661,7 +8757,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8664 "configure" +#line 8760 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8673,37 +8769,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8676: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8772: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8679: \$? = $ac_status" >&5 + echo "$as_me:8775: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8682: \"$ac_try\"") >&5 + { (eval echo "$as_me:8778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8685: \$? = $ac_status" >&5 + echo "$as_me:8781: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8691 "configure" +#line 8787 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8698: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8701: \$? = $ac_status" >&5 + echo "$as_me:8797: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8703: \"$ac_try\"") >&5 + { (eval echo "$as_me:8799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8706: \$? = $ac_status" >&5 + echo "$as_me:8802: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -8734,6 +8830,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -8877,7 +8987,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8880 "configure" +#line 8990 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8889,37 +8999,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8892: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9002: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8895: \$? = $ac_status" >&5 + echo "$as_me:9005: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8898: \"$ac_try\"") >&5 + { (eval echo "$as_me:9008: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8901: \$? = $ac_status" >&5 + echo "$as_me:9011: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8907 "configure" +#line 9017 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8914: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9024: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8917: \$? = $ac_status" >&5 + echo "$as_me:9027: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8919: \"$ac_try\"") >&5 + { (eval echo "$as_me:9029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8922: \$? = $ac_status" >&5 + echo "$as_me:9032: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -8936,7 +9046,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:8939: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9049: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -8952,7 +9062,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8955: checking for terminfo header" >&5 +echo "$as_me:9065: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8970,7 +9080,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8973 "configure" +#line 9083 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -8985,16 +9095,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9098: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8991: \$? = $ac_status" >&5 + echo "$as_me:9101: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8994: \"$ac_try\"") >&5 + { (eval echo "$as_me:9104: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8997: \$? = $ac_status" >&5 + echo "$as_me:9107: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9010,7 +9120,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9013: result: $cf_cv_term_header" >&5 +echo "$as_me:9123: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9045,7 +9155,7 @@ esac fi else - echo "$as_me:9048: result: no" >&5 + echo "$as_me:9158: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -9061,7 +9171,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:9064: checking for $ac_word" >&5 +echo "$as_me:9174: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9076,7 +9186,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:9079: found $ac_dir/$ac_word" >&5 +echo "$as_me:9189: found $ac_dir/$ac_word" >&5 break done @@ -9084,10 +9194,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9087: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9197: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9090: result: no" >&5 + echo "$as_me:9200: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9100,7 +9210,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9103: checking for $ac_word" >&5 +echo "$as_me:9213: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9115,7 +9225,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:9118: found $ac_dir/$ac_word" >&5 +echo "$as_me:9228: found $ac_dir/$ac_word" >&5 break done @@ -9123,10 +9233,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9236: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9129: result: no" >&5 + echo "$as_me:9239: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9283,7 +9393,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:9286: checking if we have identified curses headers" >&5 +echo "$as_me:9396: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9295,7 +9405,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 9298 "configure" +#line 9408 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -9307,16 +9417,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9420: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9313: \$? = $ac_status" >&5 + echo "$as_me:9423: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9316: \"$ac_try\"") >&5 + { (eval echo "$as_me:9426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9319: \$? = $ac_status" >&5 + echo "$as_me:9429: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9327,11 +9437,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9330: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9440: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:9334: error: No curses header-files found" >&5 + { { echo "$as_me:9444: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9341,23 +9451,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9344: checking for $ac_header" >&5 +echo "$as_me:9454: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 9350 "configure" +#line 9460 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9354: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9464: \"$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:9360: \$? = $ac_status" >&5 + echo "$as_me:9470: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9376,7 +9486,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9489: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -9432,7 +9542,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9435 "configure" +#line 9545 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9444,16 +9554,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9450: \$? = $ac_status" >&5 + echo "$as_me:9560: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9453: \"$ac_try\"") >&5 + { (eval echo "$as_me:9563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9456: \$? = $ac_status" >&5 + echo "$as_me:9566: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9470,7 +9580,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9583: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9489,7 +9599,7 @@ fi } -echo "$as_me:9492: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9602: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9501,7 +9611,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 9504 "configure" +#line 9614 "configure" #include "confdefs.h" #include <$cf_header> @@ -9525,16 +9635,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9638: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9531: \$? = $ac_status" >&5 + echo "$as_me:9641: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9534: \"$ac_try\"") >&5 + { (eval echo "$as_me:9644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9537: \$? = $ac_status" >&5 + echo "$as_me:9647: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -9549,14 +9659,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9552: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9662: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:9559: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9669: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9677,7 +9787,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9680 "configure" +#line 9790 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9689,16 +9799,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9802: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9695: \$? = $ac_status" >&5 + echo "$as_me:9805: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9698: \"$ac_try\"") >&5 + { (eval echo "$as_me:9808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9701: \$? = $ac_status" >&5 + echo "$as_me:9811: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9715,7 +9825,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9828: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9738,7 +9848,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 9741 "configure" +#line 9851 "configure" #include "confdefs.h" #include <$cf_header> @@ -9762,16 +9872,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9875: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9768: \$? = $ac_status" >&5 + echo "$as_me:9878: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9771: \"$ac_try\"") >&5 + { (eval echo "$as_me:9881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9774: \$? = $ac_status" >&5 + echo "$as_me:9884: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9792,12 +9902,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9905: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9800: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9910: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -9833,7 +9943,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9836 "configure" +#line 9946 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9845,16 +9955,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9851: \$? = $ac_status" >&5 + echo "$as_me:9961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9854: \"$ac_try\"") >&5 + { (eval echo "$as_me:9964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9857: \$? = $ac_status" >&5 + echo "$as_me:9967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9871,7 +9981,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9984: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9919,7 +10029,7 @@ EOF ;; esac -echo "$as_me:9922: checking for terminfo header" >&5 +echo "$as_me:10032: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9937,7 +10047,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9940 "configure" +#line 10050 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -9952,16 +10062,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10065: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9958: \$? = $ac_status" >&5 + echo "$as_me:10068: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9961: \"$ac_try\"") >&5 + { (eval echo "$as_me:10071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9964: \$? = $ac_status" >&5 + echo "$as_me:10074: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9977,7 +10087,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9980: result: $cf_cv_term_header" >&5 +echo "$as_me:10090: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10015,7 +10125,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10018: checking for ncurses version" >&5 +echo "$as_me:10128: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10041,10 +10151,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10044: \"$cf_try\"") >&5 + { (eval echo "$as_me:10154: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10047: \$? = $ac_status" >&5 + echo "$as_me:10157: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -10054,7 +10164,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 10057 "configure" +#line 10167 "configure" #include "confdefs.h" $ac_includes_default @@ -10081,15 +10191,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10084: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10194: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10087: \$? = $ac_status" >&5 + echo "$as_me:10197: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10089: \"$ac_try\"") >&5 + { (eval echo "$as_me:10199: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10092: \$? = $ac_status" >&5 + echo "$as_me:10202: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10103,7 +10213,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10216: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10116,7 +10226,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10119: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10229: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10124,7 +10234,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10127 "configure" +#line 10237 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10143,16 +10253,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10146: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10256: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10149: \$? = $ac_status" >&5 + echo "$as_me:10259: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10152: \"$ac_try\"") >&5 + { (eval echo "$as_me:10262: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10155: \$? = $ac_status" >&5 + echo "$as_me:10265: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10163,10 +10273,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10166: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10276: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:10169: checking for initscr in -lgpm" >&5 + echo "$as_me:10279: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10174,7 +10284,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10177 "configure" +#line 10287 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10193,16 +10303,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10306: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10199: \$? = $ac_status" >&5 + echo "$as_me:10309: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10202: \"$ac_try\"") >&5 + { (eval echo "$as_me:10312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10205: \$? = $ac_status" >&5 + echo "$as_me:10315: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10213,7 +10323,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10216: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10326: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -10228,7 +10338,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10231: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10341: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10236,7 +10346,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10239 "configure" +#line 10349 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10255,16 +10365,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10258: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10368: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10261: \$? = $ac_status" >&5 + echo "$as_me:10371: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10264: \"$ac_try\"") >&5 + { (eval echo "$as_me:10374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10267: \$? = $ac_status" >&5 + echo "$as_me:10377: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10275,7 +10385,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10278: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10388: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -10324,13 +10434,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:10327: checking for initscr" >&5 + echo "$as_me:10437: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10333 "configure" +#line 10443 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10361,16 +10471,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10474: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10367: \$? = $ac_status" >&5 + echo "$as_me:10477: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10370: \"$ac_try\"") >&5 + { (eval echo "$as_me:10480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10373: \$? = $ac_status" >&5 + echo "$as_me:10483: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -10380,18 +10490,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10383: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10493: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:10390: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10500: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10394 "configure" +#line 10504 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10403,25 +10513,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10516: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10409: \$? = $ac_status" >&5 + echo "$as_me:10519: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10412: \"$ac_try\"") >&5 + { (eval echo "$as_me:10522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10415: \$? = $ac_status" >&5 + echo "$as_me:10525: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10417: result: yes" >&5 + echo "$as_me:10527: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10424: result: no" >&5 +echo "$as_me:10534: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -10489,11 +10599,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:10492: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10602: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10496 "configure" +#line 10606 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10505,25 +10615,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10508: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10618: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10511: \$? = $ac_status" >&5 + echo "$as_me:10621: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10514: \"$ac_try\"") >&5 + { (eval echo "$as_me:10624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10517: \$? = $ac_status" >&5 + echo "$as_me:10627: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10519: result: yes" >&5 + echo "$as_me:10629: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10526: result: no" >&5 +echo "$as_me:10636: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10538,7 +10648,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10651: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10546,7 +10656,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10549: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10659: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -10556,7 +10666,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 10559 "configure" +#line 10669 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10568,23 +10678,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10571: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10681: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10574: \$? = $ac_status" >&5 + echo "$as_me:10684: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10577: \"$ac_try\"") >&5 + { (eval echo "$as_me:10687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10580: \$? = $ac_status" >&5 + echo "$as_me:10690: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10582: result: yes" >&5 + echo "$as_me:10692: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10587: result: no" >&5 +echo "$as_me:10697: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10609,13 +10719,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:10612: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10722: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:10615: result: yes" >&5 + echo "$as_me:10725: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:10618: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10728: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -10748,7 +10858,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10751 "configure" +#line 10861 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10760,37 +10870,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10763: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10766: \$? = $ac_status" >&5 + echo "$as_me:10876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10769: \"$ac_try\"") >&5 + { (eval echo "$as_me:10879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10772: \$? = $ac_status" >&5 + echo "$as_me:10882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10778 "configure" +#line 10888 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10785: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10895: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10788: \$? = $ac_status" >&5 + echo "$as_me:10898: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10790: \"$ac_try\"") >&5 + { (eval echo "$as_me:10900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10793: \$? = $ac_status" >&5 + echo "$as_me:10903: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -10821,6 +10931,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -10964,7 +11088,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10967 "configure" +#line 11091 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10976,37 +11100,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10979: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11103: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10982: \$? = $ac_status" >&5 + echo "$as_me:11106: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10985: \"$ac_try\"") >&5 + { (eval echo "$as_me:11109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10988: \$? = $ac_status" >&5 + echo "$as_me:11112: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10994 "configure" +#line 11118 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:11001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11125: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11004: \$? = $ac_status" >&5 + echo "$as_me:11128: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:11006: \"$ac_try\"") >&5 + { (eval echo "$as_me:11130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11009: \$? = $ac_status" >&5 + echo "$as_me:11133: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -11023,7 +11147,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:11026: result: $cf_have_ncuconfig" >&5 + echo "$as_me:11150: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -11039,7 +11163,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:11042: checking for terminfo header" >&5 +echo "$as_me:11166: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11057,7 +11181,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 11060 "configure" +#line 11184 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -11072,16 +11196,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11078: \$? = $ac_status" >&5 + echo "$as_me:11202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11081: \"$ac_try\"") >&5 + { (eval echo "$as_me:11205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11084: \$? = $ac_status" >&5 + echo "$as_me:11208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -11097,7 +11221,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11100: result: $cf_cv_term_header" >&5 +echo "$as_me:11224: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11132,7 +11256,7 @@ esac fi else - echo "$as_me:11135: result: no" >&5 + echo "$as_me:11259: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -11148,7 +11272,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:11151: checking for $ac_word" >&5 +echo "$as_me:11275: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11163,7 +11287,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:11166: found $ac_dir/$ac_word" >&5 +echo "$as_me:11290: found $ac_dir/$ac_word" >&5 break done @@ -11171,10 +11295,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:11174: result: $NCURSES_CONFIG" >&5 + echo "$as_me:11298: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:11177: result: no" >&5 + echo "$as_me:11301: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11187,7 +11311,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:11190: checking for $ac_word" >&5 +echo "$as_me:11314: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11202,7 +11326,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:11205: found $ac_dir/$ac_word" >&5 +echo "$as_me:11329: found $ac_dir/$ac_word" >&5 break done @@ -11210,10 +11334,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:11337: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:11216: result: no" >&5 + echo "$as_me:11340: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11370,7 +11494,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:11373: checking if we have identified curses headers" >&5 +echo "$as_me:11497: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11382,7 +11506,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 11385 "configure" +#line 11509 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -11394,16 +11518,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11400: \$? = $ac_status" >&5 + echo "$as_me:11524: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11403: \"$ac_try\"") >&5 + { (eval echo "$as_me:11527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11406: \$? = $ac_status" >&5 + echo "$as_me:11530: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -11414,11 +11538,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11417: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11541: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:11421: error: No curses header-files found" >&5 + { { echo "$as_me:11545: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -11428,23 +11552,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11431: checking for $ac_header" >&5 +echo "$as_me:11555: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11437 "configure" +#line 11561 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11441: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:11565: \"$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:11447: \$? = $ac_status" >&5 + echo "$as_me:11571: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11463,7 +11587,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:11590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -11519,7 +11643,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11522 "configure" +#line 11646 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11531,16 +11655,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11658: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11537: \$? = $ac_status" >&5 + echo "$as_me:11661: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11540: \"$ac_try\"") >&5 + { (eval echo "$as_me:11664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11543: \$? = $ac_status" >&5 + echo "$as_me:11667: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11557,7 +11681,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11684: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11576,7 +11700,7 @@ fi } -echo "$as_me:11579: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11703: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11588,7 +11712,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 11591 "configure" +#line 11715 "configure" #include "confdefs.h" #include <$cf_header> @@ -11612,16 +11736,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11739: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11618: \$? = $ac_status" >&5 + echo "$as_me:11742: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11621: \"$ac_try\"") >&5 + { (eval echo "$as_me:11745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11624: \$? = $ac_status" >&5 + echo "$as_me:11748: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -11636,14 +11760,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11639: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11763: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:11646: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11770: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11764,7 +11888,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11767 "configure" +#line 11891 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11776,16 +11900,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11903: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11782: \$? = $ac_status" >&5 + echo "$as_me:11906: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11785: \"$ac_try\"") >&5 + { (eval echo "$as_me:11909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11788: \$? = $ac_status" >&5 + echo "$as_me:11912: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11802,7 +11926,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11929: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11825,7 +11949,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 11828 "configure" +#line 11952 "configure" #include "confdefs.h" #include <$cf_header> @@ -11849,16 +11973,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11855: \$? = $ac_status" >&5 + echo "$as_me:11979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11858: \"$ac_try\"") >&5 + { (eval echo "$as_me:11982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11861: \$? = $ac_status" >&5 + echo "$as_me:11985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11879,12 +12003,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12006: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11887: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:12011: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -11920,7 +12044,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11923 "configure" +#line 12047 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11932,16 +12056,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12059: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11938: \$? = $ac_status" >&5 + echo "$as_me:12062: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11941: \"$ac_try\"") >&5 + { (eval echo "$as_me:12065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11944: \$? = $ac_status" >&5 + echo "$as_me:12068: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11958,7 +12082,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12085: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -12006,7 +12130,7 @@ EOF ;; esac -echo "$as_me:12009: checking for terminfo header" >&5 +echo "$as_me:12133: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12024,7 +12148,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 12027 "configure" +#line 12151 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -12039,16 +12163,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12045: \$? = $ac_status" >&5 + echo "$as_me:12169: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12048: \"$ac_try\"") >&5 + { (eval echo "$as_me:12172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12051: \$? = $ac_status" >&5 + echo "$as_me:12175: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -12064,7 +12188,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:12067: result: $cf_cv_term_header" >&5 +echo "$as_me:12191: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -12102,7 +12226,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:12105: checking for ncurses version" >&5 +echo "$as_me:12229: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12128,10 +12252,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:12131: \"$cf_try\"") >&5 + { (eval echo "$as_me:12255: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:12134: \$? = $ac_status" >&5 + echo "$as_me:12258: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -12141,7 +12265,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 12144 "configure" +#line 12268 "configure" #include "confdefs.h" $ac_includes_default @@ -12168,15 +12292,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:12171: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12295: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12174: \$? = $ac_status" >&5 + echo "$as_me:12298: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:12176: \"$ac_try\"") >&5 + { (eval echo "$as_me:12300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12179: \$? = $ac_status" >&5 + echo "$as_me:12303: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -12190,7 +12314,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12317: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -12203,7 +12327,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:12206: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12330: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12211,7 +12335,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12214 "configure" +#line 12338 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12230,16 +12354,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12357: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12236: \$? = $ac_status" >&5 + echo "$as_me:12360: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12239: \"$ac_try\"") >&5 + { (eval echo "$as_me:12363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12242: \$? = $ac_status" >&5 + echo "$as_me:12366: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -12250,10 +12374,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12253: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12377: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:12256: checking for initscr in -lgpm" >&5 + echo "$as_me:12380: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12261,7 +12385,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12264 "configure" +#line 12388 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12280,16 +12404,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12283: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12407: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12286: \$? = $ac_status" >&5 + echo "$as_me:12410: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12289: \"$ac_try\"") >&5 + { (eval echo "$as_me:12413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12292: \$? = $ac_status" >&5 + echo "$as_me:12416: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -12300,7 +12424,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12303: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12427: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -12315,7 +12439,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:12318: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12442: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12323,7 +12447,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12326 "configure" +#line 12450 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12342,16 +12466,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12469: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12348: \$? = $ac_status" >&5 + echo "$as_me:12472: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12351: \"$ac_try\"") >&5 + { (eval echo "$as_me:12475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12354: \$? = $ac_status" >&5 + echo "$as_me:12478: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -12362,7 +12486,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12365: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12489: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -12411,13 +12535,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:12414: checking for initscr" >&5 + echo "$as_me:12538: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12420 "configure" +#line 12544 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12448,16 +12572,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12575: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12454: \$? = $ac_status" >&5 + echo "$as_me:12578: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12457: \"$ac_try\"") >&5 + { (eval echo "$as_me:12581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12460: \$? = $ac_status" >&5 + echo "$as_me:12584: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -12467,18 +12591,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12470: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12594: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:12477: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12601: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12481 "configure" +#line 12605 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12490,25 +12614,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12493: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12617: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12496: \$? = $ac_status" >&5 + echo "$as_me:12620: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12499: \"$ac_try\"") >&5 + { (eval echo "$as_me:12623: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12502: \$? = $ac_status" >&5 + echo "$as_me:12626: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12504: result: yes" >&5 + echo "$as_me:12628: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12511: result: no" >&5 +echo "$as_me:12635: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -12576,11 +12700,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:12579: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12703: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12583 "configure" +#line 12707 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12592,25 +12716,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12598: \$? = $ac_status" >&5 + echo "$as_me:12722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12601: \"$ac_try\"") >&5 + { (eval echo "$as_me:12725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12604: \$? = $ac_status" >&5 + echo "$as_me:12728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12606: result: yes" >&5 + echo "$as_me:12730: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12613: result: no" >&5 +echo "$as_me:12737: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12625,7 +12749,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12752: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -12633,7 +12757,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:12636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12760: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -12643,7 +12767,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 12646 "configure" +#line 12770 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12655,23 +12779,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12782: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12661: \$? = $ac_status" >&5 + echo "$as_me:12785: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12664: \"$ac_try\"") >&5 + { (eval echo "$as_me:12788: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12667: \$? = $ac_status" >&5 + echo "$as_me:12791: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12669: result: yes" >&5 + echo "$as_me:12793: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12674: result: no" >&5 +echo "$as_me:12798: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -12690,8 +12814,8 @@ else fi ;; -(pdcurses) - echo "$as_me:12694: checking for X" >&5 +(pdcurses*) + echo "$as_me:12818: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -12795,17 +12919,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 12798 "configure" +#line 12922 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:12802: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:12926: \"$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:12808: \$? = $ac_status" >&5 + echo "$as_me:12932: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12838,7 +12962,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12841 "configure" +#line 12965 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -12850,16 +12974,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12853: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12977: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12856: \$? = $ac_status" >&5 + echo "$as_me:12980: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12859: \"$ac_try\"") >&5 + { (eval echo "$as_me:12983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12862: \$? = $ac_status" >&5 + echo "$as_me:12986: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -12897,7 +13021,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:12900: result: $have_x" >&5 + echo "$as_me:13024: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -12907,7 +13031,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:12910: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:13034: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -12934,11 +13058,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:12937: checking whether -R must be followed by a space" >&5 + echo "$as_me:13061: 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 12941 "configure" +#line 13065 "configure" #include "confdefs.h" int @@ -12950,16 +13074,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12953: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13077: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12956: \$? = $ac_status" >&5 + echo "$as_me:13080: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12959: \"$ac_try\"") >&5 + { (eval echo "$as_me:13083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12962: \$? = $ac_status" >&5 + echo "$as_me:13086: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -12969,13 +13093,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:12972: result: no" >&5 + echo "$as_me:13096: 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 12978 "configure" +#line 13102 "configure" #include "confdefs.h" int @@ -12987,16 +13111,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12990: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13114: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12993: \$? = $ac_status" >&5 + echo "$as_me:13117: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12996: \"$ac_try\"") >&5 + { (eval echo "$as_me:13120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12999: \$? = $ac_status" >&5 + echo "$as_me:13123: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -13006,11 +13130,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:13009: result: yes" >&5 + echo "$as_me:13133: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:13013: result: neither works" >&5 + echo "$as_me:13137: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -13030,7 +13154,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 13033 "configure" +#line 13157 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13049,22 +13173,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13176: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13055: \$? = $ac_status" >&5 + echo "$as_me:13179: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13058: \"$ac_try\"") >&5 + { (eval echo "$as_me:13182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13061: \$? = $ac_status" >&5 + echo "$as_me:13185: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:13067: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:13191: 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 @@ -13072,7 +13196,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13075 "configure" +#line 13199 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13091,16 +13215,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13218: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13097: \$? = $ac_status" >&5 + echo "$as_me:13221: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13100: \"$ac_try\"") >&5 + { (eval echo "$as_me:13224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13103: \$? = $ac_status" >&5 + echo "$as_me:13227: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -13111,14 +13235,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13114: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:13238: 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:13121: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:13245: 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 @@ -13126,7 +13250,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13129 "configure" +#line 13253 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13145,16 +13269,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13148: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13151: \$? = $ac_status" >&5 + echo "$as_me:13275: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13154: \"$ac_try\"") >&5 + { (eval echo "$as_me:13278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13157: \$? = $ac_status" >&5 + echo "$as_me:13281: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -13165,7 +13289,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13168: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:13292: 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" @@ -13184,13 +13308,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:13187: checking for gethostbyname" >&5 + echo "$as_me:13311: 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 13193 "configure" +#line 13317 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13221,16 +13345,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13224: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13348: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13227: \$? = $ac_status" >&5 + echo "$as_me:13351: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13230: \"$ac_try\"") >&5 + { (eval echo "$as_me:13354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13233: \$? = $ac_status" >&5 + echo "$as_me:13357: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -13240,11 +13364,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13243: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:13367: 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:13247: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:13371: 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 @@ -13252,7 +13376,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13255 "configure" +#line 13379 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13271,16 +13395,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13274: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13277: \$? = $ac_status" >&5 + echo "$as_me:13401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13280: \"$ac_try\"") >&5 + { (eval echo "$as_me:13404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13283: \$? = $ac_status" >&5 + echo "$as_me:13407: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -13291,14 +13415,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13294: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:13418: 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:13301: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:13425: 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 @@ -13306,7 +13430,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13309 "configure" +#line 13433 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13325,16 +13449,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13452: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13331: \$? = $ac_status" >&5 + echo "$as_me:13455: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13334: \"$ac_try\"") >&5 + { (eval echo "$as_me:13458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13337: \$? = $ac_status" >&5 + echo "$as_me:13461: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -13345,7 +13469,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13348: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:13472: 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" @@ -13361,13 +13485,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:13364: checking for connect" >&5 + echo "$as_me:13488: 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 13370 "configure" +#line 13494 "configure" #include "confdefs.h" #define connect autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13398,16 +13522,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13401: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13404: \$? = $ac_status" >&5 + echo "$as_me:13528: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13407: \"$ac_try\"") >&5 + { (eval echo "$as_me:13531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13410: \$? = $ac_status" >&5 + echo "$as_me:13534: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -13417,11 +13541,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13420: result: $ac_cv_func_connect" >&5 +echo "$as_me:13544: 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:13424: checking for connect in -lsocket" >&5 + echo "$as_me:13548: 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 @@ -13429,7 +13553,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13432 "configure" +#line 13556 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13448,16 +13572,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13575: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13454: \$? = $ac_status" >&5 + echo "$as_me:13578: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13457: \"$ac_try\"") >&5 + { (eval echo "$as_me:13581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13460: \$? = $ac_status" >&5 + echo "$as_me:13584: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -13468,7 +13592,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13471: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:13595: 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" @@ -13477,13 +13601,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:13480: checking for remove" >&5 + echo "$as_me:13604: 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 13486 "configure" +#line 13610 "configure" #include "confdefs.h" #define remove autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13514,16 +13638,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13641: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13520: \$? = $ac_status" >&5 + echo "$as_me:13644: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13523: \"$ac_try\"") >&5 + { (eval echo "$as_me:13647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13526: \$? = $ac_status" >&5 + echo "$as_me:13650: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -13533,11 +13657,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13536: result: $ac_cv_func_remove" >&5 +echo "$as_me:13660: 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:13540: checking for remove in -lposix" >&5 + echo "$as_me:13664: 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 @@ -13545,7 +13669,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13548 "configure" +#line 13672 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13564,16 +13688,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13567: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13691: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13570: \$? = $ac_status" >&5 + echo "$as_me:13694: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13573: \"$ac_try\"") >&5 + { (eval echo "$as_me:13697: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13576: \$? = $ac_status" >&5 + echo "$as_me:13700: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -13584,7 +13708,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13587: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:13711: 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" @@ -13593,13 +13717,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:13596: checking for shmat" >&5 + echo "$as_me:13720: 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 13602 "configure" +#line 13726 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13630,16 +13754,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13633: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13757: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13636: \$? = $ac_status" >&5 + echo "$as_me:13760: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13639: \"$ac_try\"") >&5 + { (eval echo "$as_me:13763: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13642: \$? = $ac_status" >&5 + echo "$as_me:13766: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -13649,11 +13773,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13652: result: $ac_cv_func_shmat" >&5 +echo "$as_me:13776: 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:13656: checking for shmat in -lipc" >&5 + echo "$as_me:13780: 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 @@ -13661,7 +13785,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13664 "configure" +#line 13788 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13680,16 +13804,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13683: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13686: \$? = $ac_status" >&5 + echo "$as_me:13810: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13689: \"$ac_try\"") >&5 + { (eval echo "$as_me:13813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13692: \$? = $ac_status" >&5 + echo "$as_me:13816: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -13700,7 +13824,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13703: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:13827: 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" @@ -13718,7 +13842,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:13721: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:13845: 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 @@ -13726,7 +13850,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13729 "configure" +#line 13853 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13745,16 +13869,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13748: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13751: \$? = $ac_status" >&5 + echo "$as_me:13875: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13754: \"$ac_try\"") >&5 + { (eval echo "$as_me:13878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13757: \$? = $ac_status" >&5 + echo "$as_me:13881: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -13765,7 +13889,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13768: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:13892: 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" @@ -13777,7 +13901,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:13780: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:13904: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -13788,14 +13912,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:13791: result: yes" >&5 + echo "$as_me:13915: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13794: result: no" >&5 + echo "$as_me:13918: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13798: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:13922: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -13806,14 +13930,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:13809: result: yes" >&5 + echo "$as_me:13933: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13812: result: no" >&5 + echo "$as_me:13936: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13816: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:13940: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -13824,14 +13948,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:13827: result: yes" >&5 + echo "$as_me:13951: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13830: result: no" >&5 + echo "$as_me:13954: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13834: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:13958: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -13842,10 +13966,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:13845: result: yes" >&5 + echo "$as_me:13969: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13848: result: no" >&5 + echo "$as_me:13972: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13865,17 +13989,31 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:13868: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:13992: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13874: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13998: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14002: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in $cf_athena_pkg +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -13999,27 +14137,14 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxy #define $cf_x_athena_LIBS 1 EOF - for cf_trim_lib in Xmu Xt X11 - do - case "$LIBS" in - (*-l$cf_trim_lib\ *-l$cf_trim_lib*) - LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` - test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 - -echo "${as_me:-configure}:14009: testing ..trimmed $LIBS ..." 1>&5 - - ;; - esac - done - -echo "$as_me:14015: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:14140: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14022 "configure" +#line 14147 "configure" #include "confdefs.h" $ac_includes_default @@ -14037,16 +14162,16 @@ int check = XmuCompareISOLatin1("big", "small"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14040: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14043: \$? = $ac_status" >&5 + echo "$as_me:14168: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14046: \"$ac_try\"") >&5 + { (eval echo "$as_me:14171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14049: \$? = $ac_status" >&5 + echo "$as_me:14174: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -14056,7 +14181,7 @@ cf_cv_xaw_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:14184: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -14068,7 +14193,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:14196: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -14076,17 +14201,31 @@ echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:14079: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:14204: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14085: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14210: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14214: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xmu +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14204,42 +14343,103 @@ LIBS="$cf_add_libs" LIBS="$cf_save_xmu" -test -n "$verbose" && echo " ...before $LIBS" 1>&6 +cf_add_libs="$LIBS" +test -n "$verbose" && echo " ...before $cf_add_libs" 1>&6 + +echo "${as_me:-configure}:14349: testing ...before $cf_add_libs ..." 1>&5 + +for cf_add_1lib in $cf_pkgconfig_libs; do + # filter duplicates + cf_found_2lib=no + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_found_2lib=yes + break + fi + done + # if not a duplicate, find the dependent library + if test "$cf_found_2lib" = no + then + cf_found_2lib=no + cf_add_2libs= + for cf_add_2lib in $cf_add_libs + do + test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs " + cf_add_2libs="$cf_add_2libs$cf_add_2lib" + if test "x$cf_add_2lib" = "x$cf_first_lib" + then + cf_found_2lib=yes + cf_add_2libs="$cf_add_2libs $cf_add_1lib" + fi + done + if test "$cf_found_2lib" = yes + then + cf_add_libs="$cf_add_2libs" + else + test -n "$verbose" && echo " ...missed $cf_first_lib" 1>&6 + +echo "${as_me:-configure}:14381: testing ...missed $cf_first_lib ..." 1>&5 -echo "${as_me:-configure}:14209: testing ...before $LIBS ..." 1>&5 + fi + fi +done +test -n "$verbose" && echo " ...after $cf_add_libs" 1>&6 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` -test -n "$verbose" && echo " ...after $LIBS" 1>&6 +echo "${as_me:-configure}:14388: testing ...after $cf_add_libs ..." 1>&5 -echo "${as_me:-configure}:14214: testing ...after $LIBS ..." 1>&5 +LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= -test -n "$verbose" && echo " ...before $LIBS" 1>&6 +cf_add_libs="$LIBS" +test -n "$verbose" && echo " ...before $cf_add_libs" 1>&6 -echo "${as_me:-configure}:14222: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14399: testing ...before $cf_add_libs ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` -test -n "$verbose" && echo " ...after $LIBS" 1>&6 +for cf_add_1lib in -lXmu; do + # filter duplicates + cf_found_2lib=no + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_found_2lib=yes + break + fi + done + # if not a duplicate, find the dependent library + if test "$cf_found_2lib" = no + then + cf_found_2lib=no + cf_add_2libs= + for cf_add_2lib in $cf_add_libs + do + test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs " + cf_add_2libs="$cf_add_2libs$cf_add_2lib" + if test "x$cf_add_2lib" = "x$cf_first_lib" + then + cf_found_2lib=yes + cf_add_2libs="$cf_add_2libs $cf_add_1lib" + fi + done + if test "$cf_found_2lib" = yes + then + cf_add_libs="$cf_add_2libs" + else + test -n "$verbose" && echo " ...missed $cf_first_lib" 1>&6 -echo "${as_me:-configure}:14227: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14431: testing ...missed $cf_first_lib ..." 1>&5 -fi + fi + fi +done +test -n "$verbose" && echo " ...after $cf_add_libs" 1>&6 - for cf_trim_lib in Xmu Xt X11 - do - case "$LIBS" in - (*-l$cf_trim_lib\ *-l$cf_trim_lib*) - LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` - test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 +echo "${as_me:-configure}:14438: testing ...after $cf_add_libs ..." 1>&5 -echo "${as_me:-configure}:14238: testing ..trimmed $LIBS ..." 1>&5 +LIBS="$cf_add_libs" - ;; - esac - done +fi ;; esac @@ -14260,17 +14460,31 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:14263: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:14463: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14269: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14469: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14473: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in Xext +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14391,7 +14605,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:14394: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14608: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14399,7 +14613,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 14402 "configure" +#line 14616 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14418,16 +14632,16 @@ XextCreateExtension (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14635: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14424: \$? = $ac_status" >&5 + echo "$as_me:14638: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14427: \"$ac_try\"") >&5 + { (eval echo "$as_me:14641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14430: \$? = $ac_status" >&5 + echo "$as_me:14644: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -14438,7 +14652,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14441: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14655: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then @@ -14474,17 +14688,31 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14477: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14691: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14483: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14697: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14701: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in x11 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14604,24 +14832,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14607: WARNING: unable to find X11 library" >&5 + { echo "$as_me:14835: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:14614: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:14842: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14620: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14848: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14852: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in ice +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14741,24 +14983,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14744: WARNING: unable to find ICE library" >&5 + { echo "$as_me:14986: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:14751: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14993: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14757: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14999: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15003: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in sm +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14878,24 +15134,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14881: WARNING: unable to find SM library" >&5 + { echo "$as_me:15137: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14888: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:15144: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14894: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15150: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15154: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xt +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15015,7 +15285,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:15018: WARNING: unable to find Xt library" >&5 + { echo "$as_me:15288: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -15028,17 +15298,31 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:15031: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:15301: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15037: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15307: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15311: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xt +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15159,14 +15443,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:15162: checking for usable X dependency" >&5 +echo "$as_me:15446: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15169 "configure" +#line 15453 "configure" #include "confdefs.h" $ac_includes_default @@ -15186,16 +15470,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15189: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15473: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15192: \$? = $ac_status" >&5 + echo "$as_me:15476: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15195: \"$ac_try\"") >&5 + { (eval echo "$as_me:15479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15198: \$? = $ac_status" >&5 + echo "$as_me:15482: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -15205,30 +15489,44 @@ cf_cv_xt_x11_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15208: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:15492: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:15214: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:15498: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:15221: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:15505: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15227: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15511: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15515: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in x11 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15349,14 +15647,51 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= -test -n "$verbose" && echo " ...before $LIBS" 1>&6 +cf_add_libs="$LIBS" +test -n "$verbose" && echo " ...before $cf_add_libs" 1>&6 -echo "${as_me:-configure}:15354: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15653: testing ...before $cf_add_libs ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` -test -n "$verbose" && echo " ...after $LIBS" 1>&6 +for cf_add_1lib in -lX11; do + # filter duplicates + cf_found_2lib=no + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_found_2lib=yes + break + fi + done + # if not a duplicate, find the dependent library + if test "$cf_found_2lib" = no + then + cf_found_2lib=no + cf_add_2libs= + for cf_add_2lib in $cf_add_libs + do + test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs " + cf_add_2libs="$cf_add_2libs$cf_add_2lib" + if test "x$cf_add_2lib" = "x-lXt" + then + cf_found_2lib=yes + cf_add_2libs="$cf_add_2libs $cf_add_1lib" + fi + done + if test "$cf_found_2lib" = yes + then + cf_add_libs="$cf_add_2libs" + else + test -n "$verbose" && echo " ...missed -lXt" 1>&6 + +echo "${as_me:-configure}:15685: testing ...missed -lXt ..." 1>&5 + + fi + fi +done +test -n "$verbose" && echo " ...after $cf_add_libs" 1>&6 -echo "${as_me:-configure}:15359: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15692: testing ...after $cf_add_libs ..." 1>&5 + +LIBS="$cf_add_libs" fi @@ -15364,14 +15699,14 @@ fi ;; esac -echo "$as_me:15367: checking for usable X Toolkit package" >&5 +echo "$as_me:15702: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15374 "configure" +#line 15709 "configure" #include "confdefs.h" $ac_includes_default @@ -15387,16 +15722,16 @@ int num = IceConnectionNumber(0); (void) num } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15390: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15725: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15393: \$? = $ac_status" >&5 + echo "$as_me:15728: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15396: \"$ac_try\"") >&5 + { (eval echo "$as_me:15731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15399: \$? = $ac_status" >&5 + echo "$as_me:15734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -15406,7 +15741,7 @@ cf_cv_xt_ice_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:15744: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -15420,22 +15755,36 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:15423: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:15758: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:15428: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:15763: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15434: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15769: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15773: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in ice +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15554,17 +15903,31 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:15557: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:15906: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15563: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15912: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15916: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in sm +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15691,14 +16054,51 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= -test -n "$verbose" && echo " ...before $LIBS" 1>&6 +cf_add_libs="$LIBS" +test -n "$verbose" && echo " ...before $cf_add_libs" 1>&6 -echo "${as_me:-configure}:15696: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:16060: testing ...before $cf_add_libs ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` -test -n "$verbose" && echo " ...after $LIBS" 1>&6 +for cf_add_1lib in $X_PRE_LIBS; do + # filter duplicates + cf_found_2lib=no + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_found_2lib=yes + break + fi + done + # if not a duplicate, find the dependent library + if test "$cf_found_2lib" = no + then + cf_found_2lib=no + cf_add_2libs= + for cf_add_2lib in $cf_add_libs + do + test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs " + cf_add_2libs="$cf_add_2libs$cf_add_2lib" + if test "x$cf_add_2lib" = "x-lXt" + then + cf_found_2lib=yes + cf_add_2libs="$cf_add_2libs $cf_add_1lib" + fi + done + if test "$cf_found_2lib" = yes + then + cf_add_libs="$cf_add_2libs" + else + test -n "$verbose" && echo " ...missed -lXt" 1>&6 + +echo "${as_me:-configure}:16092: testing ...missed -lXt ..." 1>&5 -echo "${as_me:-configure}:15701: testing ...after $LIBS ..." 1>&5 + fi + fi +done +test -n "$verbose" && echo " ...after $cf_add_libs" 1>&6 + +echo "${as_me:-configure}:16099: testing ...after $cf_add_libs ..." 1>&5 + +LIBS="$cf_add_libs" fi @@ -15718,7 +16118,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16121: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -15803,7 +16203,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16206: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -15813,7 +16213,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16216: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -15823,7 +16223,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:15826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16226: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -15832,7 +16232,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 15835 "configure" +#line 16235 "configure" #include "confdefs.h" #include <stdio.h> int @@ -15844,16 +16244,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16247: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15850: \$? = $ac_status" >&5 + echo "$as_me:16250: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15853: \"$ac_try\"") >&5 + { (eval echo "$as_me:16253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15856: \$? = $ac_status" >&5 + echo "$as_me:16256: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15861,12 +16261,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15864: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16264: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16269: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -15874,13 +16274,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:15877: checking for XOpenDisplay" >&5 + echo "$as_me:16277: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15883 "configure" +#line 16283 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15911,16 +16311,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15914: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16314: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15917: \$? = $ac_status" >&5 + echo "$as_me:16317: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15920: \"$ac_try\"") >&5 + { (eval echo "$as_me:16320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15923: \$? = $ac_status" >&5 + echo "$as_me:16323: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -15930,13 +16330,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15933: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:16333: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test "$ac_cv_func_XOpenDisplay" = yes; then : else - echo "$as_me:15939: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:16339: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15944,7 +16344,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15947 "configure" +#line 16347 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15963,16 +16363,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16366: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15969: \$? = $ac_status" >&5 + echo "$as_me:16369: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15972: \"$ac_try\"") >&5 + { (eval echo "$as_me:16372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15975: \$? = $ac_status" >&5 + echo "$as_me:16375: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -15983,7 +16383,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15986: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:16386: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -16007,13 +16407,13 @@ fi fi - echo "$as_me:16010: checking for XtAppInitialize" >&5 + echo "$as_me:16410: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16016 "configure" +#line 16416 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16044,16 +16444,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16447: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16050: \$? = $ac_status" >&5 + echo "$as_me:16450: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16053: \"$ac_try\"") >&5 + { (eval echo "$as_me:16453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16056: \$? = $ac_status" >&5 + echo "$as_me:16456: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -16063,13 +16463,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16066: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:16466: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test "$ac_cv_func_XtAppInitialize" = yes; then : else - echo "$as_me:16072: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:16472: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16077,7 +16477,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16080 "configure" +#line 16480 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16096,16 +16496,16 @@ XtAppInitialize (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16099: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16499: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16102: \$? = $ac_status" >&5 + echo "$as_me:16502: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16105: \"$ac_try\"") >&5 + { (eval echo "$as_me:16505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16108: \$? = $ac_status" >&5 + echo "$as_me:16508: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -16116,7 +16516,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16119: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:16519: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then @@ -16133,7 +16533,7 @@ fi fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:16136: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:16536: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -16174,14 +16574,14 @@ done test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:16177: checking for $cf_test in $cf_path" >&5 + echo "$as_me:16577: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:16180: checking for $cf_test" >&5 + echo "$as_me:16580: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 16184 "configure" +#line 16584 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -16195,16 +16595,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16598: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16201: \$? = $ac_status" >&5 + echo "$as_me:16601: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16204: \"$ac_try\"") >&5 + { (eval echo "$as_me:16604: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16207: \$? = $ac_status" >&5 + echo "$as_me:16607: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -16213,7 +16613,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:16216: result: $cf_result" >&5 + echo "$as_me:16616: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -16229,7 +16629,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:16632: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -16294,10 +16694,10 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:16697: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 16300 "configure" +#line 16700 "configure" #include "confdefs.h" $ac_includes_default @@ -16314,16 +16714,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16717: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16320: \$? = $ac_status" >&5 + echo "$as_me:16720: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16323: \"$ac_try\"") >&5 + { (eval echo "$as_me:16723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16326: \$? = $ac_status" >&5 + echo "$as_me:16726: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -16332,7 +16732,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:16335: result: $cf_result" >&5 + echo "$as_me:16735: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -16349,7 +16749,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:16352: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:16752: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -16383,7 +16783,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:16386: checking for $ac_word" >&5 +echo "$as_me:16786: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16398,7 +16798,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:16401: found $ac_dir/$ac_word" >&5 +echo "$as_me:16801: found $ac_dir/$ac_word" >&5 break done @@ -16406,10 +16806,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:16409: result: $XCURSES_CONFIG" >&5 + echo "$as_me:16809: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:16412: result: no" >&5 + echo "$as_me:16812: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16422,7 +16822,7 @@ if test -z "$XCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:16425: checking for $ac_word" >&5 +echo "$as_me:16825: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16437,7 +16837,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:16440: found $ac_dir/$ac_word" >&5 +echo "$as_me:16840: found $ac_dir/$ac_word" >&5 break done @@ -16445,10 +16845,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:16848: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:16451: result: no" >&5 + echo "$as_me:16851: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16583,7 +16983,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16986: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -16668,7 +17068,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:17071: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -16678,7 +17078,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:17081: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -16688,7 +17088,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:16691: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:17091: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -16697,7 +17097,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 16700 "configure" +#line 17100 "configure" #include "confdefs.h" #include <stdio.h> int @@ -16709,16 +17109,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16712: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17112: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16715: \$? = $ac_status" >&5 + echo "$as_me:17115: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16718: \"$ac_try\"") >&5 + { (eval echo "$as_me:17118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16721: \$? = $ac_status" >&5 + echo "$as_me:17121: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16726,12 +17126,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:16729: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17129: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17134: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -16739,7 +17139,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16742: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:17142: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16747,7 +17147,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16750 "configure" +#line 17150 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16766,16 +17166,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16769: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16772: \$? = $ac_status" >&5 + echo "$as_me:17172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16775: \"$ac_try\"") >&5 + { (eval echo "$as_me:17175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16778: \$? = $ac_status" >&5 + echo "$as_me:17178: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -16786,7 +17186,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16789: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:17189: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -16808,7 +17208,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:16811: checking for XCurses library" >&5 +echo "$as_me:17211: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16831,7 +17231,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 16834 "configure" +#line 17234 "configure" #include "confdefs.h" #include <xcurses.h> @@ -16846,16 +17246,16 @@ XCursesExit(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16849: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17249: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16852: \$? = $ac_status" >&5 + echo "$as_me:17252: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16855: \"$ac_try\"") >&5 + { (eval echo "$as_me:17255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16858: \$? = $ac_status" >&5 + echo "$as_me:17258: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else @@ -16866,7 +17266,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:17269: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -16881,23 +17281,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:16884: checking for xcurses.h" >&5 + echo "$as_me:17284: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16890 "configure" +#line 17290 "configure" #include "confdefs.h" #include <xcurses.h> _ACEOF -if { (eval echo "$as_me:16894: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17294: \"$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:16900: \$? = $ac_status" >&5 + echo "$as_me:17300: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16916,7 +17316,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16919: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:17319: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test "$ac_cv_header_xcurses_h" = yes; then @@ -16927,71 +17327,78 @@ EOF fi else - { { echo "$as_me:16930: error: Cannot link with XCurses" >&5 + { { echo "$as_me:17330: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:17337: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; esac -: ${cf_nculib_root:=$cf_cv_screen} -as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:16945: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 -echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +echo "$as_me:17343: checking for _nc_init_pthreads" >&5 +echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6 +if test "${ac_cv_func__nc_init_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_nculib_root $LIBS" -cat >"conftest.$ac_ext" <<_ACEOF -#line 16953 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17349 "configure" #include "confdefs.h" +#define _nc_init_pthreads autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef _nc_init_pthreads -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char _nc_init_pthreads (void); + int main (void) { -_nc_init_pthreads (); + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub__nc_init_pthreads) || defined (__stub____nc_init_pthreads) +#error found stub for _nc_init_pthreads +#endif + + return _nc_init_pthreads (); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16972: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17380: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16975: \$? = $ac_status" >&5 + echo "$as_me:17383: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16978: \"$ac_try\"") >&5 + { (eval echo "$as_me:17386: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16981: \$? = $ac_status" >&5 + echo "$as_me:17389: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - eval "$as_ac_Lib=yes" + ac_cv_func__nc_init_pthreads=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -eval "$as_ac_Lib=no" +ac_cv_func__nc_init_pthreads=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16992: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 -if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then +echo "$as_me:17399: result: $ac_cv_func__nc_init_pthreads" >&5 +echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6 +if test "$ac_cv_func__nc_init_pthreads" = yes; then cf_cv_ncurses_pthreads=yes else cf_cv_ncurses_pthreads=no @@ -17024,7 +17431,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:17027: checking for X11 rgb file" >&5 +echo "$as_me:17434: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -17069,26 +17476,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_path" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_path" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_path="$cf_path" - case ".$cf_path" in - (.NONE/*) + case "x$cf_path" in + (xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:17496: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17096,7 +17501,7 @@ esac fi -echo "$as_me:17099: result: $RGB_PATH" >&5 +echo "$as_me:17504: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <<EOF @@ -17137,7 +17542,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:17140: checking for desired basename for form library" >&5 +echo "$as_me:17545: 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. @@ -17157,10 +17562,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:17160: result: $FORM_NAME" >&5 +echo "$as_me:17565: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:17163: checking for desired basename for menu library" >&5 +echo "$as_me:17568: 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. @@ -17180,10 +17585,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:17183: result: $MENU_NAME" >&5 +echo "$as_me:17588: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:17186: checking for desired basename for panel library" >&5 +echo "$as_me:17591: 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. @@ -17203,10 +17608,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:17206: result: $PANEL_NAME" >&5 +echo "$as_me:17611: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:17209: checking if you want to check for panel functions" >&5 +echo "$as_me:17614: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -17223,7 +17628,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:17226: result: $cf_enable_panel" >&5 +echo "$as_me:17631: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -17234,13 +17639,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 + echo "$as_me:17642: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then - echo "$as_me:17240: result: yes" >&5 + echo "$as_me:17645: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17648: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -17390,7 +17795,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17393 "configure" +#line 17798 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int @@ -17402,37 +17807,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17405: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17408: \$? = $ac_status" >&5 + echo "$as_me:17813: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17411: \"$ac_try\"") >&5 + { (eval echo "$as_me:17816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17414: \$? = $ac_status" >&5 + echo "$as_me:17819: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17420 "configure" +#line 17825 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17427: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17832: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17430: \$? = $ac_status" >&5 + echo "$as_me:17835: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17432: \"$ac_try\"") >&5 + { (eval echo "$as_me:17837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17435: \$? = $ac_status" >&5 + echo "$as_me:17840: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17449,7 +17854,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17452: result: $cf_have_curses_lib" >&5 + echo "$as_me:17857: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -17470,7 +17875,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 +echo "$as_me:17878: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17478,7 +17883,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17481 "configure" +#line 17886 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17497,16 +17902,16 @@ new_panel (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17500: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17905: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17503: \$? = $ac_status" >&5 + echo "$as_me:17908: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17506: \"$ac_try\"") >&5 + { (eval echo "$as_me:17911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17509: \$? = $ac_status" >&5 + echo "$as_me:17914: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17517,7 +17922,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17520: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17550,7 +17955,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:17553: checking if you want to check for menu functions" >&5 +echo "$as_me:17958: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -17567,7 +17972,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:17570: result: $cf_enable_menu" >&5 +echo "$as_me:17975: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -17576,14 +17981,14 @@ then ;; (curses*) -echo "$as_me:17579: checking for NetBSD menu.h" >&5 +echo "$as_me:17984: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17586 "configure" +#line 17991 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17601,16 +18006,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18009: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17607: \$? = $ac_status" >&5 + echo "$as_me:18012: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17610: \"$ac_try\"") >&5 + { (eval echo "$as_me:18015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17613: \$? = $ac_status" >&5 + echo "$as_me:18018: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_menu_h=yes @@ -17622,7 +18027,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:18030: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -17639,13 +18044,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 + echo "$as_me:18047: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then - echo "$as_me:17645: result: yes" >&5 + echo "$as_me:18050: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:18053: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -17795,7 +18200,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17798 "configure" +#line 18203 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int @@ -17807,37 +18212,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17810: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18215: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17813: \$? = $ac_status" >&5 + echo "$as_me:18218: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17816: \"$ac_try\"") >&5 + { (eval echo "$as_me:18221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17819: \$? = $ac_status" >&5 + echo "$as_me:18224: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17825 "configure" +#line 18230 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17832: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17835: \$? = $ac_status" >&5 + echo "$as_me:18240: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17837: \"$ac_try\"") >&5 + { (eval echo "$as_me:18242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17840: \$? = $ac_status" >&5 + echo "$as_me:18245: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17854,7 +18259,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17857: result: $cf_have_curses_lib" >&5 + echo "$as_me:18262: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -17875,7 +18280,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 +echo "$as_me:18283: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17883,7 +18288,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17886 "configure" +#line 18291 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17902,16 +18307,16 @@ menu_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17905: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18310: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17908: \$? = $ac_status" >&5 + echo "$as_me:18313: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17911: \"$ac_try\"") >&5 + { (eval echo "$as_me:18316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17914: \$? = $ac_status" >&5 + echo "$as_me:18319: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17922,7 +18327,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18330: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17955,7 +18360,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:17958: checking if you want to check for form functions" >&5 +echo "$as_me:18363: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -17972,7 +18377,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:17975: result: $cf_enable_form" >&5 +echo "$as_me:18380: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -17981,14 +18386,14 @@ then ;; (curses*) -echo "$as_me:17984: checking for NetBSD form.h" >&5 +echo "$as_me:18389: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17991 "configure" +#line 18396 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18007,16 +18412,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18415: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18013: \$? = $ac_status" >&5 + echo "$as_me:18418: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18016: \"$ac_try\"") >&5 + { (eval echo "$as_me:18421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18019: \$? = $ac_status" >&5 + echo "$as_me:18424: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_form_h=yes @@ -18028,7 +18433,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:18436: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -18045,13 +18450,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 + echo "$as_me:18453: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then - echo "$as_me:18051: result: yes" >&5 + echo "$as_me:18456: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:18459: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -18201,7 +18606,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 18204 "configure" +#line 18609 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int @@ -18213,37 +18618,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18219: \$? = $ac_status" >&5 + echo "$as_me:18624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18222: \"$ac_try\"") >&5 + { (eval echo "$as_me:18627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18225: \$? = $ac_status" >&5 + echo "$as_me:18630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 18231 "configure" +#line 18636 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:18238: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18643: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18241: \$? = $ac_status" >&5 + echo "$as_me:18646: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:18243: \"$ac_try\"") >&5 + { (eval echo "$as_me:18648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18246: \$? = $ac_status" >&5 + echo "$as_me:18651: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -18260,7 +18665,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:18263: result: $cf_have_curses_lib" >&5 + echo "$as_me:18668: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -18281,7 +18686,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 +echo "$as_me:18689: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18289,7 +18694,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18292 "configure" +#line 18697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18308,16 +18713,16 @@ form_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18314: \$? = $ac_status" >&5 + echo "$as_me:18719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18317: \"$ac_try\"") >&5 + { (eval echo "$as_me:18722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18320: \$? = $ac_status" >&5 + echo "$as_me:18725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -18328,7 +18733,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18331: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18736: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -18366,23 +18771,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18369: checking for $ac_header" >&5 +echo "$as_me:18774: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18375 "configure" +#line 18780 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18379: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18784: \"$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:18385: \$? = $ac_status" >&5 + echo "$as_me:18790: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18401,7 +18806,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18809: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -18411,13 +18816,13 @@ EOF fi done -echo "$as_me:18414: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18819: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18420 "configure" +#line 18825 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -18433,16 +18838,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18841: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18439: \$? = $ac_status" >&5 + echo "$as_me:18844: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18442: \"$ac_try\"") >&5 + { (eval echo "$as_me:18847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18445: \$? = $ac_status" >&5 + echo "$as_me:18850: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -18452,7 +18857,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18455: result: $ac_cv_header_time" >&5 +echo "$as_me:18860: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -18463,7 +18868,6 @@ EOF fi for ac_header in \ -getopt.h \ locale.h \ math.h \ stdarg.h \ @@ -18471,27 +18875,26 @@ sys/ioctl.h \ sys/select.h \ sys/time.h \ termios.h \ -unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18478: checking for $ac_header" >&5 +echo "$as_me:18881: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18484 "configure" +#line 18887 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18488: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18891: \"$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:18494: \$? = $ac_status" >&5 + echo "$as_me:18897: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18510,7 +18913,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18916: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -18520,26 +18923,26 @@ EOF fi done -for ac_header in unistd.h getopt.h +for ac_header in getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18526: checking for $ac_header" >&5 +echo "$as_me:18929: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18532 "configure" +#line 18935 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18536: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18939: \"$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:18542: \$? = $ac_status" >&5 + echo "$as_me:18945: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18558,7 +18961,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18964: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -18568,7 +18971,7 @@ EOF fi done -echo "$as_me:18571: checking for header declaring getopt variables" >&5 +echo "$as_me:18974: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18578,7 +18981,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18581 "configure" +#line 18984 "configure" #include "confdefs.h" #include <$cf_header> @@ -18591,16 +18994,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18997: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18597: \$? = $ac_status" >&5 + echo "$as_me:19000: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18600: \"$ac_try\"") >&5 + { (eval echo "$as_me:19003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18603: \$? = $ac_status" >&5 + echo "$as_me:19006: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -18612,7 +19015,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18615: result: $cf_cv_getopt_header" >&5 +echo "$as_me:19018: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -18629,36 +19032,162 @@ EOF fi -echo "$as_me:18632: checking for clock_gettime" >&5 +cf_save_libs="$LIBS" +echo "$as_me:19036: checking for clock_gettime" >&5 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 19042 "configure" +#include "confdefs.h" +#define clock_gettime autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime +#endif + + return clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19073: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19076: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19079: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19082: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:19092: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes +else + echo "$as_me:19097: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19105 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19124: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:19144: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no +fi + +fi + +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:19156: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18639 "configure" +#line 19163 "configure" #include "confdefs.h" + +$ac_includes_default #include <time.h> + int main (void) { struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19181: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18655: \$? = $ac_status" >&5 + echo "$as_me:19184: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18658: \"$ac_try\"") >&5 + { (eval echo "$as_me:19187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18661: \$? = $ac_status" >&5 + echo "$as_me:19190: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -18669,8 +19198,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18672: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:19201: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -18680,13 +19212,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18683: checking for gettimeofday" >&5 +echo "$as_me:19215: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18689 "configure" +#line 19221 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18717,16 +19249,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19252: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18723: \$? = $ac_status" >&5 + echo "$as_me:19255: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18726: \"$ac_try\"") >&5 + { (eval echo "$as_me:19258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18729: \$? = $ac_status" >&5 + echo "$as_me:19261: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -18736,7 +19268,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18739: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:19271: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -18746,7 +19278,7 @@ EOF else -echo "$as_me:18749: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:19281: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18754,7 +19286,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18757 "configure" +#line 19289 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18773,16 +19305,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18776: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19308: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18779: \$? = $ac_status" >&5 + echo "$as_me:19311: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18782: \"$ac_try\"") >&5 + { (eval echo "$as_me:19314: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18785: \$? = $ac_status" >&5 + echo "$as_me:19317: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -18793,7 +19325,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18796: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:19328: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -18831,13 +19363,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18834: checking for $ac_func" >&5 +echo "$as_me:19366: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18840 "configure" +#line 19372 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18868,16 +19400,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18874: \$? = $ac_status" >&5 + echo "$as_me:19406: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18877: \"$ac_try\"") >&5 + { (eval echo "$as_me:19409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18880: \$? = $ac_status" >&5 + echo "$as_me:19412: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18887,7 +19419,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18890: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19422: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -18898,14 +19430,14 @@ fi done # use a compile-check to work with ncurses*-config and subdirectory includes -echo "$as_me:18901: checking if we can use termcap.h" >&5 +echo "$as_me:19433: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18908 "configure" +#line 19440 "configure" #include "confdefs.h" #include <curses.h> @@ -18926,16 +19458,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18929: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18932: \$? = $ac_status" >&5 + echo "$as_me:19464: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18935: \"$ac_try\"") >&5 + { (eval echo "$as_me:19467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18938: \$? = $ac_status" >&5 + echo "$as_me:19470: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else @@ -18945,7 +19477,7 @@ cf_cv_have_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18948: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:19480: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -18955,14 +19487,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18958: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:19490: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18965 "configure" +#line 19497 "configure" #include "confdefs.h" #include <ncurses/curses.h> @@ -18983,16 +19515,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18986: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18989: \$? = $ac_status" >&5 + echo "$as_me:19521: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18992: \"$ac_try\"") >&5 + { (eval echo "$as_me:19524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18995: \$? = $ac_status" >&5 + echo "$as_me:19527: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -19002,7 +19534,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19005: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:19537: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -19012,7 +19544,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:19015: error: getopt is required for building programs" >&5 + { { echo "$as_me:19547: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -19028,16 +19560,17 @@ mbstowcs \ mbtowc \ wcsrtombs \ wcstombs \ +wcwidth \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:19034: checking for $ac_func" >&5 +echo "$as_me:19567: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19040 "configure" +#line 19573 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19068,16 +19601,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19071: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19074: \$? = $ac_status" >&5 + echo "$as_me:19607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19077: \"$ac_try\"") >&5 + { (eval echo "$as_me:19610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19080: \$? = $ac_status" >&5 + echo "$as_me:19613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -19087,7 +19620,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19090: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19623: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -19099,7 +19632,7 @@ done fi -echo "$as_me:19102: checking definition to turn on extended curses functions" >&5 +echo "$as_me:19635: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19107,7 +19640,7 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 19110 "configure" +#line 19643 "configure" #include "confdefs.h" $ac_includes_default @@ -19140,16 +19673,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19143: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19146: \$? = $ac_status" >&5 + echo "$as_me:19679: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19149: \"$ac_try\"") >&5 + { (eval echo "$as_me:19682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19152: \$? = $ac_status" >&5 + echo "$as_me:19685: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -19159,7 +19692,7 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 19162 "configure" +#line 19695 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -19185,16 +19718,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19188: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19721: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19191: \$? = $ac_status" >&5 + echo "$as_me:19724: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19194: \"$ac_try\"") >&5 + { (eval echo "$as_me:19727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19197: \$? = $ac_status" >&5 + echo "$as_me:19730: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -19208,7 +19741,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19211: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:19744: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -19220,7 +19753,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:19223: checking for term.h" >&5 +echo "$as_me:19756: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19241,7 +19774,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 19244 "configure" +#line 19777 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19255,16 +19788,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19258: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19261: \$? = $ac_status" >&5 + echo "$as_me:19794: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19264: \"$ac_try\"") >&5 + { (eval echo "$as_me:19797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19267: \$? = $ac_status" >&5 + echo "$as_me:19800: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -19283,7 +19816,7 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19286 "configure" +#line 19819 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19301,16 +19834,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19837: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19307: \$? = $ac_status" >&5 + echo "$as_me:19840: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19310: \"$ac_try\"") >&5 + { (eval echo "$as_me:19843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19313: \$? = $ac_status" >&5 + echo "$as_me:19846: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -19325,7 +19858,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:19328: result: $cf_cv_term_header" >&5 +echo "$as_me:19861: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -19352,7 +19885,7 @@ EOF ;; esac -echo "$as_me:19355: checking for unctrl.h" >&5 +echo "$as_me:19888: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19373,7 +19906,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 19376 "configure" +#line 19909 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19387,16 +19920,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19923: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19393: \$? = $ac_status" >&5 + echo "$as_me:19926: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19396: \"$ac_try\"") >&5 + { (eval echo "$as_me:19929: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19399: \$? = $ac_status" >&5 + echo "$as_me:19932: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -19409,12 +19942,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:19412: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:19945: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:19417: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:19950: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -19512,10 +20045,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19515: checking for ${cf_func}" >&5 + echo "$as_me:20048: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19518: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:20051: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19524,7 +20057,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19527 "configure" +#line 20060 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19557,16 +20090,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19560: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19563: \$? = $ac_status" >&5 + echo "$as_me:20096: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19566: \"$ac_try\"") >&5 + { (eval echo "$as_me:20099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19569: \$? = $ac_status" >&5 + echo "$as_me:20102: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19582,7 +20115,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19585: result: $cf_result" >&5 + echo "$as_me:20118: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <<EOF @@ -19597,10 +20130,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19600: checking for ${cf_func}" >&5 + echo "$as_me:20133: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19603: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:20136: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19609,7 +20142,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19612 "configure" +#line 20145 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19642,16 +20175,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19645: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20178: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19648: \$? = $ac_status" >&5 + echo "$as_me:20181: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19651: \"$ac_try\"") >&5 + { (eval echo "$as_me:20184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19654: \$? = $ac_status" >&5 + echo "$as_me:20187: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19667,7 +20200,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19670: result: $cf_result" >&5 + echo "$as_me:20203: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <<EOF @@ -19691,7 +20224,7 @@ then cf_return="return value" fi cat >"conftest.$ac_ext" <<_ACEOF -#line 19694 "configure" +#line 20227 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19711,21 +20244,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19717: \$? = $ac_status" >&5 + echo "$as_me:20250: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19720: \"$ac_try\"") >&5 + { (eval echo "$as_me:20253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19723: \$? = $ac_status" >&5 + echo "$as_me:20256: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:19728: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:20261: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <<EOF #define TPUTS_ARG $cf_arg @@ -19745,14 +20278,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:19748: checking for ncurses extended functions" >&5 +echo "$as_me:20281: 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 19755 "configure" +#line 20288 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19767,16 +20300,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19770: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19773: \$? = $ac_status" >&5 + echo "$as_me:20306: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19776: \"$ac_try\"") >&5 + { (eval echo "$as_me:20309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19779: \$? = $ac_status" >&5 + echo "$as_me:20312: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -19784,7 +20317,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 19787 "configure" +#line 20320 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19809,16 +20342,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19812: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19815: \$? = $ac_status" >&5 + echo "$as_me:20348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19818: \"$ac_try\"") >&5 + { (eval echo "$as_me:20351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19821: \$? = $ac_status" >&5 + echo "$as_me:20354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -19832,7 +20365,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19835: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:20368: 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 @@ -19846,11 +20379,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:19849: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:20382: 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 19853 "configure" +#line 20386 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19863,16 +20396,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20399: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19869: \$? = $ac_status" >&5 + echo "$as_me:20402: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19872: \"$ac_try\"") >&5 + { (eval echo "$as_me:20405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19875: \$? = $ac_status" >&5 + echo "$as_me:20408: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19881,7 +20414,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 19884 "configure" +#line 20417 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19894,16 +20427,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20430: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19900: \$? = $ac_status" >&5 + echo "$as_me:20433: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19903: \"$ac_try\"") >&5 + { (eval echo "$as_me:20436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19906: \$? = $ac_status" >&5 + echo "$as_me:20439: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -19914,7 +20447,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:19917: result: $cf_define_xpg5" >&5 + echo "$as_me:20450: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -19923,14 +20456,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:19926: checking for wide-character functions" >&5 + echo "$as_me:20459: 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 19933 "configure" +#line 20466 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19947,16 +20480,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19950: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20483: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19953: \$? = $ac_status" >&5 + echo "$as_me:20486: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19956: \"$ac_try\"") >&5 + { (eval echo "$as_me:20489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19959: \$? = $ac_status" >&5 + echo "$as_me:20492: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -19967,7 +20500,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19970: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:20503: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -19988,14 +20521,14 @@ EOF fi -echo "$as_me:19991: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:20524: 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 19998 "configure" +#line 20531 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -20013,16 +20546,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20549: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20019: \$? = $ac_status" >&5 + echo "$as_me:20552: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20022: \"$ac_try\"") >&5 + { (eval echo "$as_me:20555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20025: \$? = $ac_status" >&5 + echo "$as_me:20558: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -20033,21 +20566,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20036: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:20569: 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:20043: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:20576: 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 20050 "configure" +#line 20583 "configure" #include "confdefs.h" #include <sys/types.h> @@ -20067,16 +20600,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20070: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20603: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20073: \$? = $ac_status" >&5 + echo "$as_me:20606: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20076: \"$ac_try\"") >&5 + { (eval echo "$as_me:20609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20079: \$? = $ac_status" >&5 + echo "$as_me:20612: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -20088,7 +20621,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20091: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:20624: 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 @@ -20097,7 +20630,7 @@ EOF # special check for test/ditto.c -echo "$as_me:20100: checking for openpty in -lutil" >&5 +echo "$as_me:20633: 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 @@ -20105,7 +20638,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20108 "configure" +#line 20641 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20124,16 +20657,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20127: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20660: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20130: \$? = $ac_status" >&5 + echo "$as_me:20663: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20133: \"$ac_try\"") >&5 + { (eval echo "$as_me:20666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20136: \$? = $ac_status" >&5 + echo "$as_me:20669: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -20144,7 +20677,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20147: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:20680: 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 @@ -20152,7 +20685,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:20155: checking for openpty header" >&5 +echo "$as_me:20688: 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 @@ -20179,7 +20712,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20182 "configure" +#line 20715 "configure" #include "confdefs.h" #include <$cf_header> @@ -20197,16 +20730,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20200: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20203: \$? = $ac_status" >&5 + echo "$as_me:20736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20206: \"$ac_try\"") >&5 + { (eval echo "$as_me:20739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20209: \$? = $ac_status" >&5 + echo "$as_me:20742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -20224,7 +20757,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:20227: result: $cf_cv_func_openpty" >&5 +echo "$as_me:20760: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -20258,7 +20791,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:20261: checking for function curses_version" >&5 +echo "$as_me:20794: 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 @@ -20268,7 +20801,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 20271 "configure" +#line 20804 "configure" #include "confdefs.h" $ac_includes_default @@ -20284,15 +20817,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20287: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20290: \$? = $ac_status" >&5 + echo "$as_me:20823: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20292: \"$ac_try\"") >&5 + { (eval echo "$as_me:20825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20295: \$? = $ac_status" >&5 + echo "$as_me:20828: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -20307,14 +20840,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:20310: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:20843: 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:20317: checking for alternate character set array" >&5 +echo "$as_me:20850: 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 @@ -20324,7 +20857,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 20327 "configure" +#line 20860 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -20340,16 +20873,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20346: \$? = $ac_status" >&5 + echo "$as_me:20879: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20349: \"$ac_try\"") >&5 + { (eval echo "$as_me:20882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20352: \$? = $ac_status" >&5 + echo "$as_me:20885: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -20360,7 +20893,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:20363: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:20896: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -20370,7 +20903,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:20373: checking for wide alternate character set array" >&5 +echo "$as_me:20906: 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 @@ -20380,7 +20913,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 20383 "configure" +#line 20916 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20396,16 +20929,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20399: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20932: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20402: \$? = $ac_status" >&5 + echo "$as_me:20935: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20405: \"$ac_try\"") >&5 + { (eval echo "$as_me:20938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20408: \$? = $ac_status" >&5 + echo "$as_me:20941: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -20416,7 +20949,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:20419: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:20952: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -20424,7 +20957,7 @@ cat >>confdefs.h <<EOF #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map EOF -echo "$as_me:20427: checking for wide alternate character constants" >&5 +echo "$as_me:20960: 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 @@ -20434,7 +20967,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 20437 "configure" +#line 20970 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20451,16 +20984,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20454: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20457: \$? = $ac_status" >&5 + echo "$as_me:20990: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20460: \"$ac_try\"") >&5 + { (eval echo "$as_me:20993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20463: \$? = $ac_status" >&5 + echo "$as_me:20996: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20470,7 +21003,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20473 "configure" +#line 21006 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20486,16 +21019,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20489: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21022: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20492: \$? = $ac_status" >&5 + echo "$as_me:21025: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20495: \"$ac_try\"") >&5 + { (eval echo "$as_me:21028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20498: \$? = $ac_status" >&5 + echo "$as_me:21031: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20506,7 +21039,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:20509: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:21042: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -20516,10 +21049,10 @@ EOF fi -echo "$as_me:20519: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21052: 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 20522 "configure" +#line 21055 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20537,16 +21070,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20540: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20543: \$? = $ac_status" >&5 + echo "$as_me:21076: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20546: \"$ac_try\"") >&5 + { (eval echo "$as_me:21079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20549: \$? = $ac_status" >&5 + echo "$as_me:21082: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20555,7 +21088,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20558: result: $cf_result" >&5 +echo "$as_me:21091: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20576,14 +21109,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:20579: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:21112: 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 20586 "configure" +#line 21119 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20601,23 +21134,23 @@ mbstate_t state; (void)state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20607: \$? = $ac_status" >&5 + echo "$as_me:21140: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20610: \"$ac_try\"") >&5 + { (eval echo "$as_me:21143: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20613: \$? = $ac_status" >&5 + echo "$as_me:21146: \$? = $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 20620 "configure" +#line 21153 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20636,16 +21169,16 @@ mbstate_t value; (void) value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21172: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20642: \$? = $ac_status" >&5 + echo "$as_me:21175: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20645: \"$ac_try\"") >&5 + { (eval echo "$as_me:21178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20648: \$? = $ac_status" >&5 + echo "$as_me:21181: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -20657,7 +21190,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20660: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:21193: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -20680,14 +21213,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:20683: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:21216: 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 20690 "configure" +#line 21223 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20705,23 +21238,23 @@ wchar_t state; (void)state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20708: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21241: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20711: \$? = $ac_status" >&5 + echo "$as_me:21244: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20714: \"$ac_try\"") >&5 + { (eval echo "$as_me:21247: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20717: \$? = $ac_status" >&5 + echo "$as_me:21250: \$? = $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 20724 "configure" +#line 21257 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20740,16 +21273,16 @@ wchar_t value; (void) value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21276: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20746: \$? = $ac_status" >&5 + echo "$as_me:21279: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20749: \"$ac_try\"") >&5 + { (eval echo "$as_me:21282: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20752: \$? = $ac_status" >&5 + echo "$as_me:21285: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -20761,7 +21294,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20764: result: $cf_cv_wchar_t" >&5 +echo "$as_me:21297: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -20784,14 +21317,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:20787: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:21320: 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 20794 "configure" +#line 21327 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20809,23 +21342,23 @@ wint_t state; (void)state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21345: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20815: \$? = $ac_status" >&5 + echo "$as_me:21348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20818: \"$ac_try\"") >&5 + { (eval echo "$as_me:21351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20821: \$? = $ac_status" >&5 + echo "$as_me:21354: \$? = $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 20828 "configure" +#line 21361 "configure" #include "confdefs.h" #include <stdlib.h> @@ -20844,16 +21377,16 @@ wint_t value; (void) value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21380: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20850: \$? = $ac_status" >&5 + echo "$as_me:21383: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20853: \"$ac_try\"") >&5 + { (eval echo "$as_me:21386: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20856: \$? = $ac_status" >&5 + echo "$as_me:21389: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -20865,7 +21398,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20868: result: $cf_cv_wint_t" >&5 +echo "$as_me:21401: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -20889,10 +21422,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:20892: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21425: 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 20895 "configure" +#line 21428 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20910,16 +21443,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20913: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20916: \$? = $ac_status" >&5 + echo "$as_me:21449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20919: \"$ac_try\"") >&5 + { (eval echo "$as_me:21452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20922: \$? = $ac_status" >&5 + echo "$as_me:21455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20928,7 +21461,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20931: result: $cf_result" >&5 +echo "$as_me:21464: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20950,10 +21483,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:20953: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21486: 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 20956 "configure" +#line 21489 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20971,16 +21504,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21507: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20977: \$? = $ac_status" >&5 + echo "$as_me:21510: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20980: \"$ac_try\"") >&5 + { (eval echo "$as_me:21513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20983: \$? = $ac_status" >&5 + echo "$as_me:21516: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20989,7 +21522,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20992: result: $cf_result" >&5 +echo "$as_me:21525: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21011,10 +21544,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:21014: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21547: 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 21017 "configure" +#line 21550 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -21032,16 +21565,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21038: \$? = $ac_status" >&5 + echo "$as_me:21571: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21041: \"$ac_try\"") >&5 + { (eval echo "$as_me:21574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21044: \$? = $ac_status" >&5 + echo "$as_me:21577: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -21050,7 +21583,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:21053: result: $cf_result" >&5 +echo "$as_me:21586: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21079,11 +21612,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:21082: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21615: 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 21086 "configure" +#line 21619 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21116,16 +21649,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21652: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21122: \$? = $ac_status" >&5 + echo "$as_me:21655: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21125: \"$ac_try\"") >&5 + { (eval echo "$as_me:21658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21128: \$? = $ac_status" >&5 + echo "$as_me:21661: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -21135,7 +21668,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:21138: result: $cf_result" >&5 +echo "$as_me:21671: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21147,14 +21680,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:21150: checking for data $cf_data in library" >&5 + echo "$as_me:21683: 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 21157 "configure" +#line 21690 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21193,16 +21726,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21729: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21199: \$? = $ac_status" >&5 + echo "$as_me:21732: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21202: \"$ac_try\"") >&5 + { (eval echo "$as_me:21735: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21205: \$? = $ac_status" >&5 + echo "$as_me:21738: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -21214,7 +21747,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 21217 "configure" +#line 21750 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21246,15 +21779,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21249: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21782: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21252: \$? = $ac_status" >&5 + echo "$as_me:21785: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21254: \"$ac_try\"") >&5 + { (eval echo "$as_me:21787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21257: \$? = $ac_status" >&5 + echo "$as_me:21790: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -21266,7 +21799,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:21269: result: $cf_result" >&5 + echo "$as_me:21802: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21283,7 +21816,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:21286: checking for X" >&5 + echo "$as_me:21819: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -21387,17 +21920,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 21390 "configure" +#line 21923 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:21394: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:21927: \"$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:21400: \$? = $ac_status" >&5 + echo "$as_me:21933: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -21430,7 +21963,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21433 "configure" +#line 21966 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -21442,16 +21975,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21445: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21448: \$? = $ac_status" >&5 + echo "$as_me:21981: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21451: \"$ac_try\"") >&5 + { (eval echo "$as_me:21984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21454: \$? = $ac_status" >&5 + echo "$as_me:21987: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -21489,7 +22022,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:21492: result: $have_x" >&5 + echo "$as_me:22025: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -21499,7 +22032,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:21502: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:22035: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21526,11 +22059,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21529: checking whether -R must be followed by a space" >&5 + echo "$as_me:22062: 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 21533 "configure" +#line 22066 "configure" #include "confdefs.h" int @@ -21542,16 +22075,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21548: \$? = $ac_status" >&5 + echo "$as_me:22081: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21551: \"$ac_try\"") >&5 + { (eval echo "$as_me:22084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21554: \$? = $ac_status" >&5 + echo "$as_me:22087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -21561,13 +22094,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:21564: result: no" >&5 + echo "$as_me:22097: 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 21570 "configure" +#line 22103 "configure" #include "confdefs.h" int @@ -21579,16 +22112,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22115: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21585: \$? = $ac_status" >&5 + echo "$as_me:22118: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21588: \"$ac_try\"") >&5 + { (eval echo "$as_me:22121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21591: \$? = $ac_status" >&5 + echo "$as_me:22124: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -21598,11 +22131,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:21601: result: yes" >&5 + echo "$as_me:22134: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21605: result: neither works" >&5 + echo "$as_me:22138: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21622,7 +22155,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 21625 "configure" +#line 22158 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21641,22 +22174,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21647: \$? = $ac_status" >&5 + echo "$as_me:22180: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21650: \"$ac_try\"") >&5 + { (eval echo "$as_me:22183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21653: \$? = $ac_status" >&5 + echo "$as_me:22186: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21659: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:22192: 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 @@ -21664,7 +22197,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21667 "configure" +#line 22200 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21683,16 +22216,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22219: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21689: \$? = $ac_status" >&5 + echo "$as_me:22222: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21692: \"$ac_try\"") >&5 + { (eval echo "$as_me:22225: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21695: \$? = $ac_status" >&5 + echo "$as_me:22228: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21703,14 +22236,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21706: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:22239: 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:21713: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:22246: 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 @@ -21718,7 +22251,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21721 "configure" +#line 22254 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21737,16 +22270,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21740: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22273: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21743: \$? = $ac_status" >&5 + echo "$as_me:22276: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21746: \"$ac_try\"") >&5 + { (eval echo "$as_me:22279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21749: \$? = $ac_status" >&5 + echo "$as_me:22282: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21757,7 +22290,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21760: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:22293: 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" @@ -21776,13 +22309,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:21779: checking for gethostbyname" >&5 + echo "$as_me:22312: 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 21785 "configure" +#line 22318 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21813,16 +22346,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21816: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22349: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21819: \$? = $ac_status" >&5 + echo "$as_me:22352: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21822: \"$ac_try\"") >&5 + { (eval echo "$as_me:22355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21825: \$? = $ac_status" >&5 + echo "$as_me:22358: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -21832,11 +22365,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21835: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:22368: 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:21839: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:22372: 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 @@ -21844,7 +22377,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21847 "configure" +#line 22380 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21863,16 +22396,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21866: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21869: \$? = $ac_status" >&5 + echo "$as_me:22402: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21872: \"$ac_try\"") >&5 + { (eval echo "$as_me:22405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21875: \$? = $ac_status" >&5 + echo "$as_me:22408: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21883,14 +22416,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21886: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:22419: 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:21893: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:22426: 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 @@ -21898,7 +22431,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21901 "configure" +#line 22434 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21917,16 +22450,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21920: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22453: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21923: \$? = $ac_status" >&5 + echo "$as_me:22456: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21926: \"$ac_try\"") >&5 + { (eval echo "$as_me:22459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21929: \$? = $ac_status" >&5 + echo "$as_me:22462: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21937,7 +22470,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21940: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:22473: 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" @@ -21953,13 +22486,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:21956: checking for connect" >&5 + echo "$as_me:22489: 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 21962 "configure" +#line 22495 "configure" #include "confdefs.h" #define connect autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21990,16 +22523,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21993: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22526: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21996: \$? = $ac_status" >&5 + echo "$as_me:22529: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21999: \"$ac_try\"") >&5 + { (eval echo "$as_me:22532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22002: \$? = $ac_status" >&5 + echo "$as_me:22535: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -22009,11 +22542,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22012: result: $ac_cv_func_connect" >&5 +echo "$as_me:22545: 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:22016: checking for connect in -lsocket" >&5 + echo "$as_me:22549: 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 @@ -22021,7 +22554,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22024 "configure" +#line 22557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22040,16 +22573,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22043: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22046: \$? = $ac_status" >&5 + echo "$as_me:22579: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22049: \"$ac_try\"") >&5 + { (eval echo "$as_me:22582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22052: \$? = $ac_status" >&5 + echo "$as_me:22585: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -22060,7 +22593,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22063: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:22596: 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" @@ -22069,13 +22602,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:22072: checking for remove" >&5 + echo "$as_me:22605: 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 22078 "configure" +#line 22611 "configure" #include "confdefs.h" #define remove autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22106,16 +22639,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22109: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22642: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22112: \$? = $ac_status" >&5 + echo "$as_me:22645: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22115: \"$ac_try\"") >&5 + { (eval echo "$as_me:22648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22118: \$? = $ac_status" >&5 + echo "$as_me:22651: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -22125,11 +22658,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22128: result: $ac_cv_func_remove" >&5 +echo "$as_me:22661: 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:22132: checking for remove in -lposix" >&5 + echo "$as_me:22665: 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 @@ -22137,7 +22670,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22140 "configure" +#line 22673 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22156,16 +22689,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22159: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22692: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22162: \$? = $ac_status" >&5 + echo "$as_me:22695: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22165: \"$ac_try\"") >&5 + { (eval echo "$as_me:22698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22168: \$? = $ac_status" >&5 + echo "$as_me:22701: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -22176,7 +22709,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22179: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:22712: 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" @@ -22185,13 +22718,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:22188: checking for shmat" >&5 + echo "$as_me:22721: 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 22194 "configure" +#line 22727 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22222,16 +22755,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22225: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22758: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22228: \$? = $ac_status" >&5 + echo "$as_me:22761: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22231: \"$ac_try\"") >&5 + { (eval echo "$as_me:22764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22234: \$? = $ac_status" >&5 + echo "$as_me:22767: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -22241,11 +22774,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22244: result: $ac_cv_func_shmat" >&5 +echo "$as_me:22777: 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:22248: checking for shmat in -lipc" >&5 + echo "$as_me:22781: 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 @@ -22253,7 +22786,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22256 "configure" +#line 22789 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22272,16 +22805,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22275: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22278: \$? = $ac_status" >&5 + echo "$as_me:22811: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22281: \"$ac_try\"") >&5 + { (eval echo "$as_me:22814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22284: \$? = $ac_status" >&5 + echo "$as_me:22817: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -22292,7 +22825,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22295: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:22828: 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" @@ -22310,7 +22843,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:22313: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:22846: 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 @@ -22318,7 +22851,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22321 "configure" +#line 22854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22337,16 +22870,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22343: \$? = $ac_status" >&5 + echo "$as_me:22876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22346: \"$ac_try\"") >&5 + { (eval echo "$as_me:22879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22349: \$? = $ac_status" >&5 + echo "$as_me:22882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -22357,7 +22890,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22360: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:22893: 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" @@ -22404,16 +22937,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:22407: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22940: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:22412: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22945: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22416: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22949: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22452,16 +22985,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22455: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22988: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22460: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22993: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22464: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22997: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22500,23 +23033,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23036: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22508: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23041: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22512: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:23045: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:22519: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:23052: 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. @@ -22533,7 +23066,7 @@ else enable_warnings=no fi; -echo "$as_me:22536: result: $enable_warnings" >&5 +echo "$as_me:23069: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -22556,10 +23089,12 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:22559: checking for $CC __attribute__ directives..." >&5 -echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + echo "$as_me:23092: checking for $CC __attribute__ directives" >&5 +echo $ECHO_N "checking for $CC __attribute__ directives... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:23094: result: " >&5 +echo "${ECHO_T}" >&6 cat > "conftest.$ac_ext" <<EOF -#line 22562 "${as_me:-configure}" +#line 23097 "${as_me:-configure}" #include <stdio.h> #include "confdefs.h" #include "conftest.h" @@ -22609,12 +23144,12 @@ EOF ;; esac - if { (eval echo "$as_me:22612: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22615: \$? = $ac_status" >&5 + echo "$as_me:23150: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22617: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:23152: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -22692,10 +23227,10 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 22695 "configure" +#line 23230 "configure" #include "confdefs.h" -#include <stdlib.h> +$ac_includes_default #include <X11/Intrinsic.h> int @@ -22707,32 +23242,32 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23245: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22713: \$? = $ac_status" >&5 + echo "$as_me:23248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22716: \"$ac_try\"") >&5 + { (eval echo "$as_me:23251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22719: \$? = $ac_status" >&5 + echo "$as_me:23254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:22722: checking for X11/Xt const-feature" >&5 +echo "$as_me:23257: 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 22729 "configure" +#line 23264 "configure" #include "confdefs.h" #undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include <stdlib.h> +$ac_includes_default #include <X11/Intrinsic.h> int @@ -22744,16 +23279,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23282: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22750: \$? = $ac_status" >&5 + echo "$as_me:23285: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22753: \"$ac_try\"") >&5 + { (eval echo "$as_me:23288: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22756: \$? = $ac_status" >&5 + echo "$as_me:23291: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -22768,7 +23303,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22771: result: $cf_cv_const_x_string" >&5 +echo "$as_me:23306: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -22797,7 +23332,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <<EOF -#line 22800 "${as_me:-configure}" +#line 23335 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF if test "$INTEL_COMPILER" = yes @@ -22813,8 +23348,10 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:22816: checking for $CC warning options..." >&5 -echo "$as_me: checking for $CC warning options..." >&6;} + echo "$as_me:23351: checking for $CC warning options" >&5 +echo $ECHO_N "checking for $CC warning options... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:23353: result: " >&5 +echo "${ECHO_T}" >&6 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ @@ -22829,12 +23366,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:22832: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23369: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22835: \$? = $ac_status" >&5 + echo "$as_me:23372: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22837: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:23374: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -22842,8 +23379,10 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:22845: checking for $CC warning options..." >&5 -echo "$as_me: checking for $CC warning options..." >&6;} + echo "$as_me:23382: checking for $CC warning options" >&5 +echo $ECHO_N "checking for $CC warning options... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:23384: result: " >&5 +echo "${ECHO_T}" >&6 cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" @@ -22865,12 +23404,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:22868: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23407: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22871: \$? = $ac_status" >&5 + echo "$as_me:23410: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22873: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:23412: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -22878,7 +23417,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}:22881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:23420: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22888,7 +23427,7 @@ echo "${as_me:-configure}:22881: 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}:22891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:23430: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22905,7 +23444,7 @@ fi fi -echo "$as_me:22908: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:23447: 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. @@ -22927,7 +23466,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:22930: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:23469: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -23041,23 +23580,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:23044: checking for dmalloc.h" >&5 + echo "$as_me:23583: 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 23050 "configure" +#line 23589 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:23054: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23593: \"$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:23060: \$? = $ac_status" >&5 + echo "$as_me:23599: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23076,11 +23615,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23079: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:23618: 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:23083: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:23622: 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 @@ -23088,7 +23627,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23091 "configure" +#line 23630 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23107,16 +23646,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23110: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23649: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23113: \$? = $ac_status" >&5 + echo "$as_me:23652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23116: \"$ac_try\"") >&5 + { (eval echo "$as_me:23655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23119: \$? = $ac_status" >&5 + echo "$as_me:23658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -23127,7 +23666,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23130: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:23669: 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 <<EOF @@ -23142,7 +23681,7 @@ fi fi -echo "$as_me:23145: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:23684: 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. @@ -23164,7 +23703,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:23167: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:23706: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -23278,23 +23817,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:23281: checking for dbmalloc.h" >&5 + echo "$as_me:23820: 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 23287 "configure" +#line 23826 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:23291: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23830: \"$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:23297: \$? = $ac_status" >&5 + echo "$as_me:23836: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23313,11 +23852,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23316: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:23855: 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:23320: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:23859: 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 @@ -23325,7 +23864,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23328 "configure" +#line 23867 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23344,16 +23883,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23347: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23886: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23350: \$? = $ac_status" >&5 + echo "$as_me:23889: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23353: \"$ac_try\"") >&5 + { (eval echo "$as_me:23892: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23356: \$? = $ac_status" >&5 + echo "$as_me:23895: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -23364,7 +23903,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23367: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:23906: 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 <<EOF @@ -23379,7 +23918,7 @@ fi fi -echo "$as_me:23382: checking if you want to use valgrind for testing" >&5 +echo "$as_me:23921: 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. @@ -23401,7 +23940,7 @@ EOF else with_valgrind= fi; -echo "$as_me:23404: result: ${with_valgrind:-no}" >&5 +echo "$as_me:23943: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -23514,7 +24053,7 @@ fi ;; esac -echo "$as_me:23517: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:24056: 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. @@ -23525,7 +24064,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:23528: result: $with_no_leaks" >&5 +echo "$as_me:24067: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -23543,7 +24082,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:23546: checking for an rpath option" >&5 + echo "$as_me:24085: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -23574,12 +24113,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:23577: result: $LD_RPATH_OPT" >&5 + echo "$as_me:24116: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:23582: checking if we need a space after rpath option" >&5 + echo "$as_me:24121: 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" @@ -23600,7 +24139,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23603 "configure" +#line 24142 "configure" #include "confdefs.h" int @@ -23612,16 +24151,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24154: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23618: \$? = $ac_status" >&5 + echo "$as_me:24157: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23621: \"$ac_try\"") >&5 + { (eval echo "$as_me:24160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23624: \$? = $ac_status" >&5 + echo "$as_me:24163: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -23631,14 +24170,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:23634: result: $cf_rpath_space" >&5 + echo "$as_me:24173: 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:23641: checking if rpath-hack should be disabled" >&5 +echo "$as_me:24180: 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. @@ -23656,22 +24195,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:23659: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:24198: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:23664: checking for updated LDFLAGS" >&5 +echo "$as_me:24203: 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:23667: result: maybe" >&5 + echo "$as_me:24206: 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:23674: checking for $ac_word" >&5 +echo "$as_me:24213: 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 @@ -23686,7 +24225,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:23689: found $ac_dir/$ac_word" >&5 +echo "$as_me:24228: found $ac_dir/$ac_word" >&5 break done @@ -23694,10 +24233,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:23697: result: $cf_ldd_prog" >&5 + echo "$as_me:24236: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:23700: result: no" >&5 + echo "$as_me:24239: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23711,7 +24250,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 23714 "configure" +#line 24253 "configure" #include "confdefs.h" #include <stdio.h> int @@ -23723,16 +24262,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23726: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24265: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23729: \$? = $ac_status" >&5 + echo "$as_me:24268: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23732: \"$ac_try\"") >&5 + { (eval echo "$as_me:24271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23735: \$? = $ac_status" >&5 + echo "$as_me:24274: \$? = $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` @@ -23760,7 +24299,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}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:24302: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -23772,11 +24311,11 @@ echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23775: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24314: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23779: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24318: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -23813,7 +24352,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23816: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:24355: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23826,11 +24365,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23829: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24368: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23833: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:24372: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -23867,7 +24406,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23870: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:24409: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23880,14 +24419,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23883: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:24422: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24426: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:23890: result: no" >&5 + echo "$as_me:24429: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23897,7 +24436,11 @@ TEST_ARGS="$LIBS" LIBS= ac_config_files="$ac_config_files Makefile" + ac_config_commands="$ac_config_commands default" + +DEFS=-DHAVE_CONFIG_H + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23977,7 +24520,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:23980: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:24523: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -24113,7 +24656,7 @@ EOF cat >>"$CONFIG_STATUS" <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20231210, +configured by $0, generated by GNU Autoconf 2.52.20250126, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 2003-2022,2023 Thomas E. Dickey @@ -24158,7 +24701,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:24161: error: ambiguous option: $1 + { { echo "$as_me:24704: 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;} @@ -24177,7 +24720,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:24180: error: unrecognized option: $1 + -*) { { echo "$as_me:24723: 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;} @@ -24196,7 +24739,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20231210, executed with +This file was extended by $as_me 2.52.20250126, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -24227,7 +24770,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:24230: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:24773: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24319,6 +24862,10 @@ s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -24335,6 +24882,8 @@ s,@AWK@,$AWK,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t +s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t @@ -24385,7 +24934,11 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t +s,@DESTDIR@,$DESTDIR,;t t +s,@SET_DESTDIR@,$SET_DESTDIR,;t t +s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t +s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t @@ -24430,14 +24983,14 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next if test -s "$tmp"/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then @@ -24535,7 +25088,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24538: creating $ac_file" >&5 + { echo "$as_me:25091: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24553,7 +25106,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:24556: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:25109: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -24566,7 +25119,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24569: error: cannot find input file: $f" >&5 + { { echo "$as_me:25122: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24582,7 +25135,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:24585: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:25138: 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;} @@ -24591,7 +25144,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:24594: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:25147: 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;} @@ -24636,7 +25189,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:24639: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:25192: 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;} @@ -24647,7 +25200,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:24650: WARNING: Some variables may not be substituted: + { echo "$as_me:25203: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24696,7 +25249,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:24699: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:25252: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24707,7 +25260,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:24710: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:25263: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24720,7 +25273,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24723: error: cannot find input file: $f" >&5 + { { echo "$as_me:25276: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24778,7 +25331,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:24781: $ac_file is unchanged" >&5 + { echo "$as_me:25334: $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 4df1c11f933b..a9d1e65e9907 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2023,2024 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 tom Exp $ +dnl $Id: configure.in,v 1.181 2025/12/25 23:53:19 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) @@ -43,17 +43,16 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl https://invisible-island.net/ncurses/ncurses-examples.html dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210509) -AC_INIT(ncurses.c) -AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) +AC_INIT +AC_CONFIG_SRCDIR([ncurses.c]) +AC_CONFIG_HEADERS([ncurses_cfg.h:ncurses_tst.hin]) CF_INHERIT_SCRIPT(config.guess) CF_INHERIT_SCRIPT(config.sub) -CF_CHECK_CACHE - -AC_ARG_PROGRAM CF_HELP_MESSAGE(General Options:) +CF_WITH_SYSTYPE AC_PROG_MAKE_SET CF_PROG_CC AC_C_INLINE @@ -120,6 +119,7 @@ AM_LANGINFO_CODESET dnl --------------------------------------------------------------------------- CF_PKG_CONFIG CF_DISABLE_ECHO +CF_INSTALL_PREFIX dnl --------------------------------------------------------------------------- CF_HELP_MESSAGE(Curses Version-dependent Options:) @@ -240,7 +240,6 @@ AC_CHECK_HEADERS( $cf_curses_headers ) AC_HEADER_TIME AC_CHECK_HEADERS( \ -getopt.h \ locale.h \ math.h \ stdarg.h \ @@ -248,7 +247,6 @@ sys/ioctl.h \ sys/select.h \ sys/time.h \ termios.h \ -unistd.h \ ) CF_GETOPT_HEADER @@ -264,7 +262,7 @@ tsearch \ # use a compile-check to work with ncurses*-config and subdirectory includes AC_CACHE_CHECK(if we can use termcap.h,cf_cv_have_termcap_h,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <curses.h> #ifdef NCURSES_VERSION #undef NCURSES_VERSION @@ -274,7 +272,7 @@ AC_CACHE_CHECK(if we can use termcap.h,cf_cv_have_termcap_h,[ #error wrong header #endif ], - [return 0;], + [return 0;])], [cf_cv_have_termcap_h=yes], [cf_cv_have_termcap_h=no])]) if test "x$cf_cv_have_termcap_h" = xyes @@ -282,7 +280,7 @@ then AC_DEFINE(HAVE_TERMCAP_H,1,[Define to 1 if we can use termcap.h]) else AC_CACHE_CHECK(if we can use ncurses/termcap.h,cf_cv_have_ncurses_termcap_h,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <ncurses/curses.h> #ifdef NCURSES_VERSION #undef NCURSES_VERSION @@ -292,7 +290,7 @@ AC_CACHE_CHECK(if we can use ncurses/termcap.h,cf_cv_have_ncurses_termcap_h,[ #error wrong header #endif ], - [return 0;], + [return 0;])], [cf_cv_have_ncurses_termcap_h=yes], [cf_cv_have_ncurses_termcap_h=no])]) test "x$cf_cv_have_ncurses_termcap_h" = xyes && AC_DEFINE(HAVE_NCURSES_TERMCAP_H,1,[Define to 1 if we can use ncurses/termcap.h]) @@ -312,6 +310,7 @@ mbstowcs \ mbtowc \ wcsrtombs \ wcstombs \ +wcwidth \ ) fi @@ -393,14 +392,14 @@ then cf_define_xpg5=no AC_MSG_CHECKING(if _XPG5 should be defined to enable wide-characters) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}>], - [int x = _XPG5],, + [int x = _XPG5])],, [cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}>], - [int x = _XPG5], + [int x = _XPG5])], [cf_define_xpg5=yes]) CPPFLAGS="$cf_save_cppflags"]) AC_MSG_RESULT($cf_define_xpg5) @@ -412,13 +411,13 @@ then fi AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}>], [ - static wchar_t src_wchar[2]; + static wchar_t src_wchar[[2]]; static cchar_t dst_cchar; setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); - ], + ])], [cf_cv_widechar_funcs=yes], [cf_cv_widechar_funcs=no]) ]) @@ -432,14 +431,14 @@ else fi AC_CACHE_CHECK(if $cf_cv_screen library uses pthreads,cf_cv_use_pthreads,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <${cf_cv_ncurses_header:-curses.h}> extern void _nc_init_pthreads(void); ], [ initscr(); _nc_init_pthreads(); - ], + ])], [cf_cv_use_pthreads=yes], [cf_cv_use_pthreads=no]) ]) @@ -505,7 +504,8 @@ LIBS= dnl --------------------------------------------------------------------------- -AC_OUTPUT(Makefile,[ +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_COMMANDS([default],[ CF_PRG_RULES([$srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <<TEST_EOF @@ -541,4 +541,6 @@ AWK="$AWK" ECHO_CC="$ECHO_CC" ECHO_LD="$ECHO_LD" SHOW_CC="$SHOW_LD" -],cat) +]) +AC_SETUP_DEFS([cat]) +AC_OUTPUT diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c index ea6a7e64bcae..a165ffb3fcab 100644 --- a/test/demo_altkeys.c +++ b/test/demo_altkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_altkeys.c,v 1.17 2023/02/25 18:08:02 tom Exp $ + * $Id: demo_altkeys.c,v 1.20 2025/07/05 15:11:35 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2005/10/22 @@ -49,7 +49,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -100,11 +100,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -114,7 +111,7 @@ main(int argc, char *argv[]) unlink(MY_LOGFILE); setlocale(LC_ALL, ""); - if (newterm(0, stdout, stdin) == 0) { + if (newterm(NULL, stdout, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -135,12 +132,14 @@ main(int argc, char *argv[]) } for (n = KEY_MIN; n < KEY_MAX; ++n) { char *value; - if ((value = keybound(n, 0)) != 0) { + if ((value = keybound(n, 0)) != NULL) { size_t need = strlen(value) + 2; char *temp = typeMalloc(char, need); - _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value); - define_key(temp, n + MY_KEYS); - free(temp); + if (temp != NULL) { + _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value); + define_key(temp, n + MY_KEYS); + free(temp); + } free(value); } } @@ -158,7 +157,7 @@ main(int argc, char *argv[]) printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", - name != 0 ? name : "<null>"); + name != NULL ? name : "<null>"); log_last_line(stdscr); clrtoeol(); if (ch == 'q') diff --git a/test/demo_defkey.c b/test/demo_defkey.c index 441667263f69..73426f8054aa 100644 --- a/test/demo_defkey.c +++ b/test/demo_defkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $ + * $Id: demo_defkey.c,v 1.38 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2002/11/23 @@ -47,7 +47,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -98,7 +98,7 @@ visichar(int ch) static char * visible(const char *string) { - char *result = 0; + char *result = NULL; if (VALID_STRING(string) && *string != '\0') { int pass; @@ -130,15 +130,15 @@ really_define_key(WINDOW *win, const char *new_string, int code) int rc; const char *code_name = keyname(code); char *old_string; - char *vis_string = 0; + char *vis_string = NULL; char temp[80]; - if (code_name == 0) { + if (code_name == NULL) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "Keycode %d", code); code_name = temp; } - if ((old_string = keybound(code, 0)) != 0) { + if ((old_string = keybound(code, 0)) != NULL) { wprintw(win, "%s is %s\n", code_name, vis_string = visible(old_string)); @@ -153,7 +153,7 @@ really_define_key(WINDOW *win, const char *new_string, int code) if ((rc = key_defined(new_string)) > 0) { wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc)); log_last_line(win); - } else if (new_string != 0 && rc < 0) { + } else if (new_string != NULL && rc < 0) { wprintw(win, "%s conflicts with longer strings\n", vis_string); log_last_line(win); } @@ -161,18 +161,18 @@ really_define_key(WINDOW *win, const char *new_string, int code) if (rc == ERR) { wprintw(win, "%s unchanged\n", code_name); log_last_line(win); - } else if (new_string != 0) { + } else if (new_string != NULL) { wprintw(win, "%s is now bound to %s\n", vis_string, code_name); log_last_line(win); - } else if (old_string != 0) { + } else if (old_string != NULL) { wprintw(win, "%s deleted\n", code_name); log_last_line(win); } - if (vis_string != 0) + if (vis_string != NULL) free(vis_string); - if (old_string != 0) + if (old_string != NULL) free(old_string); } @@ -182,14 +182,14 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) char *value = tigetstr(name); if (VALID_STRING(value)) { - const char *prefix = 0; + const char *prefix = NULL; if (!(strncmp) (value, "\033[", (size_t) 2)) { prefix = "\033O"; } else if (!(strncmp) (value, "\033O", (size_t) 2)) { prefix = "\033["; } - if (prefix != 0) { + if (prefix != NULL) { char temp[BUFSIZ]; _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", prefix, value + 2); @@ -199,7 +199,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) } static void -redefine(WINDOW *win, char *string, int code) +redefine(WINDOW *win, const char *string, int code) { really_define_key(win, string, code); } @@ -207,7 +207,7 @@ redefine(WINDOW *win, char *string, int code) static void remove_definition(WINDOW *win, int code) { - really_define_key(win, 0, code); + really_define_key(win, NULL, code); } static void @@ -240,11 +240,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -297,7 +294,7 @@ main(int argc, char *argv[]) const char *name = keyname(ch); wprintw(win, "Keycode %d, name %s\n", ch, - name != 0 ? name : "<null>"); + name != NULL ? name : "<null>"); log_last_line(win); wclrtoeol(win); if (ch == 'q') diff --git a/test/demo_forms.c b/test/demo_forms.c index 62e8c644e23b..5beb2a6135af 100644 --- a/test/demo_forms.c +++ b/test/demo_forms.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_forms.c,v 1.63 2023/11/11 00:29:53 tom Exp $ + * $Id: demo_forms.c,v 1.69 2025/07/05 15:21:56 tom Exp $ * * Demonstrate a variety of functions from the form library. * Thomas Dickey - 2003/4/26 @@ -50,7 +50,7 @@ static int d_option = 0; static int j_value = 0; static int m_value = 0; static int o_value = 0; -static char *t_value = 0; +static char *t_value = NULL; static void failed(const char *s) @@ -82,9 +82,9 @@ static char * get_data(const char *name) { char *result = t_value; - if (my_data != 0) { + if (my_data != NULL) { int n; - for (n = 0; my_data[n].name != 0; ++n) { + for (n = 0; my_data[n].name != NULL; ++n) { if (!strcmp(name, my_data[n].name)) { result = my_data[n].value; break; @@ -102,21 +102,21 @@ read_data(const char *filename) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { char buffer[BUFSIZ]; char *colon; int more = 0; int item = 0; my_data = typeCalloc(MY_DATA, (size_t) 100); /* FIXME */ - while (fgets(buffer, sizeof(buffer), fp) != 0) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { chomp(buffer); if (more) { if (strcmp(buffer, ".")) { char *prior = my_data[more - 1].value; size_t need = strlen(buffer) + 2 + strlen(prior); char *value = typeRealloc(char, need, prior); - if (value == 0) + if (value == NULL) failed("realloc"); _nc_STRCAT(value, "\n", need); _nc_STRCAT(value, buffer, need); @@ -126,13 +126,13 @@ read_data(const char *filename) } } else if (*buffer == '#') { continue; - } else if ((colon = strchr(buffer, ':')) != 0) { + } else if ((colon = strchr(buffer, ':')) != NULL) { char *name; char *value; *colon++ = '\0'; name = strdup(buffer); value = strdup(colon); - if (name == 0 || value == 0) + if (name == NULL || value == NULL) failed("strdup"); my_data[item].name = name; my_data[item].value = value; @@ -148,7 +148,7 @@ read_data(const char *filename) } static FIELD * -make_label(const char *label, int frow, int fcol) +make_label(NCURSES_CONST char *label, int frow, int fcol) { FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0); @@ -242,13 +242,13 @@ show_insert_mode(bool insert_mode) #define O_SELECTABLE (O_ACTIVE | O_VISIBLE) static FIELD * -another_field(FORM *form, const FIELD *const field) +another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field) { FIELD **f = form_fields(form); - FIELD *result = 0; + FIELD *result = NULL; int n; - for (n = 0; f[n] != 0; ++n) { + for (n = 0; f[n] != NULL; ++n) { if (f[n] != field) { result = f[n]; field_opts_on(result, O_SELECTABLE); @@ -273,7 +273,7 @@ my_form_driver(FORM *form, int c) help_edit_field(); break; case MY_EDT_MODE: - if ((field = current_field(form)) != 0) { + if ((field = current_field(form)) != NULL) { set_current_field(form, another_field(form, field)); if ((unsigned) field_opts(field) & O_EDIT) { field_opts_off(field, O_EDIT); @@ -306,9 +306,9 @@ my_form_driver(FORM *form, int c) } static void -show_current_field(WINDOW *win, FORM *form) +show_current_field(WINDOW *win, NCURSES_CONST FORM *form) { - FIELD *field; + NCURSES_CONST FIELD *field; int field_rows, field_cols, field_max; int currow, curcol; @@ -324,8 +324,8 @@ show_current_field(WINDOW *win, FORM *form) waddstr(win, " behind"); waddch(win, '\n'); - if ((field = current_field(form)) != 0) { - FIELDTYPE *type; + if ((field = current_field(form)) != NULL) { + NCURSES_CONST FIELDTYPE *type; int nbuf; wprintw(win, "Page %d%s, Field %d/%d%s:", @@ -333,7 +333,7 @@ show_current_field(WINDOW *win, FORM *form) new_page(field) ? "*" : "", field_index(field), field_count(form), field_arg(field) ? "(arg)" : ""); - if ((type = field_type(field)) != 0) { + if ((type = field_type(field)) != NULL) { if (type == TYPE_ALNUM) waddstr(win, "ALNUM"); else if (type == TYPE_ALPHA) @@ -383,8 +383,8 @@ show_current_field(WINDOW *win, FORM *form) waddstr(win, "\n"); for (nbuf = 0; nbuf <= 2; ++nbuf) { - char *buffer; - if ((buffer = field_buffer(field, nbuf)) != 0) { + NCURSES_CONST char *buffer; + if ((buffer = field_buffer(field, nbuf)) != NULL) { wprintw(win, "buffer %d:", nbuf); (void) wattrset(win, A_REVERSE); if (nbuf) { @@ -408,9 +408,9 @@ demo_forms(void) int c; unsigned n = 0; int pg; - const char *fname; - static const char *my_enum[] = - {"first", "second", "third", 0}; + NCURSES_CONST char *fname; + static NCURSES_CONST char *my_enum[] = + {"first", "second", "third", NULL}; #ifdef NCURSES_MOUSE_VERSION mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0); @@ -514,8 +514,8 @@ demo_forms(void) f[n] = (FIELD *) 0; - if ((form = new_form(f)) != 0) { - WINDOW *w; + if ((form = new_form(f)) != NULL) { + NCURSES_CONST WINDOW *w; WINDOW *also; int finished = 0; @@ -543,7 +543,7 @@ demo_forms(void) free_form(form); } - for (c = 0; f[c] != 0; c++) { + for (c = 0; f[c] != NULL; c++) { free_edit_field(f[c]); free_field(f[c]); } @@ -606,11 +606,8 @@ main(int argc, char *argv[]) case 't': t_value = optarg; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/demo_keyok.c b/test/demo_keyok.c index 8f4ae906bd06..3d95cf1e4113 100644 --- a/test/demo_keyok.c +++ b/test/demo_keyok.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2002-2006,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $ + * $Id: demo_keyok.c,v 1.12 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the keyok() function. * Thomas Dickey - 2002/11/23 @@ -66,11 +66,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -93,12 +90,14 @@ main(int argc, char *argv[]) while ((ch = wgetch(win)) != ERR) { const char *name = keyname(ch); + if (ch == QUIT) + break; if (ch == ESCAPE && prior == ch) break; prior = ch; wprintw(win, "Keycode %d, name %s\n", ch, - name != 0 ? name : "<null>"); + name != NULL ? name : "<null>"); wclrtoeol(win); wrefresh(win); if (ch >= KEY_MIN) { diff --git a/test/demo_menus.c b/test/demo_menus.c index 7b0bf30316e5..a02d69c54860 100644 --- a/test/demo_menus.c +++ b/test/demo_menus.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_menus.c,v 1.80 2023/05/27 20:13:10 tom Exp $ + * $Id: demo_menus.c,v 1.87 2025/07/05 15:21:56 tom Exp $ * * Demonstrate a variety of functions from the menu library. * Thomas Dickey - 2005/4/9 @@ -185,7 +185,7 @@ menu_virtualize(int c) } static int -menu_getc(MENU * m) +menu_getc(NCURSES_CONST MENU * m) { return wGetchar(menu_win(m)); } @@ -214,7 +214,7 @@ static void my_menu_init(MENU * menu) { Trace(("called MenuHook my_menu_init")); - mvwprintw(status, 2, 0, "menu_init %p", (void *) menu); + mvwprintw(status, 2, 0, "menu_init %p", (const void *) menu); wclrtoeol(status); wrefresh(status); } @@ -223,7 +223,7 @@ static void my_menu_term(MENU * menu) { Trace(("called MenuHook my_menu_term")); - mvwprintw(status, 2, 0, "menu_term %p", (void *) menu); + mvwprintw(status, 2, 0, "menu_term %p", (const void *) menu); wclrtoeol(status); wrefresh(status); } @@ -231,7 +231,7 @@ my_menu_term(MENU * menu) static void my_item_init(MENU * menu) { - ITEM *item = current_item(menu); + NCURSES_CONST ITEM *item = current_item(menu); const char *name = item_name(item); Trace(("called MenuHook my_item_init (%s)", name)); @@ -243,7 +243,7 @@ my_item_init(MENU * menu) static void my_item_term(MENU * menu) { - ITEM *item = current_item(menu); + NCURSES_CONST ITEM *item = current_item(menu); const char *name = item_name(item); Trace(("called MenuHook my_item_term (%s)", name)); @@ -311,9 +311,9 @@ static void menu_destroy(MENU * m, int itemsToo) { Trace(("menu_destroy %p", (void *) m)); - if (m != 0) { + if (m != NULL) { ITEM **items = menu_items(m); - const char *blob = 0; + const char *blob = NULL; int count; count = item_count(m); @@ -335,7 +335,7 @@ menu_destroy(MENU * m, int itemsToo) if (count > 0 && itemsToo) { if (itemsToo & 1) { ITEM **ip = items; - if (ip != 0) { + if (ip != NULL) { while (*ip) free_item(*ip++); } @@ -348,7 +348,7 @@ menu_destroy(MENU * m, int itemsToo) /* force the given menu to appear */ static void -menu_display(MENU * m) +menu_display(NCURSES_CONST MENU * m) { touchwin(menu_win(m)); wrefresh(menu_win(m)); @@ -362,14 +362,14 @@ build_file_menu(MenuNo number) static MENU_DATA table[] = { {"Exit", call_files, 0}, - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM *items[SIZEOF(table)]; ITEM **ip = items; int n; - for (n = 0; table[n].name != 0; ++n) { + for (n = 0; table[n].name != NULL; ++n) { *ip = new_item(table[n].name, empty); set_item_userptr(*ip, (void *) &table[n]); ++ip; @@ -413,17 +413,17 @@ build_select_menu(MenuNo number, char *filename) MY_DATA("Pumas"), MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"), MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs, Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"), - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM **items; ITEM **ip; - MENU_DATA *ap = 0; - MENU_DATA *myList = 0; + MENU_DATA *ap = NULL; + MENU_DATA *myList = NULL; int i; size_t count = 0; - if (filename != 0) { + if (filename != NULL) { struct stat sb; if (stat(filename, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFREG @@ -436,9 +436,9 @@ build_select_menu(MenuNo number, char *filename) Trace(("build_select_menu blob=%p, items=%p", (void *) blob, (void *) items)); - if (blob != 0 && list != 0) { + if (blob != NULL && list != NULL) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { if (fread(blob, sizeof(char), size, fp) == size) { bool mark = TRUE; unsigned j, k; @@ -456,7 +456,7 @@ build_select_menu(MenuNo number, char *filename) blob[j] = ' '; /* menu items are printable */ } } - list[k].name = 0; + list[k].name = NULL; count = k; ap = myList = list; } @@ -464,28 +464,28 @@ build_select_menu(MenuNo number, char *filename) } loaded_file = TRUE; } - if (ap == 0) + if (ap == NULL) free(items); } } - if (ap == 0) { + if (ap == NULL) { count = SIZEOF(table) - 1; items = typeCalloc(ITEM *, count + 1); ap = table; } ip = items; - for (i = 0; ap[i].name != 0; ++i) { + for (i = 0; ap[i].name != NULL; ++i) { ap[i].func = call_select; ap[i].mask = (unsigned) i; *ip = new_item(ap[i].name, empty); set_item_userptr(*ip, (void *) &table[i]); ++ip; } - *ip = 0; + *ip = NULL; mpSelect = menu_create(items, (int) count, 1, number); - if (myList != 0) + if (myList != NULL) free(myList); } @@ -527,7 +527,7 @@ static MENU_DATA t_tbl[] = T_TBL(TRACE_ATTRS), T_TBL(TRACE_MAXIMUM), { - (char *) 0, 0, 0 + (char *) 0, NULL, 0 } }; @@ -539,7 +539,7 @@ build_trace_menu(MenuNo number) ITEM **ip = items; int n; - for (n = 0; t_tbl[n].name != 0; n++) { + for (n = 0; t_tbl[n].name != NULL; n++) { *ip = new_item(t_tbl[n].name, empty); set_item_userptr(*ip, (void *) &t_tbl[n]); ++ip; @@ -556,8 +556,8 @@ tracetrace(unsigned tlevel) static size_t need = 12; int n; - if (buf == 0) { - for (n = 0; t_tbl[n].name != 0; n++) + if (buf == NULL) { + for (n = 0; t_tbl[n].name != NULL; n++) need += strlen(t_tbl[n].name) + 2; buf = typeMalloc(char, need); if (!buf) @@ -568,7 +568,7 @@ tracetrace(unsigned tlevel) _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { - for (n = 1; t_tbl[n].name != 0; n++) + for (n = 1; t_tbl[n].name != NULL; n++) if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) { _nc_STRCAT(buf, t_tbl[n].name, need); _nc_STRCAT(buf, ", ", need); @@ -584,10 +584,10 @@ tracetrace(unsigned tlevel) * the others */ static bool -update_trace_menu(MENU * m) +update_trace_menu(NCURSES_CONST MENU * m) { ITEM **items; - ITEM *i; + NCURSES_CONST ITEM *i; bool changed = FALSE; items = menu_items(m); @@ -595,7 +595,7 @@ update_trace_menu(MENU * m) if (i == items[0]) { if (item_value(i)) { ITEM **p; - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(*p, FALSE); changed = TRUE; @@ -613,7 +613,7 @@ perform_trace_menu(int cmd) int result; for (ip = menu_items(mpTrace); *ip; ip++) { - MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); + NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); unsigned mask = td->mask; if (mask == 0) set_item_value(*ip, _nc_tracing == 0); @@ -628,7 +628,7 @@ perform_trace_menu(int cmd) unsigned newtrace = 0; for (ip = menu_items(mpTrace); *ip; ip++) { if (item_value(*ip)) { - MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); + NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); newtrace |= td->mask; } } @@ -670,7 +670,7 @@ current_menu(void) break; #endif default: - result = 0; + result = NULL; break; } return result; @@ -693,14 +693,14 @@ build_menus(char *filename) #ifdef TRACE {"Trace", call_menus, 2}, #endif - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM *items[SIZEOF(table)]; ITEM **ip = items; int n; - for (n = 0; table[n].name != 0; ++n) { + for (n = 0; table[n].name != NULL; ++n) { *ip = new_item(table[n].name, empty); set_item_userptr(*ip, (void *) &table[n]); ++ip; @@ -718,7 +718,9 @@ build_menus(char *filename) } static int -move_menu(MENU * menu, MENU * current, int by_y, int by_x) +move_menu(NCURSES_CONST MENU * menu, + NCURSES_CONST MENU * current, + int by_y, int by_x) { WINDOW *top_win = menu_win(menu); WINDOW *sub_win = menu_sub(menu); @@ -753,7 +755,7 @@ move_menu(MENU * menu, MENU * current, int by_y, int by_x) * Move the menus around on the screen, to test mvwin(). */ static void -move_menus(MENU * current, int by_y, int by_x) +move_menus(NCURSES_CONST MENU * current, int by_y, int by_x) { if (move_menu(mpBanner, current, by_y, by_x) != ERR) { erase(); @@ -798,7 +800,7 @@ resize_menus(MENU * current) #endif /* defined(KEY_RESIZE) && NCURSES_EXT_FUNCS */ static void -show_status(int ch, MENU * menu) +show_status(int ch, NCURSES_CONST MENU * menu) { wmove(status, 0, 0); wprintw(status, "key %s, menu %d, mark %s, match %s", @@ -919,7 +921,7 @@ perform_menus(void) wrefresh(menu_win(last_menu)); if (code == E_UNKNOWN_COMMAND || code == E_NOT_POSTED) { - ITEM *item = current_item(last_menu); + NCURSES_CONST ITEM *item = current_item(last_menu); MENU_DATA *td = (MENU_DATA *) item_userptr(item); td->func((int) td->mask); } @@ -989,7 +991,7 @@ usage(int ok) ," -H rip-off header line (can repeat)" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -D mask specify trace mask (may toggle with ^T)" #endif }; size_t n; @@ -1009,7 +1011,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); START_TRACE(); - while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "D:FH")) != -1) { switch (ch) { #if HAVE_RIPOFFLINE case 'F': @@ -1020,15 +1022,12 @@ main(int argc, char *argv[]) break; #endif /* HAVE_RIPOFFLINE */ #ifdef TRACE - case 't': - curses_trace((unsigned) strtoul(optarg, 0, 0)); + case 'D': + curses_trace((unsigned) strtoul(optarg, NULL, 0)); break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -1044,7 +1043,7 @@ main(int argc, char *argv[]) init_pair(2, COLOR_BLUE, COLOR_WHITE); } status = newwin(3, COLS, LINES - 3, 0); - build_menus(argc > 1 ? argv[1] : 0); + build_menus(argc > 1 ? argv[1] : NULL); perform_menus(); destroy_menus(); diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c index bc41d44de930..6dd188a66afb 100644 --- a/test/demo_new_pair.c +++ b/test/demo_new_pair.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_new_pair.c,v 1.27 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_new_pair.c,v 1.34 2025/08/08 15:47:32 tom Exp $ * * Demonstrate the alloc_pair() function. */ @@ -36,6 +36,7 @@ #include <time.h> #include <popup_msg.h> +#if HAVE_TIGETSTR #if HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT #include <sys/types.h> @@ -48,8 +49,8 @@ static bool valid_cap(NCURSES_CONST char *name) { - char *value = tigetstr(name); - return (value != 0 && value != (char *) -1) ? TRUE : FALSE; + const char *value = tigetstr(name); + return (value != NULL && value != (char *) -1) ? TRUE : FALSE; } static attr_t @@ -187,7 +188,7 @@ main(int argc, char *argv[]) " ? print this screen (exit on any character).", "", "To exit this program, press ^Q, ^[ or \"q\".", - 0 + NULL }; bool done = FALSE; @@ -204,7 +205,7 @@ main(int argc, char *argv[]) wchar_t wch[2]; time_t start = now(); long total_cells = 0; - FILE *output = 0; + FILE *output = NULL; setlocale(LC_ALL, ""); @@ -225,11 +226,8 @@ main(int argc, char *argv[]) case 'w': use_wide = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -242,9 +240,10 @@ main(int argc, char *argv[]) fprintf(stderr, "cannot open terminal for output\n"); ExitProgram(EXIT_FAILURE); } - if (newterm(NULL, output, stdin) == 0) { + if (newterm(NULL, output, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); - fclose(output); + if (output != NULL) + fclose(output); ExitProgram(EXIT_FAILURE); } (void) cbreak(); /* read chars without wait for \n */ @@ -327,6 +326,7 @@ main(int argc, char *argv[]) my_pair = (use_init ? next_color(current) : make_color(current)); + assert(my_pair < COLOR_PAIRS); } } else { my_attrs = next_attr(current); @@ -383,7 +383,8 @@ main(int argc, char *argv[]) ++current; } stop_curses(); - fclose(output); + if (output != NULL) + fclose(output); printf("%.1f cells/second\n", (double) (total_cells) / (double) (now() - start)); @@ -391,11 +392,19 @@ main(int argc, char *argv[]) ExitProgram(EXIT_SUCCESS); } -#else +#else /* !(HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT) */ int main(void) { printf("This program requires the ncurses alloc_pair function\n"); ExitProgram(EXIT_FAILURE); } -#endif +#endif /* HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT */ +#else /* !HAVE_TIGETSTR */ +int +main(void) +{ + printf("This program requires the terminfo functions such as tigetstr\n"); + ExitProgram(EXIT_FAILURE); +} +#endif /* HAVE_TIGETSTR */ diff --git a/test/demo_panels.c b/test/demo_panels.c index 6c8258915713..d52a7a5bf10d 100644 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_panels.c,v 1.48 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_panels.c,v 1.54 2025/07/05 15:21:56 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -42,7 +42,7 @@ #define TEMP_POS '>' typedef void (*InitPanel) (void); -typedef void (*FillPanel) (PANEL *); +typedef void (*FillPanel) (NCURSES_CONST PANEL *); static bool use_colors = FALSE; static bool unboxed = FALSE; @@ -52,18 +52,18 @@ static FILE *log_out; static void close_input(void) { - if (log_in != 0) { + if (log_in != NULL) { fclose(log_in); - log_in = 0; + log_in = NULL; } } static void close_output(void) { - if (log_out != 0) { + if (log_out != NULL) { fclose(log_out); - log_out = 0; + log_out = NULL; } } @@ -88,7 +88,7 @@ static void saywhat(NCURSES_CONST char *text) { WINDOW *win = statusline(); - if (text != 0 && *text != '\0') { + if (text != NULL && *text != '\0') { waddstr(win, text); waddstr(win, "; "); } @@ -124,7 +124,7 @@ get_position(NCURSES_CONST char *text, show_position(text, also, which, y1, x1); - if (log_in != 0) { + if (log_in != NULL) { if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) { switch (cmd) { case LAST_POS: @@ -204,12 +204,12 @@ static PANEL * mkpanel(short color, int rows, int cols, int tly, int tlx) { WINDOW *win; - PANEL *pan = 0; + PANEL *pan = NULL; char *userdata = typeMalloc(char, 6); - if ((win = newwin(rows, cols, tly, tlx)) != 0) { + if ((win = newwin(rows, cols, tly, tlx)) != NULL) { keypad(win, TRUE); - if ((pan = new_panel(win)) == 0) { + if ((pan = new_panel(win)) == NULL) { delwin(win); } else if (use_colors) { short fg = (short) ((color == COLOR_BLUE) @@ -231,7 +231,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) static void my_remove_panel(PANEL **pans, int which) { - if (pans[which] != 0) { + if (pans[which] != NULL) { PANEL *pan = pans[which]; WINDOW *win = panel_window(pan); char *user = (char *) panel_userptr(pan); @@ -240,7 +240,7 @@ my_remove_panel(PANEL **pans, int which) del_panel(pan); delwin(win); - pans[which] = 0; + pans[which] = NULL; } } @@ -297,11 +297,11 @@ my_create_panel(PANEL **pans, int which, FillPanel myFill) static void my_move_panel(PANEL **pans, int which, bool continuous) { - if (pans[which] != 0) { + if (pans[which] != NULL) { int code; int y0, x0; int y1, x1; - WINDOW *win = panel_window(pans[which]); + NCURSES_CONST WINDOW *win = panel_window(pans[which]); char also[80]; getbegyx(win, y0, x0); @@ -322,7 +322,7 @@ my_move_panel(PANEL **pans, int which, bool continuous) static void my_resize_panel(PANEL **pans, int which, FillPanel myFill) { - if (pans[which] != 0) { + if (pans[which] != NULL) { int code; int y0, x0; int y1, x1; @@ -341,7 +341,7 @@ my_resize_panel(PANEL **pans, int which, FillPanel myFill) ABS(x1 - x0) + 1, MIN(y0, y1), MIN(x0, x1)); - if (next != 0) { + if (next != NULL) { keypad(next, TRUE); if (use_colors) { wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' ')); @@ -368,7 +368,7 @@ init_panel(void) } static void -fill_panel(PANEL *pan) +fill_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -388,7 +388,7 @@ fill_panel(PANEL *pan) } static void -fill_unboxed(PANEL *pan) +fill_unboxed(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -411,7 +411,7 @@ make_fullwidth_digit(cchar_t *target, int digit) source[0] = (wchar_t) (digit + 0xff10); source[1] = 0; - setcchar(target, source, A_NORMAL, 0, 0); + setcchar(target, source, A_NORMAL, 0, NULL); } static void @@ -431,7 +431,7 @@ init_wide_panel(void) } static void -fill_wide_panel(PANEL *pan) +fill_wide_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); int num = ((const char *) panel_userptr(pan))[1]; @@ -453,7 +453,7 @@ fill_wide_panel(PANEL *pan) #define MAX_PANELS 5 static int -which_panel(PANEL *px[MAX_PANELS + 1], PANEL *pan) +which_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST PANEL *pan) { int result = 0; int j; @@ -507,19 +507,19 @@ show_panels(PANEL *px[MAX_PANELS + 1]) memset(table, 0, sizeof(table)); for (j = 1; j <= MAX_PANELS; ++j) { - table[j].valid = (px[j] != 0); + table[j].valid = (px[j] != NULL); if (table[j].valid) { - table[j].hidden = panel_hidden(px[j]); + table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE; table[j].above = panel_above(px[j]); table[j].below = panel_below(px[j]); } } - if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) { + if ((win = newwin(LINES - 1, COLS, 0, 0)) != NULL) { PANEL *pan; keypad(win, TRUE); - if ((pan = new_panel(win)) != 0) { + if ((pan = new_panel(win)) != NULL) { werase(win); MvWPrintw(win, 0, 0, "Panels:\n"); for (j = 1; j <= MAX_PANELS; ++j) { @@ -554,7 +554,7 @@ show_panels(PANEL *px[MAX_PANELS + 1]) static int my_##func(PANEL *pan) \ { \ int code = ERR; \ - if (pan != 0) { \ + if (pan != NULL) { \ code = func(pan); \ } \ return code; \ @@ -578,7 +578,7 @@ do_panel(PANEL *px[MAX_PANELS + 1], return; } - if (log_in != 0) { + if (log_in != NULL) { pflush(); } @@ -617,7 +617,7 @@ do_panel(PANEL *px[MAX_PANELS + 1], static bool ok_letter(int ch) { - return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0; + return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != NULL; } static bool @@ -644,8 +644,8 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit) waddstr(win, "Command:"); buffer[length = 0] = '\0'; - if (log_in != 0) { - if (fgets(buffer, limit - 3, log_in) != 0) { + if (log_in != NULL) { + if (fgets(buffer, limit - 3, log_in) != NULL) { length = (int) strlen(buffer); while (length > 0 && isspace(UChar(buffer[length - 1]))) buffer[--length] = '\0'; @@ -656,8 +656,9 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit) (void) wgetch(win); } else { int c0 = 0; - for (;;) { + while (length < limit - 3) { int ch = wgetch(win); + memset(buffer + length, 0, 3); if (ch == ERR || ch == QUIT || ch == ESCAPE) { buffer[0] = '\0'; break; @@ -796,11 +797,8 @@ main(int argc, char *argv[]) case 'x': unboxed = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/demo_tabs.c b/test/demo_tabs.c index 16c1ad57cfd8..40c3f90ad7a9 100644 --- a/test/demo_tabs.c +++ b/test/demo_tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_tabs.c,v 1.13 2025/07/05 15:21:56 tom Exp $ * * A simple demo of tabs in curses. */ @@ -48,7 +48,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -l COUNT total number of lines to show" + ," -m NUM total number of lines to show" ," -t NUM set TABSIZE variable to the given value" }; unsigned n; @@ -69,19 +69,16 @@ main(int argc, char *argv[]) int line_limit = -1; int curses_stops = -1; - while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "m:t:")) != -1) { switch (ch) { - case 'l': + case 'm': line_limit = atoi(optarg); break; case 't': curses_stops = atoi(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/demo_termcap.c b/test/demo_termcap.c index 6e2aba700679..c4689ae75244 100644 --- a/test/demo_termcap.c +++ b/test/demo_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_termcap.c,v 1.65 2023/05/27 20:13:10 tom Exp $ + * $Id: demo_termcap.c,v 1.75 2025/07/05 15:11:35 tom Exp $ * * A simple demo of the termcap interface. */ @@ -101,15 +101,18 @@ static long total_b_values; static long total_n_values; static long total_s_values; -#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == 0) +#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == NULL) #define EachCapName(n) n = 33; n < 127; ++n static char * make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -150,17 +153,17 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { db_item++; } } - if (result != 0) + if (result != NULL) printf("** %s\n", result); return result; } @@ -174,7 +177,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif /* NO_LEAKS */ @@ -256,10 +259,10 @@ dumpit(NCURSES_CONST char *cap) * to hold all of the strings extracted from the terminal entry. */ char area[1024], *ap = area; - char *str; + NCURSES_CONST char *str; int num; - if ((str = tgetstr(cap, &ap)) != 0) { + if ((str = tgetstr(cap, &ap)) != NULL) { total_values++; total_s_values++; if (!q_opt) { @@ -289,7 +292,7 @@ dumpit(NCURSES_CONST char *cap) } static void -brute_force(const char *name) +brute_force(NCURSES_CONST char *name) { char buffer[1024]; @@ -343,7 +346,7 @@ demo_termcap(NCURSES_CONST char *name) if (b_opt) { for (n = 0;; ++n) { cap = my_boolcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } @@ -352,7 +355,7 @@ demo_termcap(NCURSES_CONST char *name) if (n_opt) { for (n = 0;; ++n) { cap = my_numcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } @@ -361,16 +364,16 @@ demo_termcap(NCURSES_CONST char *name) if (s_opt) { for (n = 0;; ++n) { cap = my_strcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } } #ifdef NCURSES_VERSION - if (x_opt && (my_blob == 0) && y_opt) { + if (x_opt && (my_blob == NULL) && y_opt) { #if NCURSES_XNAMES - TERMTYPE *term = (TERMTYPE *) cur_term; - if (term != 0 + NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term; + if (term != NULL && ((NUM_BOOLEANS(term) != BOOLCOUNT) || (NUM_NUMBERS(term) != NUMCOUNT) || (NUM_STRINGS(term) != STRCOUNT))) { @@ -429,16 +432,16 @@ parse_description(const char *input_name) * None of the arrays could be larger than the input-file, and since it * is small, just allocate the maximum for simplicity. */ - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 || - (my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 || - (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL || + (my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL || + (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) { failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) { + if ((fp = fopen(input_name, "r")) == NULL) { failed("cannot open input-file"); } else { len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); @@ -674,11 +677,11 @@ parse_description(const char *input_name) break; } } - my_boolcodes[count_bools] = 0; - my_numcodes[count_nums] = 0; - my_numvalues[count_nums] = 0; - my_strcodes[count_strs] = 0; - my_strvalues[count_strs] = 0; + my_boolcodes[count_bools] = NULL; + my_numcodes[count_nums] = NULL; + my_numvalues[count_nums] = NULL; + my_strcodes[count_strs] = NULL; + my_strvalues[count_strs] = NULL; #if 0 printf("bools:%d\n", (int) count_bools); @@ -702,11 +705,11 @@ copy_code_list(NCURSES_CONST char *const *list) int pass; size_t count; size_t length = 1; - char **result = 0; - char *unused = 0; + char **result = NULL; + char *unused = NULL; for (pass = 0; pass < 2; ++pass) { - for (count = 0; list[count] != 0; ++count) { + for (count = 0; list[count] != NULL; ++count) { size_t chunk = strlen(list[count]) + 1; if (pass == 0) { length += chunk; @@ -720,7 +723,7 @@ copy_code_list(NCURSES_CONST char *const *list) char *blob = malloc(length); result = typeCalloc(char *, count + 1); unused = blob; - if (blob == 0 || result == 0) + if (blob == NULL || result == NULL) failed("copy_code_list failed"); } } @@ -756,10 +759,10 @@ usage(int ok) ," -b print boolean-capabilities" ," -d LIST colon-separated list of databases to use" ," -e NAME environment variable to set with -d option" - ," -i NAME terminal description to use as names for \"-a\" option, etc." + ," -i NAME terminal description to use as names for \"-a\" option" ," -n print numeric-capabilities" ," -q quiet (prints only counts)" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s print string-capabilities" ," -v print termcap-variables" #ifdef NCURSES_VERSION @@ -781,12 +784,12 @@ main(int argc, char *argv[]) { int ch; int n; - char *name; + NCURSES_CONST char *name; bool a_opt = FALSE; #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED) bool v_opt = FALSE; #endif - char *input_name = 0; + NCURSES_CONST char *input_name = NULL; int repeat; int r_opt = 1; @@ -837,11 +840,8 @@ main(int argc, char *argv[]) break; #endif #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -864,15 +864,15 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; brute_force(dumb); } } } else { - if (input_name != 0) { + if (input_name != NULL) { parse_description(input_name); } #if USE_CODE_LISTS @@ -891,10 +891,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { demo_termcap(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { demo_termcap(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; demo_termcap(dumb); } } diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c index 5e78015c36e0..f5b2967739ee 100644 --- a/test/demo_terminfo.c +++ b/test/demo_terminfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_terminfo.c,v 1.57 2023/05/27 20:13:10 tom Exp $ + * $Id: demo_terminfo.c,v 1.64 2025/07/05 15:11:35 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -98,9 +98,12 @@ static long total_s_values; static char * make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -141,17 +144,17 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { db_item++; } } - if (result != 0) + if (result != NULL) printf("** %s\n", result); return result; } @@ -165,7 +168,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif @@ -176,7 +179,7 @@ dumpit(NCURSES_CONST char *cap, const char *show) const char *str; int num; - if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) { + if ((str = tigetstr(cap)) != NULL && (str != (char *) -1)) { total_values++; total_s_values++; if (!q_opt) { @@ -253,7 +256,7 @@ dumpit(NCURSES_CONST char *cap, const char *show) #define LegalItem(c,n) (n) static void -brute_force(const char *name) +brute_force(NCURSES_CONST char *name) { #define MAX_FORCE 5 /* omit "colors", since CPU-time is a problem */ static const char legal[] = "\ @@ -324,7 +327,7 @@ abcdefghijklmnopqrstuvwxyz_"; #endif static void -demo_terminfo(char *name) +demo_terminfo(NCURSES_CONST char *name) { unsigned n; NCURSES_CONST char *cap; @@ -339,7 +342,7 @@ demo_terminfo(char *name) if (b_opt) { for (n = 0;; ++n) { cap = my_boolcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(bool, n)); } @@ -348,7 +351,7 @@ demo_terminfo(char *name) if (n_opt) { for (n = 0;; ++n) { cap = my_numcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(num, n)); } @@ -357,17 +360,17 @@ demo_terminfo(char *name) if (s_opt) { for (n = 0;; ++n) { cap = my_strcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(str, n)); } } #ifdef NCURSES_VERSION - if (x_opt && (my_blob == 0)) { + if (x_opt && (my_blob == NULL)) { if (y_opt) { #if NCURSES_XNAMES - TERMTYPE *term = (TERMTYPE *) cur_term; - if (term != 0 + const TERMTYPE *term = (TERMTYPE *) cur_term; + if (term != NULL && ((NUM_BOOLEANS(term) != BOOLCOUNT) || (NUM_NUMBERS(term) != NUMCOUNT) || (NUM_STRINGS(term) != STRCOUNT))) { @@ -455,16 +458,16 @@ parse_description(const char *input_name) * None of the arrays could be larger than the input-file, and since it * is small, just allocate the maximum for simplicity. */ - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 || - (my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 || - (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL || + (my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL || + (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) { failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) { + if ((fp = fopen(input_name, "r")) == NULL) { failed("cannot open input-file"); } else { len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); @@ -704,11 +707,11 @@ parse_description(const char *input_name) break; } } - my_boolcodes[count_bools] = 0; - my_numcodes[count_nums] = 0; - my_numvalues[count_nums] = 0; - my_strcodes[count_strs] = 0; - my_strvalues[count_strs] = 0; + my_boolcodes[count_bools] = NULL; + my_numcodes[count_nums] = NULL; + my_numvalues[count_nums] = NULL; + my_strcodes[count_strs] = NULL; + my_strvalues[count_strs] = NULL; #if 0 printf("# bools:%d\n", (int) count_bools); @@ -732,11 +735,11 @@ copy_code_list(NCURSES_CONST char *const *list) int pass; size_t count; size_t length = 1; - char **result = 0; - char *unused = 0; + char **result = NULL; + char *unused = NULL; for (pass = 0; pass < 2; ++pass) { - for (count = 0; list[count] != 0; ++count) { + for (count = 0; list[count] != NULL; ++count) { size_t chunk = strlen(list[count]) + 1; if (pass == 0) { length += chunk; @@ -750,7 +753,7 @@ copy_code_list(NCURSES_CONST char *const *list) char *blob = malloc(length); result = typeCalloc(char *, count + 1); unused = blob; - if (blob == 0 || result == 0) + if (blob == NULL || result == NULL) failed("copy_code_list failed"); } } @@ -786,11 +789,11 @@ usage(int ok) ," -b print boolean-capabilities" ," -d LIST colon-separated list of databases to use" ," -e NAME environment variable to set with -d option" - ," -f print full names" + ," -f print full terminfo names" ," -i NAME terminal description to use as names for \"-a\" option" ," -n print numeric-capabilities" ," -q quiet (prints only counts)" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s print string-capabilities" #ifdef NCURSES_VERSION ," -x print extended capabilities" @@ -813,9 +816,9 @@ main(int argc, char *argv[]) int ch; int n; int repeat; - char *name; + NCURSES_CONST char *name; int r_opt = 1; - char *input_name = 0; + const char *input_name = NULL; while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) { switch (ch) { @@ -861,11 +864,8 @@ main(int argc, char *argv[]) x_opt = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -888,15 +888,15 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; brute_force(dumb); } } } else { - if (input_name != 0) { + if (input_name != NULL) { parse_description(input_name); } #if USE_CODE_LISTS @@ -915,10 +915,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { demo_terminfo(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { demo_terminfo(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; demo_terminfo(dumb); } } @@ -933,8 +933,8 @@ main(int argc, char *argv[]) #if NO_LEAKS free_dblist(); - if (input_name != 0) { - if (my_blob != 0) { + if (input_name != NULL) { + if (my_blob != NULL) { free(my_blob); free(my_boolcodes); free(my_numcodes); diff --git a/test/ditto.c b/test/ditto.c index acac8377aad7..4382979544ff 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 tom Exp $ + * $Id: ditto.c,v 1.62 2025/07/05 15:11:35 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -157,15 +157,15 @@ open_tty(char *path) int aslave; char slave_name[1024]; char s_option[sizeof(slave_name) + 80]; - const char *xterm_prog = 0; + const char *xterm_prog = NULL; - if ((xterm_prog = getenv("XTERM_PROG")) == 0) + if ((xterm_prog = getenv("XTERM_PROG")) == NULL) xterm_prog = "xterm"; - if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0 + if (openpty(&amaster, &aslave, slave_name, NULL, NULL) != 0 || strlen(slave_name) > sizeof(slave_name) - 1) failed("openpty"); - if (strrchr(slave_name, '/') == 0) { + if (strrchr(slave_name, '/') == NULL) { errno = EISDIR; failed(slave_name); } @@ -176,7 +176,7 @@ open_tty(char *path) _exit(0); } fp = fdopen(amaster, "r+"); - if (fp == 0) + if (fp == NULL) failed(path); #else struct stat sb; @@ -192,7 +192,7 @@ open_tty(char *path) failed(path); printf("opened %s\n", path); #endif - assert(fp != 0); + assert(fp != NULL); return fp; } @@ -266,7 +266,7 @@ open_screen(DITTO * target, char **source, int length, int which1) target->output, target->input); - if (target->screen == 0) + if (target->screen == NULL) failed("newterm"); (void) USING_SCREEN(target->screen, init_screen, target); @@ -420,19 +420,16 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } - if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) + if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL) failed("calloc data"); - assert(data != 0); + assert(data != NULL); for (j = 0; j < argc; j++) { open_screen(&data[j], argv, argc, j); @@ -478,7 +475,7 @@ main(int argc, char *argv[]) */ for (j = argc - 1; j >= 0; j--) { LockIt(); - USING_SCREEN(data[j].screen, close_screen, 0); + USING_SCREEN(data[j].screen, close_screen, NULL); fprintf(data[j].output, "**Closed\r\n"); /* diff --git a/test/dots.c b/test/dots.c index 05aa8545100c..7280f7e0b3a2 100644 --- a/test/dots.c +++ b/test/dots.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1999-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey <dickey@clark.net> 1999 * - * $Id: dots.c,v 1.45 2023/01/07 17:21:48 tom Exp $ + * $Id: dots.c,v 1.48 2025/07/05 15:21:56 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -61,7 +61,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -102,7 +102,7 @@ static int get_number(NCURSES_CONST char *cap, int map) { int result = map; - if (cap != 0) { + if (cap != NULL) { int check = tigetnum(cap); if (check > 0) result = check; @@ -179,11 +179,8 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -191,12 +188,12 @@ main(int argc, char *argv[]) SetupAlarm(r_option); InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig); - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); outs(clear_screen); outs(cursor_invisible); -#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln) +#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln) my_colors = GetNumber(max_colors, colors); if (my_colors > 1) { if (!VALID_STRING(set_a_foreground) diff --git a/test/dots_curses.c b/test/dots_curses.c index 1a553213c48a..481baa519d04 100644 --- a/test/dots_curses.c +++ b/test/dots_curses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_curses.c,v 1.28 2025/07/05 15:21:56 tom Exp $ * * A simple demo of the curses interface used for comparison with termcap. */ @@ -97,7 +97,7 @@ usage(int ok) ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors()" + ," -d invoke use_default_colors" #endif #if HAVE_USE_ENV ," -e allow environment $LINES / $COLUMNS" @@ -161,16 +161,13 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm(r_option); InitAndCatch(initscr(), onsig); diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c index a6119237bda7..f917f106594a 100644 --- a/test/dots_mvcur.c +++ b/test/dots_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2007-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2007 * - * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_mvcur.c,v 1.34 2025/07/05 15:21:56 tom Exp $ * * A simple demo of the terminfo interface, and mvcur. */ @@ -62,7 +62,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -103,7 +103,7 @@ static int get_number(NCURSES_CONST char *cap, int map) { int result = map; - if (cap != 0) { + if (cap != NULL) { int check = tigetnum(cap); if (check > 0) result = check; @@ -182,11 +182,8 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -195,18 +192,18 @@ main(int argc, char *argv[]) InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig); refresh(); /* needed with Solaris curses to cancel endwin */ - if (sp == 0) { + if (sp == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); outs(clear_screen); outs(cursor_home); outs(cursor_invisible); -#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln) +#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln) my_colors = GetNumber(max_colors, colors); if (my_colors > 1) { if (!VALID_STRING(set_a_foreground) diff --git a/test/dots_termcap.c b/test/dots_termcap.c index 65786c411a4a..279db6936d30 100644 --- a/test/dots_termcap.c +++ b/test/dots_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,14 +30,14 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $ + * $Id: dots_termcap.c,v 1.38 2025/07/05 15:21:56 tom Exp $ * * A simple demo of the termcap interface. */ #define USE_TINFO #include <test.priv.h> -#if !defined(_NC_WINDOWS) +#if !defined(_NC_WINDOWS_NATIVE) #include <sys/time.h> #endif @@ -113,7 +113,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -153,7 +153,7 @@ ranf(void) /* * napms is a curses function which happens to be usable without initializing * the screen, but if this program happened to be build with a "real" termcap - * library, there is nothing like napms. + * library, there is nothing like napms. */ #if HAVE_NAPMS #define my_napms(ms) napms(ms) @@ -162,7 +162,7 @@ static void my_napms(int ms) { if (ms > 0) { -#if defined(_NC_WINDOWS) +#if defined(_NC_WINDOWS_NATIVE) Sleep((unsigned int) ms); #else struct timeval data; @@ -178,9 +178,9 @@ static int get_number(NCURSES_CONST char *cap, const char *env) { int result = tgetnum(cap); - char *value = env ? getenv(env) : 0; - if (value != 0 && *value != 0) { - char *next = 0; + const char *value = env ? getenv(env) : NULL; + if (value != NULL && *value != 0) { + char *next = NULL; long check = strtol(value, &next, 10); if (check > 0 && *next == '\0') result = (int) check; @@ -229,7 +229,7 @@ main(int argc, char *argv[]) double c; char buffer[1024]; char area[1024]; - char *name; + NCURSES_CONST char *name; size_t need; char *my_env; @@ -254,21 +254,18 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } - if ((name = getenv("TERM")) == 0) { + if ((name = getenv("TERM")) == NULL) { fprintf(stderr, "TERM is not set\n"); ExitProgram(EXIT_FAILURE); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm((unsigned) r_option); InitAndCatch(ch = tgetent(buffer, name), onsig); @@ -285,7 +282,7 @@ main(int argc, char *argv[]) } num_colors = tgetnum("Co"); -#define GetNumber(cap,env) get_number(cap, e_option ? env : 0) +#define GetNumber(cap,env) get_number(cap, e_option ? env : NULL) num_lines = GetNumber("li", "LINES"); num_columns = GetNumber("co", "COLUMNS"); diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c index b4b52193d262..1e6ca4d09d55 100644 --- a/test/dots_xcurses.c +++ b/test/dots_xcurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,13 +30,13 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_xcurses.c,v 1.34 2025/08/08 16:45:28 tom Exp $ * * A simple demo of the wide-curses interface used for comparison with termcap. */ #include <test.priv.h> -#if !defined(_NC_WINDOWS) +#if !defined(_NC_WINDOWS_NATIVE) #include <sys/time.h> #endif @@ -54,6 +54,7 @@ static bool interrupted = FALSE; static long total_chars = 0; +static long total_skips = 0; static time_t started; #if HAVE_ALLOC_PAIR @@ -69,6 +70,8 @@ cleanup(void) fprintf(stderr, "\n\n%ld total cells, rate %.2f/sec\n", total_chars, ((double) (total_chars) / (double) (time((time_t *) 0) - started))); + if (total_skips) + fprintf(stderr, "%ld total skipped\n", total_skips); } static void @@ -91,6 +94,7 @@ mypair(int fg, int bg) #if HAVE_ALLOC_PAIR if (x_option) { result = alloc_pair(fg, bg); + assert(result < COLOR_PAIRS); } else #endif { @@ -106,6 +110,8 @@ set_colors(int fg, int bg) int pair = mypair(fg, bg); if (pair > 0) { (void) color_set((short) pair, NewPair(pair)); + } else { + ++total_skips; } } @@ -120,7 +126,7 @@ usage(int ok) ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors()" + ," -d invoke use_default_colors" #endif #if HAVE_USE_ENV ," -e allow environment $LINES / $COLUMNS" @@ -192,17 +198,14 @@ main(int argc, char *argv[]) x_option = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } setlocale(LC_ALL, ""); - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm(r_option); InitAndCatch(initscr(), onsig); @@ -228,6 +231,8 @@ main(int argc, char *argv[]) pair = mypair(fg, bg); if (pair > 0) { InitPair(pair, fg, bg); + } else { + ++total_skips; } } } diff --git a/test/dump_window.c b/test/dump_window.c index eed4dbcbdf83..e6115eb8b4a6 100644 --- a/test/dump_window.c +++ b/test/dump_window.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: dump_window.c,v 1.5 2023/11/11 00:30:50 tom Exp $ + * $Id: dump_window.c,v 1.6 2024/12/07 23:03:07 tom Exp $ */ #include <dump_window.h> @@ -37,7 +37,7 @@ open_dump(const char *fn) { int result = 0; close_dump(); - if ((dumpfp = fopen(fn, "a")) != 0) + if ((dumpfp = fopen(fn, "a")) != NULL) result = 1; return result; } @@ -45,9 +45,9 @@ open_dump(const char *fn) void close_dump(void) { - if (dumpfp != 0) { + if (dumpfp != NULL) { fclose(dumpfp); - dumpfp = 0; + dumpfp = NULL; } } @@ -55,14 +55,14 @@ void dump_window(WINDOW *w) { wgetch(w); - if (dumpfp != 0) { + if (dumpfp != NULL) { int y, x; int oldy, oldx; int maxy, maxx; int pass; - char *cvec = 0; - char *avec = 0; - char *pvec = 0; + char *cvec = NULL; + char *avec = NULL; + char *pvec = NULL; int ccnt = 0; int acnt = 0; int pcnt = 0; diff --git a/test/dup_field.c b/test/dup_field.c index 68198ed755b3..a7e297baf9c7 100644 --- a/test/dup_field.c +++ b/test/dup_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2022,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: dup_field.c,v 1.8 2023/11/11 00:29:10 tom Exp $ + * $Id: dup_field.c,v 1.14 2025/07/05 15:11:35 tom Exp $ * * Demonstrate dup_field(). */ @@ -62,7 +62,7 @@ static struct { { CTRL('W'), REQ_NEXT_WORD, "go to next word" }, { CTRL('X'), REQ_CLR_FIELD, "clear field" }, { CTRL('['), MY_QUIT, "exit form" }, - { KEY_F(1), MY_HELP, "show this screen", }, + { HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" }, { KEY_BTAB, REQ_PREV_FIELD, "go to previous field" }, { KEY_DOWN, REQ_DOWN_CHAR, "move down 1 character" }, @@ -91,19 +91,21 @@ my_help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -146,27 +148,27 @@ erase_form(FORM *f) } static FieldAttrs * -my_field_attrs(FIELD *f) +my_field_attrs(NCURSES_CONST FIELD *f) { return (FieldAttrs *) field_userptr(f); } static int -buffer_length(FIELD *f) +buffer_length(NCURSES_CONST FIELD *f) { return my_field_attrs(f)->row_lengths[0]; } static void -set_buffer_length(FIELD *f, int length) +set_buffer_length(NCURSES_CONST FIELD *f, int length) { my_field_attrs(f)->row_lengths[0] = length; } static int -offset_in_field(FORM *form) +offset_in_field(NCURSES_CONST FORM *form) { - FIELD *field = current_field(form); + NCURSES_CONST FIELD *field = current_field(form); int currow, curcol; form_getyx(form, currow, curcol); @@ -245,7 +247,7 @@ my_edit_field(FORM *form, int *result) default: modified = (ch < MIN_FORM_COMMAND - && isprint(ch)); + && isprint(UChar(ch))); break; } @@ -347,7 +349,7 @@ demo_forms(void) all_fields[n] = (FIELD *) 0; - if ((form = new_form(all_fields)) != 0) { + if ((form = new_form(all_fields)) != NULL) { int finished = 0; post_form(form); @@ -369,7 +371,7 @@ demo_forms(void) free_form(form); } - for (c = 0; all_fields[c] != 0; c++) { + for (c = 0; all_fields[c] != NULL; c++) { free_edit_field(all_fields[c]); free_field(all_fields[c]); } @@ -404,11 +406,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/echochar.c b/test/echochar.c index 08497069419a..958d6950dc26 100644 --- a/test/echochar.c +++ b/test/echochar.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2006-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: echochar.c,v 1.26 2023/05/27 20:13:10 tom Exp $ + * $Id: echochar.c,v 1.28 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the echochar function (compare to dots.c). * Thomas Dickey - 2006/11/4 @@ -108,7 +108,7 @@ main(int argc, char *argv[]) double c; bool use_colors; bool opt_r = FALSE; - char *my_pairs = 0; + char *my_pairs = NULL; int last_fg = 0; int last_bg = 0; @@ -117,11 +117,8 @@ main(int argc, char *argv[]) case 'r': opt_r = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -134,10 +131,10 @@ main(int argc, char *argv[]) if (COLOR_PAIRS > 0) { my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS); } - use_colors = (my_pairs != 0); + use_colors = (my_pairs != NULL); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); curs_set(0); diff --git a/test/edit_field.c b/test/edit_field.c index b2b208459357..7bea65a2fcc2 100644 --- a/test/edit_field.c +++ b/test/edit_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2003-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: edit_field.c,v 1.31 2020/02/02 23:34:34 tom Exp $ + * $Id: edit_field.c,v 1.34 2025/01/11 14:54:49 tom Exp $ * * A wrapper for form_driver() which keeps track of the user's editing changes * for each field, and makes the resulting length available as a @@ -131,7 +131,7 @@ static struct { CTRL(']'), MY_INS_MODE, "toggle REQ_INS_MODE/REQ_OVL_MODE", }, { - KEY_F(1), MY_HELP, "show this screen", + HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" @@ -188,19 +188,21 @@ help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -249,7 +251,7 @@ init_edit_field(FIELD *f, char *value) { char empty[1]; FieldAttrs *ptr = field_attrs(f); - if (ptr == 0) { + if (ptr == NULL) { int rows, cols, frow, fcol, nrow, nbuf; ptr = typeCalloc(FieldAttrs, (size_t) 1); @@ -259,7 +261,7 @@ init_edit_field(FIELD *f, char *value) ptr->row_lengths = typeCalloc(int, (size_t) nrow + 1); } } - if (value == 0) { + if (value == NULL) { value = empty; *value = '\0'; } @@ -421,7 +423,7 @@ void free_edit_field(FIELD *f) { FieldAttrs *ptr = field_attrs(f); - if (ptr != 0) { + if (ptr != NULL) { free(ptr->row_lengths); free(ptr); } diff --git a/test/extended_color.c b/test/extended_color.c index 746c035927b1..4204e5312d9d 100644 --- a/test/extended_color.c +++ b/test/extended_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2022,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: extended_color.c,v 1.20 2022/12/10 22:28:50 tom Exp $ + * $Id: extended_color.c,v 1.21 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -173,11 +173,8 @@ main(int argc, char *argv[]) opt_s = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/filter.c b/test/filter.c index b7444569b789..7f46820ef280 100644 --- a/test/filter.c +++ b/test/filter.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey 1998 * - * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $ + * $Id: filter.c,v 1.43 2025/07/05 15:11:35 tom Exp $ * * An example of the 'filter()' function in ncurses, this program prompts * for commands and executes them (like a command shell). It illustrates @@ -65,7 +65,7 @@ show_prompt(int underline, bool clocked) if (clocked) { if (limit >= 3) { time_t now = time((time_t *) 0); - struct tm *my = localtime(&now); + const struct tm *my = localtime(&now); char buffer[80]; int skip, y, x; int margin; @@ -123,7 +123,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled) if (first) { getyx(stdscr, y, x); first = FALSE; - } else { + } else if (limit > 0) { int left = 0; /* @@ -264,12 +264,12 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled) /* * Cancel xterm's alternate-screen mode (from dialog -TD) */ -#define isprivate(s) ((s) != 0 && strstr(s, "\033[?") != 0) +#define isprivate(s) ((s) != NULL && strstr(s, "\033[?") != NULL) static void cancel_altscreen(void) { if (isatty(fileno(stdout)) - && key_mouse != 0 /* xterm and kindred */ + && key_mouse != NULL /* xterm and kindred */ && isprivate(enter_ca_mode) && isprivate(exit_ca_mode)) { /* @@ -292,8 +292,8 @@ cancel_altscreen(void) * implementation of alternate-screen in rxvt, etc., which clear more * of the display than they should. */ - enter_ca_mode = 0; - exit_ca_mode = 0; + enter_ca_mode = NULL; + exit_ca_mode = NULL; } } #endif @@ -310,7 +310,7 @@ usage(int ok) #ifdef NCURSES_VERSION ," -a suppress xterm alternate-screen by amending smcup/rmcup" #endif - ," -c show current time on prompt line with \"Command\"" + ," -t show current time on prompt line with \"Command\"" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" #endif @@ -335,7 +335,7 @@ main(int argc, char *argv[]) #ifdef NCURSES_VERSION bool a_option = FALSE; #endif - bool c_option = FALSE; + bool t_option = FALSE; #if HAVE_USE_DEFAULT_COLORS bool d_option = FALSE; #endif @@ -344,15 +344,15 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "adtip")) != -1) { switch (ch) { #ifdef NCURSES_VERSION case 'a': a_option = TRUE; break; #endif - case 'c': - c_option = TRUE; + case 't': + t_option = TRUE; break; #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -365,11 +365,8 @@ main(int argc, char *argv[]) case 'p': p_option = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -380,7 +377,7 @@ main(int argc, char *argv[]) if (i_option) { initscr(); } else { - if (newterm((char *) 0, stdout, stdin) == 0) { + if (newterm((char *) 0, stdout, stdin) == NULL) { fprintf(stderr, "cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -408,7 +405,7 @@ main(int argc, char *argv[]) for (;;) { int code = new_command(buffer, sizeof(buffer) - 1, - underline, c_option, p_option); + underline, t_option, p_option); if (code == ERR || *buffer == '\0') break; reset_shell_mode(); diff --git a/test/firework.c b/test/firework.c index 54e4036cf6a2..028913f76b64 100644 --- a/test/firework.c +++ b/test/firework.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: firework.c,v 1.40 2022/12/04 00:40:11 tom Exp $ + * $Id: firework.c,v 1.41 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -181,11 +181,8 @@ main(int argc, char *argv[]) d_option = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/firstlast.c b/test/firstlast.c index c66c2b8511c3..bdcf1584875e 100644 --- a/test/firstlast.c +++ b/test/firstlast.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2025 Thomas E. Dickey * * Copyright 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * This test was written by Alexander V. Lukyanov to demonstrate difference * between ncurses 4.1 and SVR4 curses * - * $Id: firstlast.c,v 1.10 2022/12/10 23:31:31 tom Exp $ + * $Id: firstlast.c,v 1.11 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -99,11 +99,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/foldkeys.c b/test/foldkeys.c index bb3801e282fe..830cc95f10be 100644 --- a/test/foldkeys.c +++ b/test/foldkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey, 2006 * - * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $ + * $Id: foldkeys.c,v 1.16 2025/07/05 15:11:35 tom Exp $ * * Demonstrate a method for altering key definitions at runtime. * @@ -55,7 +55,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -112,7 +112,7 @@ demo_foldkeys(void) for (code = 0; code < STRCOUNT; ++code) { NCURSES_CONST char *name = strnames[code]; NCURSES_CONST char *value = tigetstr(name); - if (value != 0 && value != (NCURSES_CONST char *) -1) { + if (value != NULL && value != (NCURSES_CONST char *) -1) { info[info_len].name = strnames[code]; info[info_len].code = key_defined(value); info[info_len].value = value; @@ -129,7 +129,7 @@ demo_foldkeys(void) */ for (code = KEY_MAX; code < MAX_KEYS; ++code) { NCURSES_CONST char *name = keyname(code); - if (name != 0) { + if (name != NULL) { info[info_len].name = name; info[info_len].code = code; info[info_len].value = tigetstr(name); @@ -155,8 +155,10 @@ demo_foldkeys(void) &second, final) == 3 && *final != ';' + && first >= 0 + && first < 1024 && (need = strlen(info[j].value)) != 0 - && (value = strdup(info[j].value)) != 0) { + && (value = malloc(need + 8)) != NULL) { (void) need; /* _nc_SLIMIT is normally nothing */ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final); for (k = 0; k < info_len; ++k) { @@ -221,18 +223,15 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } if (optind < argc) usage(FALSE); - if (newterm(0, stdout, stdin) == 0) { + if (newterm(NULL, stdout, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -262,7 +261,7 @@ main(int argc, char *argv[]) printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", - name != 0 ? name : "<null>"); + name != NULL ? name : "<null>"); log_last_line(stdscr); clrtoeol(); if (ch == 'q') diff --git a/test/form_driver_w.c b/test/form_driver_w.c index 544060dcc101..603cd21129a6 100644 --- a/test/form_driver_w.c +++ b/test/form_driver_w.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $ + * $Id: form_driver_w.c,v 1.20 2025/07/05 15:21:56 tom Exp $ * * Test form_driver_w (int, int, wchar_t), a wide char aware * replacement of form_driver. @@ -68,13 +68,13 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " ^D,^Q,ESC - quit program", " <Tab>,<Down> - move to next field", " <BackTab>,<Up> - move to previous field", - 0 + NULL }; #define NUM_FIELDS 3 @@ -88,11 +88,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/gdc.6 b/test/gdc.6 index bf90b26f8b25..700687e63694 100644 --- a/test/gdc.6 +++ b/test/gdc.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020 Thomas E. Dickey * +.\" Copyright 2020,2024 Thomas E. Dickey * .\" Copyright 1998-2006,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,42 +27,80 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: gdc.6,v 1.6 2020/02/02 23:34:34 tom Exp $ -.TH GDC 6 2020-02-02 ncurses-examples Games +.\" $Id: gdc.6,v 1.10 2024/06/22 21:31:03 tom Exp $ +.TH GDC 6 2024-06-15 ncurses-examples Games +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} .SH NAME -gdc \- grand digital clock (curses) +gdc \- +grand digital clock using +.I curses .SH SYNOPSIS -.B gdc \fP[\fIoptions\fP] [\fIn\fP] +.B gdc +.RB [ \-dns ] +.RB [ \-t +.IB hh : mm : ss\c +] +.RI [ count ] .SH DESCRIPTION -.I Gdc -runs a digital clock made of reverse-video blanks on a terminal screen. -If the terminal supports color, the clock is drawn in red. -You can make the clock stop, pause or resume by pressing a ``q'', -``s'' or space, respectively. +.I gdc +uses +.I curses +to display a clock on the terminal. +It constructs the digits from reverse-video blank characters. +If the terminal type supports color, +the digits are drawn in red. +Make the clock stop, +pause, +or resume by typing \*(``q\*('', +\*(``s\*('', +or space, +respectively. +.PP +Given a numeric operand, +the clock +stops after +.I count +seconds. +Normally, +.I gdc +runs \*(``forever\*('' +(at least 2 billion seconds). .SH OPTIONS .TP .B \-d -use terminal's default colors for the background. +uses the terminal's default background color. .TP .B \-n -redirects input to /dev/null, making it ignore the stop/pause commands. -You can still stop it by pressing the interrupt key. +reads input from +.IR \%/dev/null , +making +.I gdc +ignore the stop and pause commands. +You can still stop it with a terminal interrupt. .TP .B \-s -makes digits scroll as they change. -When running on a fast display, the program breaks up the scrolling into -subsecond repaints, making the operation appear smooth. +scrolls the digits up as they change. +When running on a fast display, +the program breaks up the scrolling into sub-second redraws, +making the operation appear smooth. .TP -.B \-t \fIhh:mm:ss\fP -specify starting time (default is ``now''). -.PP -With an optional numeric argument -.I num -it stops after -.I num -seconds. -Normally it runs "forever" (counting down from 2 billion seconds). -.SH AUTHOR -Amos Shapir, modified for curses by John Lupien. -.br -Improvements for ncurses by Thomas Dickey. +.BR \-t \ \c +.IB hh : mm : ss +uses the specified time instead of the current time. +.SH AUTHORS +Amos Shapir, +John Lupien +(modifications for +.IR curses ), +Thomas Dickey +(improvements for +.IR \%ncurses ) diff --git a/test/gdc.c b/test/gdc.c index 7243c104b173..b9d88ddede62 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * modified 10-18-89 for curses (jrl) * 10-18-89 added signal handling * - * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $ + * $Id: gdc.c,v 1.65 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -60,6 +60,7 @@ static long older[6], next[6], newer[6], mask; static int sigtermed = 0; static bool redirected = FALSE; static bool hascolor = FALSE; +static bool hascustomtime = FALSE; static void sighndl(int signo) @@ -149,23 +150,23 @@ set(int t, int n) mask |= m; } -static void +static GCC_NORETURN void usage(int ok) { static const char *msg[] = { - "Usage: gdc [options] [count]" + "usage: gdc [-dns] -[t HH:MM:SS] [COUNT]" + ,"" + ,"Display a digital clock, running indefinitely or for COUNT seconds." ,"" ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors" + ," -d uses the terminal's default background color" #endif - ," -n redirect input to /dev/null" - ," -s scroll each number into place, rather than flipping" - ," -t TIME specify starting time as hh:mm:ss (default is ``now'')" - ,"" - ,"If you specify a count, gdc runs for that number of seconds" + ," -n reads input from /dev/null" + ," -s scrolls each digit into place" + ," -t TIME specify starting time as hh:mm:ss (default is \"now\")" }; unsigned j; for (j = 0; j < SIZEOF(msg); j++) @@ -179,13 +180,38 @@ parse_time(const char *value) int hh, mm, ss; int check; time_t result; - char c; - struct tm *tm; + char c = 0; + NCURSES_CONST struct tm *tm; - if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) { - if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) { - usage(FALSE); + switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) { + default: + usage(FALSE); + /* NOTREACHED */ + case 1: + if (strspn(value, "0123456789") >= 2) { + switch (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c)) { + default: + usage(FALSE); + /* NOTREACHED */ + case 1: + mm = 0; + /* FALLTHRU */ + case 2: + ss = 0; + /* FALLTHRU */ + case 3: + break; + } + break; + } else { + mm = 0; } + /* FALLTHRU */ + case 2: + ss = 0; + /* FALLTHRU */ + case 3: + break; } if ((hh < 0) || (hh >= 24) || @@ -217,7 +243,7 @@ int main(int argc, char *argv[]) { time_t now; - struct tm *tm; + NCURSES_CONST struct tm *tm; long t, a; int i, j, s, k, ch; int count = 0; @@ -247,13 +273,11 @@ main(int argc, char *argv[]) smooth = TRUE; break; case 't': + hascustomtime = TRUE; starts = parse_time(optarg); break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -266,9 +290,9 @@ main(int argc, char *argv[]) InitAndCatch({ if (redirected) { - char *name = getenv("TERM"); - if (name == 0 - || newterm(name, ofp, ifp) == 0) { + NCURSES_CONST char *name = getenv("TERM"); + if (name == NULL + || newterm(name, ofp, ifp) == NULL) { fprintf(stderr, "cannot open terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -399,14 +423,16 @@ main(int argc, char *argv[]) } } - /* this depends on the detailed format of ctime(3) */ - _nc_STRNCPY(buf, ctime(&now), (size_t) 30); - { - char *d2 = buf + 10; - char *s2 = buf + 19; - while ((*d2++ = *s2++) != '\0') ; + if (!hascustomtime) { + /* this depends on the detailed format of ctime(3) */ + _nc_STRNCPY(buf, ctime(&now), (size_t) 30); + { + char *d2 = buf + 10; + NCURSES_CONST char *s2 = buf + 19; + while ((*d2++ = *s2++) != '\0') ; + } + MvAddStr(16, 30, buf); } - MvAddStr(16, 30, buf); move(6, 0); drawbox(FALSE); diff --git a/test/hanoi.c b/test/hanoi.c index 6d92332fa095..06cea3fd2a4c 100644 --- a/test/hanoi.c +++ b/test/hanoi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ * * Date: 05.Nov.90 * - * $Id: hanoi.c,v 1.47 2022/12/04 00:40:11 tom Exp $ + * $Id: hanoi.c,v 1.48 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -289,11 +289,8 @@ main(int argc, char **argv) case 'X': AutoFlag = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/hashtest.c b/test/hashtest.c index be79c0e10372..28ad009bdc8d 100644 --- a/test/hashtest.c +++ b/test/hashtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * * Generate timing statistics for vertical-motion optimization. * - * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $ + * $Id: hashtest.c,v 1.43 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -158,13 +158,13 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c continuous (don't reset between refresh's)" - ," -F num leave 'num' lines constant for footer" - ," -H num leave 'num' lines constant for header" - ," -l num repeat test 'num' times" + ," -S continuous (don't reset between refresh's)" + ," -F NUM leave NUM lines constant for footer" + ," -H NUM leave NUM lines constant for header" + ," -r NUM repeat tests NUM times" ," -n test the normal optimizer" ," -o test the hashed optimizer" - ," -r reverse the loops" + ," -R reverse the loops" ," -s single-step" ," -x assume lower-right corner extension" }; @@ -188,9 +188,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "F:H:RSnor:sx")) != -1) { switch (ch) { - case 'c': + case 'S': continuous = TRUE; break; case 'F': @@ -199,7 +199,7 @@ main(int argc, char *argv[]) case 'H': head_lines = atoi(optarg); break; - case 'l': + case 'r': test_loops = atoi(optarg); assert(test_loops >= 0); break; @@ -209,7 +209,7 @@ main(int argc, char *argv[]) case 'o': test_optimize = TRUE; break; - case 'r': + case 'R': reverse_loops = TRUE; break; case 's': @@ -218,11 +218,8 @@ main(int argc, char *argv[]) case 'x': extend_corner = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/inch_wide.c b/test/inch_wide.c index 7b838d1dff28..5e096952b949 100644 --- a/test/inch_wide.c +++ b/test/inch_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $ + * $Id: inch_wide.c,v 1.16 2025/07/05 15:21:56 tom Exp $ */ /* int in_wch(cchar_t *wcval); @@ -61,7 +61,7 @@ Quit(int ch) static int test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Test input from screen using inch(), etc., in a moveable viewport.", "", @@ -70,11 +70,11 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) " h,j,k,l (and arrow-keys) - move viewport", " w - recur to new window", " for next input file", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int j; int txt_x = 0, txt_y = 0; @@ -82,7 +82,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) cchar_t ch; cchar_t text[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +110,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((j = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(j)) != OK) { break; @@ -155,7 +155,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': test_inchs(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -289,11 +289,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/inchs.c b/test/inchs.c index b5922dd65a80..f9d8dfdb90b6 100644 --- a/test/inchs.c +++ b/test/inchs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $ + * $Id: inchs.c,v 1.22 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey */ @@ -71,7 +71,7 @@ Quit(int ch) static int test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Test input from screen using inch(), etc., in a moveable viewport.", "", @@ -80,17 +80,17 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) " h,j,k,l (and arrow-keys) - move viewport", " w - recur to new window", " for next input file", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch, j; int txt_x = 0, txt_y = 0; int base_y; chtype text[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -109,7 +109,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txtwin = stdscr; base_y = BASE_Y; } - if (txtwin == 0) + if (txtwin == NULL) failed("cannot create txtwin"); keypad(txtwin, TRUE); /* enable keyboard mapping */ @@ -120,7 +120,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((j = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(j)) != OK) { break; @@ -165,7 +165,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': test_inchs(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -301,11 +301,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/ins_wide.c b/test/ins_wide.c index a732449331e9..08b1d1dac490 100644 --- a/test/ins_wide.c +++ b/test/ins_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $ + * $Id: ins_wide.c,v 1.34 2025/11/01 20:03:42 tom Exp $ * * Demonstrate the wins_wstr() and wins_wch functions. * Thomas Dickey - 2002/11/23 @@ -73,7 +73,7 @@ static bool w_opt = FALSE; static int n_opt = -1; static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -112,7 +112,7 @@ ColOf(const wchar_t *buffer, int length, int margin) int result; for (n = 0, result = margin + 1; n < length; ++n) { - int ch = buffer[n]; + int ch = (int) buffer[n]; switch (ch) { case '\n': /* actually newline should clear the remainder of the line @@ -225,9 +225,9 @@ test_inserts(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((int) (m_opt ? oMove : oDefault) | (int) ((w_opt || (level > 0)) @@ -500,11 +500,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/insdelln.c b/test/insdelln.c index 52ccfb620f9b..b19384595ecb 100644 --- a/test/insdelln.c +++ b/test/insdelln.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2008-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $ + * $Id: insdelln.c,v 1.19 2025/07/05 15:21:56 tom Exp $ * * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln */ @@ -71,7 +71,7 @@ color_params(unsigned state, int *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -107,7 +107,7 @@ video_params(unsigned state, unsigned *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -144,9 +144,9 @@ show_status(WINDOW *win, STATUS * sp) getyx(win, y, x); wmove(win, 0, 0); wprintw(win, "Count %d", sp->count); - if (sp->v_msg != 0) + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wclrtoeol(win); wmove(win, y, x); @@ -160,15 +160,15 @@ reshow_status(WINDOW *win, STATUS * sp) } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, sp->y_beg + 1, sp->x_beg + 1); - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); - if (win2 != 0) { + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -204,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp) static void show_help(WINDOW *win) { - static const char *table[] = + static NCURSES_CONST char *table[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -222,7 +222,7 @@ show_help(WINDOW *win) ,"q quit" ,"= resets count to zero." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, table); @@ -234,14 +234,14 @@ update_status(WINDOW *win, STATUS * sp) switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } @@ -398,11 +398,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/inserts.c b/test/inserts.c index b106ffc7d462..d06ce708724b 100644 --- a/test/inserts.c +++ b/test/inserts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $ + * $Id: inserts.c,v 1.37 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the winsstr() and winsch functions. * Thomas Dickey - 2002/10/19 @@ -98,7 +98,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -147,9 +147,9 @@ test_inserts(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove @@ -429,11 +429,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/key_names.c b/test/key_names.c index fa7fdba631a4..3a9664b66eaa 100644 --- a/test/key_names.c +++ b/test/key_names.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: key_names.c,v 1.11 2022/12/04 00:40:11 tom Exp $ + * $Id: key_names.c,v 1.13 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -76,11 +76,8 @@ main(int argc, char *argv[]) case 's': do_setup = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -100,7 +97,7 @@ main(int argc, char *argv[]) for (n = -1; n < KEY_MAX + 512; n++) { int check = wcwidth((wchar_t) n); const char *result = check >= 0 ? key_name((wchar_t) n) : "?"; - if (result != 0) + if (result != NULL) printf("%d(%5o):%s\n", n, n, result); } ExitProgram(EXIT_SUCCESS); diff --git a/test/keynames.c b/test/keynames.c index cae260f63fe5..44b12365556e 100644 --- a/test/keynames.c +++ b/test/keynames.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2006,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: keynames.c,v 1.13 2022/12/04 00:40:11 tom Exp $ + * $Id: keynames.c,v 1.15 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -73,11 +73,8 @@ main(int argc, char *argv[]) case 's': do_setup = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -97,7 +94,7 @@ main(int argc, char *argv[]) for (n = -1; n < KEY_MAX + 512; n++) { const char *result = keyname(n); - if (result != 0) + if (result != NULL) printf("%d(%5o):%s\n", n, n, result); } ExitProgram(EXIT_SUCCESS); diff --git a/test/knight.c b/test/knight.c index b15c4d23763e..50100cab38b6 100644 --- a/test/knight.c +++ b/test/knight.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995. Mouse support * added September 20th 1995. * - * $Id: knight.c,v 1.52 2022/12/04 00:40:11 tom Exp $ + * $Id: knight.c,v 1.54 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -450,7 +450,8 @@ iabs(int num) } static bool -evaluate_move(SQUARES squares, HISTORY * doneData, int doneSize, int row, int column) +evaluate_move(SQUARES squares, const HISTORY * doneData, int doneSize, + int row, int column) { if (doneSize <= 1) return (TRUE); @@ -943,11 +944,8 @@ main(int argc, char *argv[]) } xlimit = ylimit = ch; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/linedata.h b/test/linedata.h index f042ab44be0f..3ca9d4636724 100644 --- a/test/linedata.h +++ b/test/linedata.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2009-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,7 +28,7 @@ ****************************************************************************/ /* - * $Id: linedata.h,v 1.8 2020/02/02 23:34:34 tom Exp $ + * $Id: linedata.h,v 1.9 2024/12/07 23:00:37 tom Exp $ * * Utility functions for reading a line of text from a file. */ @@ -55,7 +55,7 @@ failed(const char *s) static void init_linedata(const char *name) { - if ((linedata = fopen(name, "r")) == 0) { + if ((linedata = fopen(name, "r")) == NULL) { failed(name); } } @@ -64,11 +64,11 @@ static int read_linedata(WINDOW *work) { int result; - if (linedata != 0) { + if (linedata != NULL) { result = fgetc(linedata); if (result == EOF) { fclose(linedata); - linedata = 0; + linedata = NULL; result = read_linedata(work); } else { wrefresh(work); diff --git a/test/list_keys.c b/test/list_keys.c index b616919f4653..f9c8b5a59e28 100644 --- a/test/list_keys.c +++ b/test/list_keys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: list_keys.c,v 1.33 2023/11/11 00:35:05 tom Exp $ + * $Id: list_keys.c,v 1.38 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -86,7 +86,7 @@ full_name(const char *name) { const char *result = name; int n; - for (n = 0; strnames[n] != 0; ++n) { + for (n = 0; strnames[n] != NULL; ++n) { if (!strcmp(name, strnames[n])) { result = strfnames[n]; break; @@ -104,7 +104,7 @@ show_key(const char *name, bool show) if (show && t_opt) fputc('"', stdout); - if (value != 0 && value != (char *) -1) { + if (value != NULL && value != (char *) -1) { while (*value != 0) { char buffer[10]; int ch = UChar(*value++); @@ -297,7 +297,7 @@ list_keys(TERMINAL **terms, int count) #if NCURSES_XNAMES if (x_opt) { for (k = 0; k < count; ++k) { - TERMTYPE *term; + const TERMTYPE *term; set_curterm(terms[k]); term = (TERMTYPE *) cur_term; total += (size_t) (NUM_STRINGS(term) - STRCOUNT); @@ -348,7 +348,7 @@ list_keys(TERMINAL **terms, int count) widths1 = (int) strlen(modifier); for (k = 0; k < count; ++k) { - char *value; + const char *value; set_curterm(terms[k]); if ((value = termname()) == NULL) failed("termname"); @@ -356,7 +356,7 @@ list_keys(TERMINAL **terms, int count) if (widths2 < check) widths2 = check; } - for (j = 0; Name(j) != 0; ++j) { + for (j = 0; Name(j) != NULL; ++j) { if (valid_key(Name(j), terms, count)) { const char *label = f_opt ? full_name(Name(j)) : Name(j); check = (int) strlen(label); @@ -399,7 +399,7 @@ list_keys(TERMINAL **terms, int count) widthsx = widths0 + ((count + 1) * widths2); - for (j = 0; Name(j) != 0; ++j) { + for (j = 0; Name(j) != NULL; ++j) { if (j == 0 || (Type(j) != Type(j - 1))) draw_line(widthsx); if (valid_key(Name(j), terms, count)) { @@ -440,9 +440,9 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -f print full names" + ," -f print full terminfo names" ," -m print modifier-column for shift/control keys" - ," -t print result as CSV table" + ," -t print the result as CSV table" #ifdef NCURSES_VERSION ," -x print extended capabilities" #endif @@ -479,11 +479,8 @@ main(int argc, char *argv[]) x_opt = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -498,7 +495,7 @@ main(int argc, char *argv[]) int n; for (n = optind; n < argc; ++n) { setupterm((NCURSES_CONST char *) argv[n], 1, &status); - if (status > 0 && cur_term != 0) { + if (status > 0 && cur_term != NULL) { terms[found++] = cur_term; } } diff --git a/test/lrtest.c b/test/lrtest.c index 0e609d012c96..52748a156969 100644 --- a/test/lrtest.c +++ b/test/lrtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2025 Thomas E. Dickey * * Copyright 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ * This can't be part of the ncurses test-program, because ncurses rips off the * bottom line to do labels. * - * $Id: lrtest.c,v 1.29 2022/12/10 23:44:18 tom Exp $ + * $Id: lrtest.c,v 1.30 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -119,11 +119,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/make-tar.sh b/test/make-tar.sh index df4b66aadab6..8bd8f1e53bce 100755 --- a/test/make-tar.sh +++ b/test/make-tar.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.21 2022/11/05 19:41:33 tom Exp $ +# $Id: make-tar.sh,v 1.23 2025/06/20 19:38:25 tom Exp $ ############################################################################## -# Copyright 2019-2021,2022 Thomas E. Dickey # +# Copyright 2019-2022,2025 Thomas E. Dickey # # Copyright 2010-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -62,10 +62,12 @@ grep_patchdate() { # The rpm spec-file in the ncurses tree is a template. Fill in the version # information from dist.mk edit_specfile() { + RPM_DATE=`date +'%a %b %d %Y' -d "$NCURSES_PATCH"` sed \ -e "s/\\<MAJOR\\>/$NCURSES_MAJOR/g" \ -e "s/\\<MINOR\\>/$NCURSES_MINOR/g" \ - -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" "$1" >"$1.new" + -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" \ + -e "s/\\<RPM_DATE\\>/$RPM_DATE/g" "$1" >"$1.new" chmod u+w "$1" mv "$1.new" "$1" same_timestamp "$1" @@ -74,7 +76,7 @@ edit_specfile() { make_changelog() { [ -f "$1" ] && chmod u+w "$1" cat >"$1" <<EOF -`echo $PKG_NAME|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low +`echo "$PKG_NAME"|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low * snapshot of ncurses subpackage for $PKG_NAME. @@ -96,22 +98,22 @@ trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15 trap "cd /; rm -rf $BUILD; exit 0" 0 umask 077 -if ! ( mkdir $BUILD ) +if ! ( mkdir "$BUILD" ) then echo "? cannot make build directory $BUILD" fi umask 022 -mkdir $BUILD/$ROOTNAME +mkdir "$BUILD/$ROOTNAME" -cp -p -r ./* $BUILD/$ROOTNAME/ || exit +cp -p -r ./* "$BUILD/$ROOTNAME/" || exit # Add the config.* utility scripts from the top-level directory. for i in . .. do for j in COPYING config.guess config.sub install-sh tar-copy.sh do - [ -f $i/$j ] && cp -p $i/$j $BUILD/$ROOTNAME/ + [ -f "$i/$j" ] && cp -p "$i/$j" "$BUILD/$ROOTNAME"/ done done @@ -130,20 +132,20 @@ cp -p "$SOURCE/NEWS" "$BUILD/$ROOTNAME" # cleanup empty directories (an artifact of ncurses source archives) -touch $BUILD/$ROOTNAME/MANIFEST -( cd $BUILD/$ROOTNAME && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST ) -same_timestamp $BUILD/$ROOTNAME/MANIFEST +touch "$BUILD/$ROOTNAME"/MANIFEST +( cd "$BUILD/$ROOTNAME" && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST ) +same_timestamp "$BUILD/$ROOTNAME"/MANIFEST -cd $BUILD || exit +cd "$BUILD" || exit # Remove build-artifacts. find . -name RCS -exec rm -rf {} \; -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null # There is no need for this script in the tar file. -rm -f $ROOTNAME/make-tar.sh +rm -f "$ROOTNAME"/make-tar.sh # Remove build-artifacts. find . -name "*.gz" -exec rm -rf {} \; @@ -154,10 +156,10 @@ chmod -R u+w . # Cleanup timestamps [ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME" -tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz" +tar cf - $TAR_OPTIONS "$ROOTNAME" | gzip >"$DESTDIR/$ROOTNAME.tar.gz" cd "$DESTDIR" || exit pwd -ls -l $ROOTNAME.tar.gz +ls -l "$ROOTNAME".tar.gz # vi:ts=4 sw=4 diff --git a/test/modules b/test/modules index fb97d027e3d8..168a98b70a75 100644 --- a/test/modules +++ b/test/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.79 2023/11/10 11:48:20 tom Exp $ +# $Id: modules,v 1.82 2025/07/13 09:08:38 tom Exp $ ############################################################################## -# Copyright 2018-2022,2023 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -33,8 +33,8 @@ # Test-Program modules @ base -back_ground progs $(srcdir) $(HEADER_DEPS) -background progs $(srcdir) $(HEADER_DEPS) +back_ground progs $(srcdir) $(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h +background progs $(srcdir) $(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h blue progs $(srcdir) $(HEADER_DEPS) bs progs $(srcdir) $(HEADER_DEPS) cardfile progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h $(incdir)/form.h @@ -42,7 +42,7 @@ chgat progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h clip_printw progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h color_content progs $(srcdir) $(HEADER_DEPS) color_set progs $(srcdir) $(HEADER_DEPS) -combine progs $(srcdir) $(HEADER_DEPS) +combine progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_window.h $(srcdir)/popup_msg.h demo_altkeys progs $(srcdir) $(HEADER_DEPS) demo_defkey progs $(srcdir) $(HEADER_DEPS) demo_forms progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h @@ -51,8 +51,8 @@ demo_menus progs $(srcdir) $(HEADER_DEPS) $(incdir)/menu.h demo_new_pair progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h demo_panels progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h demo_tabs progs $(srcdir) $(HEADER_DEPS) -demo_termcap progs $(srcdir) $(HEADER_DEPS) -demo_terminfo progs $(srcdir) $(HEADER_DEPS) +demo_termcap progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h $(incdir)/termcap.h +demo_terminfo progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h ditto progs $(srcdir) $(HEADER_DEPS) dots progs $(srcdir) $(HEADER_DEPS) dots_curses progs $(srcdir) $(HEADER_DEPS) @@ -60,7 +60,7 @@ dots_mvcur progs $(srcdir) $(HEADER_DEPS) dots_termcap progs $(srcdir) $(HEADER_DEPS) dots_xcurses progs $(srcdir) $(HEADER_DEPS) dump_window progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_window.h -dup_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h +dup_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h echochar progs $(srcdir) $(HEADER_DEPS) edit_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h extended_color progs $(srcdir) $(HEADER_DEPS) @@ -68,7 +68,7 @@ filter progs $(srcdir) $(HEADER_DEPS) firework progs $(srcdir) $(HEADER_DEPS) firstlast progs $(srcdir) $(HEADER_DEPS) foldkeys progs $(srcdir) $(HEADER_DEPS) -form_driver_w progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h +form_driver_w progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h $(incdir)/form.h gdc progs $(srcdir) $(HEADER_DEPS) hanoi progs $(srcdir) $(HEADER_DEPS) hashtest progs $(srcdir) $(HEADER_DEPS) @@ -80,15 +80,15 @@ inserts progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h key_names progs $(srcdir) $(HEADER_DEPS) keynames progs $(srcdir) $(HEADER_DEPS) knight progs $(srcdir) $(HEADER_DEPS) -list_keys progs $(srcdir) $(HEADER_DEPS) +list_keys progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h lrtest progs $(srcdir) $(HEADER_DEPS) -move_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h +move_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h movewindow progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h ncurses progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h $(incdir)/menu.h $(incdir)/form.h newdemo progs $(srcdir) $(HEADER_DEPS) padview progs $(srcdir) $(HEADER_DEPS) $(srcdir)/widechars.h $(srcdir)/popup_msg.h pair_content progs $(srcdir) $(HEADER_DEPS) -picsmap progs $(srcdir) $(HEADER_DEPS) +picsmap progs $(srcdir) $(HEADER_DEPS) $(srcdir)/picsmap.h popup_msg progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h railroad progs $(srcdir) $(HEADER_DEPS) rain progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h @@ -103,8 +103,8 @@ test_addwstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_arrays progs $(srcdir) $(HEADER_DEPS) test_delwin progs $(srcdir) $(HEADER_DEPS) test_endwin progs $(srcdir) $(HEADER_DEPS) -test_get_wstr progs $(srcdir) $(HEADER_DEPS) -test_getstr progs $(srcdir) $(HEADER_DEPS) +test_get_wstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h +test_getstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h test_instr progs $(srcdir) $(HEADER_DEPS) test_inwstr progs $(srcdir) $(HEADER_DEPS) test_mouse progs $(srcdir) $(HEADER_DEPS) @@ -112,7 +112,7 @@ test_opaque progs $(srcdir) $(HEADER_DEPS) test_setupterm progs $(srcdir) $(HEADER_DEPS) test_sgr progs $(srcdir) $(HEADER_DEPS) test_termattrs progs $(srcdir) $(HEADER_DEPS) -test_tparm progs $(srcdir) $(HEADER_DEPS) +test_tparm progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h test_unget_wch progs $(srcdir) $(HEADER_DEPS) test_vid_puts progs $(srcdir) $(HEADER_DEPS) test_vidputs progs $(srcdir) $(HEADER_DEPS) diff --git a/test/move_field.c b/test/move_field.c index 84bac3f4b565..6045da638db0 100644 --- a/test/move_field.c +++ b/test/move_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2022,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: move_field.c,v 1.15 2023/11/11 00:28:19 tom Exp $ + * $Id: move_field.c,v 1.22 2025/07/05 15:11:35 tom Exp $ * * Demonstrate move_field(). */ @@ -62,7 +62,7 @@ static struct { { CTRL('W'), REQ_NEXT_WORD, "go to next word" }, { CTRL('X'), REQ_CLR_FIELD, "clear field" }, { CTRL('['), MY_QUIT, "exit form" }, - { KEY_F(1), MY_HELP, "show this screen", }, + { HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" }, { KEY_BTAB, REQ_PREV_FIELD, "go to previous field" }, { KEY_DOWN, REQ_DOWN_CHAR, "move down 1 character" }, @@ -91,19 +91,21 @@ my_help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -146,27 +148,27 @@ erase_form(FORM *f) } static FieldAttrs * -my_field_attrs(FIELD *f) +my_field_attrs(NCURSES_CONST FIELD *f) { return (FieldAttrs *) field_userptr(f); } static int -buffer_length(FIELD *f) +buffer_length(NCURSES_CONST FIELD *f) { return my_field_attrs(f)->row_lengths[0]; } static void -set_buffer_length(FIELD *f, int length) +set_buffer_length(NCURSES_CONST FIELD *f, int length) { my_field_attrs(f)->row_lengths[0] = length; } static int -offset_in_field(FORM *form) +offset_in_field(NCURSES_CONST FORM *form) { - FIELD *field = current_field(form); + NCURSES_CONST FIELD *field = current_field(form); int currow, curcol; form_getyx(form, currow, curcol); @@ -245,7 +247,7 @@ my_edit_field(FORM *form, int *result) default: modified = (ch < MIN_FORM_COMMAND - && isprint(ch)); + && isprint(UChar(ch))); break; } @@ -275,9 +277,9 @@ copy_fields(FIELD **source, size_t length) /* display a status message to show what's happening */ static void -show_status(FORM *form, FIELD *field) +show_status(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *field) { - WINDOW *sub = form_sub(form); + NCURSES_CONST WINDOW *sub = form_sub(form); int currow, curcol; getyx(stdscr, currow, curcol); @@ -444,7 +446,7 @@ demo_forms(void) all_fields[n] = (FIELD *) 0; - if ((form = new_form(all_fields)) != 0) { + if ((form = new_form(all_fields)) != NULL) { int finished = 0; post_form(form); @@ -466,7 +468,7 @@ demo_forms(void) free_form(form); } - for (c = 0; all_fields[c] != 0; c++) { + for (c = 0; all_fields[c] != NULL; c++) { free_edit_field(all_fields[c]); free_field(all_fields[c]); } @@ -501,11 +503,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/movewindow.c b/test/movewindow.c index 07797ca67b9e..c31cb5bd9b25 100644 --- a/test/movewindow.c +++ b/test/movewindow.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: movewindow.c,v 1.54 2023/05/27 20:13:10 tom Exp $ + * $Id: movewindow.c,v 1.59 2025/07/05 15:11:35 tom Exp $ * * Demonstrate move functions for windows and derived windows from the curses * library. @@ -135,7 +135,7 @@ tail_line(CONST_FMT char *fmt, ...) */ static PAIR * selectcell(WINDOW *parent, - WINDOW *child, + NCURSES_CONST WINDOW *child, int uli, int ulj, int lri, int lrj, bool relative, @@ -149,7 +149,7 @@ selectcell(WINDOW *parent, res.y = uli; res.x = ulj; - if (child != 0) { + if (child != NULL) { if (relative) { getparyx(child, i, j); } else { @@ -252,24 +252,24 @@ getwindow(WINDOW *parent, PAIR * ul, PAIR * lr) int max_col = (parent == stdscr) ? COL_MAX : getmaxx(parent); int min_line = (parent == stdscr) ? LINE_MIN : 0; int max_line = (parent == stdscr) ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool result = FALSE; head_line("Use arrows to move cursor, anything else to mark corner 1"); - if ((tmp = selectcell(parent, 0, + if ((tmp = selectcell(parent, NULL, min_line, min_col, max_line, max_col, FALSE, - (bool *) 0)) != 0) { + (bool *) 0)) != NULL) { *ul = *tmp; MvWAddCh(parent, ul->y, ul->x, '*'); head_line("Use arrows to move cursor, anything else to mark corner 2"); - if ((tmp = selectcell(parent, 0, + if ((tmp = selectcell(parent, NULL, ul->y, ul->x, max_line, max_col, FALSE, - (bool *) 0)) != 0) { + (bool *) 0)) != NULL) { *lr = *tmp; MvWAddCh(parent, lr->y, lr->x, '*'); wmove(parent, lr->y, lr->x); @@ -346,9 +346,9 @@ window2num(const WINDOW *const win) } static WINDOW * -parent_of(WINDOW *win) +parent_of(NCURSES_CONST WINDOW *win) { - WINDOW *result = 0; + WINDOW *result = NULL; int n = window2num(win); if (n >= 0) result = all_windows[n].parent; @@ -429,13 +429,13 @@ move_window(WINDOW *win, bool recur) WINDOW *parent = parent_of(win); bool result = FALSE; - if (parent != 0) { + if (parent != NULL) { bool top = (parent == stdscr); int min_col = top ? COL_MIN : 0; int max_col = top ? COL_MAX : getmaxx(parent); int min_line = top ? LINE_MIN : 0; int max_line = top ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool more; head_line("Select new position for %swindow", top ? "" : "sub"); @@ -445,7 +445,7 @@ move_window(WINDOW *win, bool recur) min_line, min_col, max_line, max_col, FALSE, - &more)) != 0) { + &more)) != NULL) { int y0, x0; getbegyx(parent, y0, x0); /* @@ -474,7 +474,7 @@ move_window(WINDOW *win, bool recur) } static void -show_derwin(WINDOW *win) +show_derwin(NCURSES_CONST WINDOW *win) { int pary, parx, maxy, maxx; @@ -494,13 +494,13 @@ move_derwin(WINDOW *win) WINDOW *parent = parent_of(win); bool result = FALSE; - if (parent != 0) { + if (parent != NULL) { bool top = (parent == stdscr); int min_col = top ? COL_MIN : 0; int max_col = top ? COL_MAX : getmaxx(parent); int min_line = top ? LINE_MIN : 0; int max_line = top ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool more; show_derwin(win); @@ -509,7 +509,7 @@ move_derwin(WINDOW *win) min_line, min_col, max_line, max_col, TRUE, - &more)) != 0) { + &more)) != NULL) { if (mvderwin(win, tmp->y, tmp->x) != ERR) { refresh_all(win); doupdate(); @@ -577,16 +577,16 @@ static WINDOW * create_my_window(WINDOW *current) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(stdscr, &ul, &lr)) { result = newwin(lines_of(ul, lr), cols_of(ul, lr), pair_of(ul)); - if (result != 0) { + if (result != NULL) { fill_window(result, 'c'); add_window(stdscr, result); } } - if (result == 0) + if (result == NULL) result = current; return result; } @@ -595,16 +595,16 @@ static WINDOW * create_my_derwin(WINDOW *parent) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(parent, &ul, &lr)) { result = derwin(parent, lines_of(ul, lr), cols_of(ul, lr), pair_of(ul)); - if (result != 0) { + if (result != NULL) { fill_window(result, 'd'); add_window(parent, result); } } - if (result == 0) + if (result == NULL) result = parent; return result; } @@ -613,7 +613,7 @@ static WINDOW * create_my_subwin(WINDOW *parent) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(parent, &ul, &lr)) { result = subwin(parent, @@ -621,12 +621,12 @@ create_my_subwin(WINDOW *parent) cols_of(ul, lr), ul.y + getbegy(parent), ul.x + getbegx(parent)); - if (result != 0) { + if (result != NULL) { fill_window(result, 's'); add_window(parent, result); } } - if (result == 0) + if (result == NULL) result = parent; return result; } @@ -658,12 +658,16 @@ show_help(WINDOW *current) char **msgs = typeCalloc(char *, SIZEOF(help) + 1); size_t n; + size_t used; - for (n = 0; n < SIZEOF(help); ++n) { + for (n = used = 0; n < SIZEOF(help); ++n) { size_t need = (21 + strlen(help[n].msg)); - msgs[n] = typeMalloc(char, need); - _nc_SPRINTF(msgs[n], _nc_SLIMIT(need) - "%-20s%s", keyname(help[n].key), help[n].msg); + char *msg = typeMalloc(char, need); + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) + "%-20s%s", keyname(help[n].key), help[n].msg); + msgs[used++] = msg; + } } popup_msg2(current, msgs); for (n = 0; n < SIZEOF(help); ++n) { @@ -701,11 +705,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -718,7 +719,7 @@ main(int argc, char *argv[]) nonl(); intrflush(stdscr, FALSE); - add_window(0, current_win = stdscr); + add_window(NULL, current_win = stdscr); #ifdef NCURSES_MOUSE_VERSION (void) mousemask(BUTTON1_CLICKED, (mmask_t *) NULL); diff --git a/test/ncurses.c b/test/ncurses.c index a272d1423eee..06ce5f8f7ff5 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ AUTHOR Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.538 2023/11/11 01:23:59 tom Exp $ +$Id: ncurses.c,v 1.550 2025/11/01 20:12:49 tom Exp $ ***************************************************************************/ @@ -121,23 +121,23 @@ static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS; #endif #if HAVE_WCSRTOMBS -#define count_wchars(src, len, state) wcsrtombs(0, &src, len, state) -#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state) +#define count_wchars(src, len, state) wcsrtombs(NULL, &src, len, state) +#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state) #define reset_wchars(state) init_mb(state) #elif HAVE_WCSTOMBS && HAVE_MBTOWC && HAVE_MBLEN -#define count_wchars(src, len, state) wcstombs(0, src, len) -#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len) +#define count_wchars(src, len, state) wcstombs(NULL, src, len) +#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len) #define reset_wchars(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) #define state_unused #endif #if HAVE_MBSRTOWCS -#define count_mbytes(src, len, state) mbsrtowcs(0, &src, len, state) -#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state) +#define count_mbytes(src, len, state) mbsrtowcs(NULL, &src, len, state) +#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state) #define reset_mbytes(state) init_mb(state) #elif HAVE_MBSTOWCS && HAVE_MBTOWC && HAVE_MBLEN -#define count_mbytes(src, len, state) mbstowcs(0, src, len) -#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len) +#define count_mbytes(src, len, state) mbstowcs(NULL, src, len) +#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len) #define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) #define state_unused #endif @@ -273,7 +273,7 @@ wGetstring(WINDOW *win, char *buffer, int limit) ++x; break; default: - if (!isprint(ch) || ch >= KEY_MIN) { + if (!isprint(UChar(ch)) || ch >= KEY_MIN) { beep(); } else if ((int) strlen(buffer) < limit) { int j; @@ -328,7 +328,7 @@ make_fullwidth_digit(cchar_t *target, int digit) source[0] = fullwidth_digit(digit + '0'); source[1] = 0; - setcchar(target, source, A_NORMAL, 0, 0); + setcchar(target, source, A_NORMAL, 0, NULL); } #endif @@ -519,49 +519,47 @@ mouse_decode(MEVENT const *ep) _nc_STRCAT(buf, s, sizeof(buf)); \ _nc_STRCAT(buf, ", ", sizeof(buf)); \ } - - SHOW(BUTTON1_RELEASED, "release-1"); - SHOW(BUTTON1_PRESSED, "press-1"); - SHOW(BUTTON1_CLICKED, "click-1"); - SHOW(BUTTON1_DOUBLE_CLICKED, "doubleclick-1"); - SHOW(BUTTON1_TRIPLE_CLICKED, "tripleclick-1"); +#define MOUSE_ONE(b, m, s) \ + SHOW(m, s "-" #b) +#define MOUSE_ALL(b) do { \ + MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_RELEASED), "release"); \ + MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_PRESSED), "press"); \ + MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_CLICKED), "click"); \ + MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_DOUBLE_CLICKED), "doubleclick"); \ + MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_TRIPLE_CLICKED), "tripleclick"); \ + } while (0) + + MOUSE_ALL(1); #if NCURSES_MOUSE_VERSION == 1 - SHOW(BUTTON1_RESERVED_EVENT, "reserved-1"); + MOUSE_ONE(1, BUTTON1_RESERVED_EVENT, "reserved"); #endif - SHOW(BUTTON2_RELEASED, "release-2"); - SHOW(BUTTON2_PRESSED, "press-2"); - SHOW(BUTTON2_CLICKED, "click-2"); - SHOW(BUTTON2_DOUBLE_CLICKED, "doubleclick-2"); - SHOW(BUTTON2_TRIPLE_CLICKED, "tripleclick-2"); + MOUSE_ALL(2); #if NCURSES_MOUSE_VERSION == 1 - SHOW(BUTTON2_RESERVED_EVENT, "reserved-2"); + MOUSE_ONE(2, BUTTON2_RESERVED_EVENT, "reserved"); #endif - SHOW(BUTTON3_RELEASED, "release-3"); - SHOW(BUTTON3_PRESSED, "press-3"); - SHOW(BUTTON3_CLICKED, "click-3"); - SHOW(BUTTON3_DOUBLE_CLICKED, "doubleclick-3"); - SHOW(BUTTON3_TRIPLE_CLICKED, "tripleclick-3"); + MOUSE_ALL(3); #if NCURSES_MOUSE_VERSION == 1 - SHOW(BUTTON3_RESERVED_EVENT, "reserved-3"); + MOUSE_ONE(3, BUTTON3_RESERVED_EVENT, "reserved"); #endif - SHOW(BUTTON4_RELEASED, "release-4"); - SHOW(BUTTON4_PRESSED, "press-4"); - SHOW(BUTTON4_CLICKED, "click-4"); - SHOW(BUTTON4_DOUBLE_CLICKED, "doubleclick-4"); - SHOW(BUTTON4_TRIPLE_CLICKED, "tripleclick-4"); + MOUSE_ALL(4); #if NCURSES_MOUSE_VERSION == 1 - SHOW(BUTTON4_RESERVED_EVENT, "reserved-4"); + MOUSE_ONE(4, BUTTON4_RESERVED_EVENT, "reserved"); +#endif + +#if NCURSES_MOUSE_VERSION >= 2 + MOUSE_ALL(5); #endif -#if NCURSES_MOUSE_VERSION == 2 - SHOW(BUTTON5_RELEASED, "release-5"); - SHOW(BUTTON5_PRESSED, "press-5"); - SHOW(BUTTON5_CLICKED, "click-5"); - SHOW(BUTTON5_DOUBLE_CLICKED, "doubleclick-5"); - SHOW(BUTTON5_TRIPLE_CLICKED, "tripleclick-5"); +#if NCURSES_MOUSE_VERSION >= 3 + MOUSE_ALL(6); + MOUSE_ALL(7); + MOUSE_ALL(8); + MOUSE_ALL(9); + MOUSE_ALL(10); + MOUSE_ALL(11); #endif SHOW(BUTTON_CTRL, "ctrl"); @@ -683,7 +681,7 @@ wgetch_help(WINDOW *win, GetchFlags flags) const char *msg = help[n]; int row = 1 + (int) (n % chk); int col = (n >= chk) ? COLS / 2 : 0; - int flg = ((strstr(msg, "toggle") != 0) + int flg = ((strstr(msg, "toggle") != NULL) && (flags[UChar(*msg)] != FALSE)); if (*msg == '^' && ExitOnEscape()) msg = "^[,^q -- quit"; @@ -717,16 +715,16 @@ typedef struct { WINDOW *frame; } WINSTACK; -static WINSTACK *winstack = 0; +static WINSTACK *winstack = NULL; static unsigned len_winstack = 0; static void forget_boxes(void) { - if (winstack != 0) { + if (winstack != NULL) { free(winstack); } - winstack = 0; + winstack = NULL; len_winstack = 0; } @@ -737,7 +735,7 @@ remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win) assert(level < (unsigned) COLS); - if (winstack == 0) { + if (winstack == NULL) { len_winstack = 20; winstack = typeMalloc(WINSTACK, len_winstack); } else if (need >= len_winstack) { @@ -928,7 +926,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay) /* at least Solaris SVR4 curses breaks unctrl(128), etc. */ c2 &= 0x7f; #endif - if (isprint(c)) + if (isprint(UChar(c))) (void) wprintw(win, "%c", UChar(c)); else if (c2 != UChar(c)) (void) wprintw(win, "M-%s", unctrl(c2)); @@ -1030,7 +1028,7 @@ resize_wide_boxes(unsigned level, const WINDOW *const win) high -= 2; wide -= 2; werase(winstack[n].text); - box_set(winstack[n].frame, 0, 0); + box_set(winstack[n].frame, NULL, NULL); wnoutrefresh(winstack[n].frame); wprintw(winstack[n].text, "size %dx%d\n", @@ -1048,7 +1046,7 @@ static char * wcstos(const wchar_t *src) { int need; - char *result = 0; + char *result = NULL; const wchar_t *tmp = src; #ifndef state_unused mbstate_t state; @@ -1057,11 +1055,11 @@ wcstos(const wchar_t *src) reset_wchars(state); if ((need = (int) count_wchars(tmp, 0, &state)) > 0) { unsigned have = (unsigned) need; - if ((result = typeCalloc(char, have + 1)) != 0) { + if ((result = typeCalloc(char, have + 1)) != NULL) { tmp = src; if (trans_wchars(result, tmp, have, &state) != have) { free(result); - result = 0; + result = NULL; } } else { failed("wcstos"); @@ -1124,7 +1122,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) for (n = 0; (wchar_buf[n] = (wchar_t) wint_buf[n]) != 0; ++n) { ; } - if ((temp = wcstos(wchar_buf)) != 0) { + if ((temp = wcstos(wchar_buf)) != NULL) { wprintw(win, "I saw %d characters:\n\t`%s'.", (int) wcslen(wchar_buf), temp); free(temp); @@ -1161,7 +1159,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) WINDOW *wb = newwin(high, wide, new_y, new_x); WINDOW *wi = newwin(high - 2, wide - 2, new_y + 1, new_x + 1); - box_set(wb, 0, 0); + box_set(wb, NULL, NULL); wrefresh(wb); wmove(wi, 0, 0); remember_boxes(level, wi, wb); @@ -1191,7 +1189,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) resize_wide_boxes(level, win); } #endif - (void) waddstr(win, keyname((wchar_t) c)); + (void) waddstr(win, keyname((int) c)); } else { (void) waddstr(win, key_name((wchar_t) c)); if (c < 256 && iscntrl(c)) { @@ -1614,7 +1612,7 @@ attr_getc(int *skip, Repaint(); break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); attr_legend(helpwin); wGetchar(helpwin); @@ -1693,7 +1691,7 @@ attr_test(bool recur GCC_UNUSED) chtype extras = (chtype) ac; if (UseColors) { - NCURSES_PAIRS_T pair = 0; + NCURSES_PAIRS_T pair; if ((fg != COLOR_BLACK) || (bg != COLOR_BLACK)) { pair = 1; if (init_pair(pair, fg, bg) == ERR) { @@ -1795,7 +1793,7 @@ static void wide_adjust_attr_string(int adjust) { wchar_t save = wide_attr_test_string[0]; - int first = ((int) normal_wchar(save)) + adjust; + int first = ((int) normal_wchar((int) save)) + adjust; if (first >= ATTRSTRING_1ST) { int j, k; @@ -1837,7 +1835,7 @@ set_wide_background(NCURSES_PAIRS_T pair) blank[0] = ' '; blank[1] = 0; - setcchar(&normal, blank, A_NORMAL, pair, 0); + setcchar(&normal, blank, A_NORMAL, pair, NULL); bkgrnd(&normal); bkgrndset(&normal); } @@ -1854,7 +1852,7 @@ get_wide_background(void) if (getbkgrnd(&ch) != ERR) { wchar_t wch[CCHARW_MAX]; - if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) { + if (getcchar(&ch, wch, &attr, &pair, NULL) != ERR) { result = attr; } } @@ -1895,17 +1893,17 @@ wide_show_attr(WINDOW *win, wchar_t fill[2]; fill[0] = *s; fill[1] = L'\0'; - setcchar(&ch, fill, attr, pair, 0); + setcchar(&ch, fill, attr, pair, NULL); (void) wadd_wch(win, &ch); } } else { attr_t old_attr = 0; NCURSES_PAIRS_T old_pair = 0; - (void) (wattr_get) (win, &old_attr, &old_pair, 0); - (void) wattr_set(win, attr, pair, 0); + (void) (wattr_get) (win, &old_attr, &old_pair, NULL); + (void) wattr_set(win, attr, pair, NULL); (void) waddwstr(win, wide_attr_test_string); - (void) wattr_set(win, old_attr, old_pair, 0); + (void) wattr_set(win, old_attr, old_pair, NULL); } if (skip) printw("%*s", skip, " "); @@ -1969,8 +1967,8 @@ wide_attr_getc(int *skip, Repaint(); break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { - box_set(helpwin, 0, 0); + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { + box_set(helpwin, NULL, NULL); attr_legend(helpwin); wGetchar(helpwin); delwin(helpwin); @@ -2074,7 +2072,7 @@ x_attr_test(bool recur GCC_UNUSED) set_wide_background(pair); erase(); - box_set(stdscr, 0, 0); + box_set(stdscr, NULL, NULL); MvAddStr(0, 20, "Character attribute test display"); for (j = 0; j < my_size; ++j) { @@ -2258,7 +2256,7 @@ color_test(bool recur GCC_UNUSED) int col_limit; int row_limit; int per_row; - char *numbered = 0; + char *numbered = NULL; const char *hello; bool done = FALSE; bool opt_acsc = FALSE; @@ -2275,7 +2273,7 @@ color_test(bool recur GCC_UNUSED) } numbered = typeCalloc(char, COLS + 1); - done = ((COLS < 16) || (numbered == 0)); + done = ((COLS < 16) || (numbered == NULL)); /* * Because the number of colors is usually a power of two, we also use @@ -2345,7 +2343,6 @@ color_test(bool recur GCC_UNUSED) for (i = (NCURSES_PAIRS_T) (base_row * per_row); i < pairs_max; i++) { int row = grid_top + (i / per_row) - base_row; int col = (i % per_row + 1) * width; - NCURSES_PAIRS_T pair = i; if ((i / per_row) > row_limit) break; @@ -2355,6 +2352,7 @@ color_test(bool recur GCC_UNUSED) if (row >= 0 && move(row, col) != ERR) { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) InxToFG(i); NCURSES_COLOR_T bg = (NCURSES_COLOR_T) InxToBG(i); + NCURSES_PAIRS_T pair = i; init_pair(pair, fg, bg); attron(COLOR_PAIR(pair)); @@ -2481,7 +2479,7 @@ color_test(bool recur GCC_UNUSED) } break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); color_legend(helpwin, FALSE); wGetchar(helpwin); @@ -2517,7 +2515,7 @@ color_test(bool recur GCC_UNUSED) static int x_color_test(bool recur GCC_UNUSED) { - long i; + int i; int top = 0, width; int base_row = 0; int grid_top = top + 3; @@ -2527,7 +2525,7 @@ x_color_test(bool recur GCC_UNUSED) int col_limit; int row_limit; int per_row; - char *numbered = 0; + char *numbered = NULL; const char *hello; bool done = FALSE; bool opt_acsc = FALSE; @@ -2537,7 +2535,7 @@ x_color_test(bool recur GCC_UNUSED) bool opt_nums = FALSE; bool opt_xchr = FALSE; int opt_zoom = 0; - wchar_t *buffer = 0; + wchar_t *buffer = NULL; WINDOW *helpwin; if (!UseColors) { @@ -2546,7 +2544,7 @@ x_color_test(bool recur GCC_UNUSED) } numbered = typeCalloc(char, COLS + 1); buffer = typeCalloc(wchar_t, COLS + 1); - done = ((COLS < 16) || (numbered == 0) || (buffer == 0)); + done = ((COLS < 16) || (numbered == NULL) || (buffer == NULL)); /* * Because the number of colors is usually a power of two, we also use @@ -2613,17 +2611,17 @@ x_color_test(bool recur GCC_UNUSED) /* show color names/numbers across the top */ for (i = 0; i < per_row; i++) { show_color_name(top + 2, - ((int) i + 1) * width, - (int) i * zoom_size + MinColors, + (i + 1) * width, + i * zoom_size + MinColors, opt_wide, opt_zoom); } /* show a grid of colors, with color names/ numbers on the left */ for (i = (base_row * per_row); i < pairs_max; i++) { - int row = grid_top + ((int) i / per_row) - base_row; - int col = ((int) i % per_row + 1) * width; - int pair = (int) i; + int row = grid_top + (i / per_row) - base_row; + int col = (i % per_row + 1) * width; + int pair = i; if ((i / per_row) > row_limit) break; @@ -2765,7 +2763,7 @@ x_color_test(bool recur GCC_UNUSED) } break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); color_legend(helpwin, TRUE); wGetchar(helpwin); @@ -2828,7 +2826,7 @@ reset_all_colors(void) #define DecodeRGB(n) (NCURSES_COLOR_T) ((n * 1000) / 0xffff) static void -init_all_colors(bool xterm_colors, char *palette_file) +init_all_colors(bool xterm_colors, NCURSES_CONST char *palette_file) { NCURSES_PAIRS_T cp; all_colors = typeMalloc(RGB_DATA, (unsigned) MaxColors); @@ -2875,14 +2873,14 @@ init_all_colors(bool xterm_colors, char *palette_file) } reset_prog_mode(); } - if (palette_file != 0) { + if (palette_file != NULL) { FILE *fp = fopen(palette_file, "r"); - if (fp != 0) { + if (fp != NULL) { char buffer[BUFSIZ]; int red, green, blue; int scale = 1000; int c; - while (fgets(buffer, sizeof(buffer), fp) != 0) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { if (sscanf(buffer, "scale:%d", &c) == 1) { scale = c; if (scale < 100) @@ -3317,7 +3315,7 @@ slk_test(bool recur GCC_UNUSED) { int c, fmt = 1; char buf[9]; - char *s; + NCURSES_CONST char *s; attr_t attr = A_NORMAL; unsigned at_code = 0; #if HAVE_SLK_COLOR @@ -3387,7 +3385,7 @@ slk_test(bool recur GCC_UNUSED) case '8': MvAddStr(SLK_WORK, 0, "Please enter the label value: "); _nc_STRCPY(buf, "", sizeof(buf)); - if ((s = slk_label(c - '0')) != 0) { + if ((s = slk_label(c - '0')) != NULL) { _nc_STRNCPY(buf, s, (size_t) 8); } wGetstring(stdscr, buf, 8); @@ -3508,7 +3506,7 @@ x_slk_test(bool recur GCC_UNUSED) case '8': MvAddStr(SLK_WORK, 0, "Please enter the label value: "); *buf = 0; - if ((s = slk_label(c - '0')) != 0) { + if ((s = slk_label(c - '0')) != NULL) { char *temp = strdup(s); size_t used = strlen(temp); size_t want = SLKLEN; @@ -3821,7 +3819,7 @@ acs_test(bool recur GCC_UNUSED) int c = 'a'; int pagesize = 32; char *term = getenv("TERM"); - const char *pch_kludge = ((term != 0 && strstr(term, "linux")) + const char *pch_kludge = ((term != NULL && strstr(term, "linux")) ? "p=PC, " : ""); attr_t attr = A_NORMAL; @@ -3831,7 +3829,7 @@ acs_test(bool recur GCC_UNUSED) int bg = COLOR_BLACK; unsigned at_code = 0; NCURSES_PAIRS_T pair = 0; - void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = 0; + void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = NULL; ATTR_TBL my_list[SIZEOF(attrs_to_test)]; unsigned my_size = init_attr_list(my_list, termattrs()); @@ -3864,12 +3862,12 @@ acs_test(bool recur GCC_UNUSED) case '2': case '3': digit = (c - '0'); - last_show_acs = 0; + last_show_acs = NULL; break; case '-': if (digit > 0) { --digit; - last_show_acs = 0; + last_show_acs = NULL; } else { beep(); } @@ -3877,7 +3875,7 @@ acs_test(bool recur GCC_UNUSED) case '+': if (digit < 3) { ++digit; - last_show_acs = 0; + last_show_acs = NULL; } else { beep(); } @@ -3901,7 +3899,7 @@ acs_test(bool recur GCC_UNUSED) } if (pagesize != 32) { show_256_chars(repeat, attr, pair); - } else if (last_show_acs != 0) { + } else if (last_show_acs != NULL) { last_show_acs(repeat, attr, pair); } else { show_upper_chars(digit * pagesize + 128, pagesize, repeat, attr, pair); @@ -3938,12 +3936,11 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p *dst = *src; do { - int count; - TEST_CCHAR(src, count, { + TEST_CCHAR(src, { attr |= (test_attrs & A_ALTCHARSET); setcchar(dst, test_wch, attr, pair, NULL); - }, { - ; + } + , {; }); } while (0); return dst; @@ -3982,7 +3979,7 @@ show_paged_widechars(unsigned base, memset(&codes, 0, sizeof(codes)); codes[0] = code; - setcchar(&temp, codes, attr, pair, 0); + setcchar(&temp, codes, attr, pair, NULL); move(row, col); if (wcwidth(code) == 0 && code != 0) { AddCh((chtype) space | @@ -4021,7 +4018,7 @@ show_upper_widechars(unsigned first, int repeat, int space, attr_t attr, NCURSES memset(&codes, 0, sizeof(codes)); codes[0] = code; - setcchar(&temp, codes, attr, pair, 0); + setcchar(&temp, codes, attr, pair, NULL); do { int y, x; @@ -4299,10 +4296,10 @@ show_2_wacs(int n, const char *name, const char *code, attr_t attr, NCURSES_PAIR char temp[80]; MvPrintw(row, col, "%*s : ", COLS / 4, name); - (void) attr_set(attr, pair, 0); + (void) attr_set(attr, pair, NULL); _nc_STRNCPY(temp, code, 20); addstr(temp); - (void) attr_set(A_NORMAL, 0, 0); + (void) attr_set(A_NORMAL, 0, NULL); return n + 1; } @@ -4374,7 +4371,7 @@ x_acs_test(bool recur GCC_UNUSED) int bg = COLOR_BLACK; unsigned at_code = 0; NCURSES_PAIRS_T pair = 0; - void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0; + void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = NULL; W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; unsigned my_size = init_w_attr_list(my_list, term_attrs()); char at_page[20]; @@ -4437,26 +4434,26 @@ x_acs_test(bool recur GCC_UNUSED) at_page[--len] = '\0'; } else if (c < 256 && isdigit(c)) { digit = (unsigned) (c - '0'); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '+') { ++digit; _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '-' && digit > 0) { --digit; _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", UChar(digit)); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '>' && repeat < (COLS / 4)) { ++repeat; } else if (c == '<' && repeat > 1) { --repeat; } else if (c == '_') { space = (space == ' ') ? '_' : ' '; - last_show_wacs = 0; + last_show_wacs = NULL; } else if (cycle_w_attr(c, &at_code, &attr, my_list, my_size) || cycle_colors(c, &fg, &bg, &pair)) { - if (last_show_wacs != 0) + if (last_show_wacs != NULL) break; } else { beep(); @@ -4466,7 +4463,7 @@ x_acs_test(bool recur GCC_UNUSED) } if (pagesize != 32) { show_paged_widechars(digit, pagesize, repeat, space, attr, pair); - } else if (last_show_wacs != 0) { + } else if (last_show_wacs != NULL) { last_show_wacs(repeat, attr, pair); } else { show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); @@ -4616,7 +4613,7 @@ FRAME static WINDOW * frame_win(FRAME * curp) { - return (curp != 0) ? curp->wind : stdscr; + return (curp != NULL) ? curp->wind : stdscr; } /* We need to know if these flags are actually set, so don't look in FRAME. @@ -4810,7 +4807,8 @@ getwindow(void) /* Ask user for a window definition */ { WINDOW *rwindow; - pair ul, lr, *tmp; + pair ul, lr; + NCURSES_CONST pair *tmp; move(0, 0); clrtoeol(); @@ -4834,7 +4832,7 @@ getwindow(void) outerbox(ul, lr, TRUE); refresh(); - if (rwindow != 0) + if (rwindow != NULL) wrefresh(rwindow); move(0, 0); @@ -4865,9 +4863,9 @@ newwin_move(FRAME * curp, int dy, int dx) static FRAME * delete_framed(FRAME * fp, bool showit) { - FRAME *np = 0; + FRAME *np = NULL; - if (fp != 0) { + if (fp != NULL) { fp->last->next = fp->next; fp->next->last = fp->last; @@ -4905,7 +4903,7 @@ scroll_test(bool recur GCC_UNUSED) transient((FRAME *) 0, (char *) 0); switch (c) { case CTRL('C'): - if ((neww = typeCalloc(FRAME, (size_t) 1)) == 0) { + if ((neww = typeCalloc(FRAME, (size_t) 1)) == NULL) { failed("scroll_test"); goto breakout; } @@ -4915,7 +4913,7 @@ scroll_test(bool recur GCC_UNUSED) goto breakout; } - if (current == 0) { /* First element, */ + if (current == NULL) { /* First element, */ neww->next = neww; /* so point it at itself */ neww->last = neww; } else { @@ -4970,7 +4968,7 @@ scroll_test(bool recur GCC_UNUSED) #if HAVE_PUTWIN && HAVE_GETWIN case CTRL('W'): /* save and delete window */ - if ((current != 0) && (current == current->next)) { + if ((current != NULL) && (current == current->next)) { transient(current, "Will not save/delete ONLY window"); break; } else if ((fp = fopen(DUMPFILE, "w")) == (FILE *) 0) { @@ -4991,13 +4989,13 @@ scroll_test(bool recur GCC_UNUSED) if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) { transient(current, "Can't open screen dump file"); } else { - if ((neww = typeCalloc(FRAME, (size_t) 1)) != 0) { + if ((neww = typeCalloc(FRAME, (size_t) 1)) != NULL) { - neww->next = current ? current->next : 0; + neww->next = current ? current->next : NULL; neww->last = current; - if (neww->last != 0) + if (neww->last != NULL) neww->last->next = neww; - if (neww->next != 0) + if (neww->next != NULL) neww->next->last = neww; neww->wind = getwin(fp); @@ -5014,7 +5012,8 @@ scroll_test(bool recur GCC_UNUSED) #if HAVE_WRESIZE case CTRL('X'): /* resize window */ if (current) { - pair *tmp, ul, lr; + NCURSES_CONST pair *tmp; + pair ul, lr; int mx, my; move(0, 0); @@ -5118,7 +5117,7 @@ scroll_test(bool recur GCC_UNUSED) && (c != ERR)); breakout: - while (current != 0) + while (current != NULL) current = delete_framed(current, FALSE); scrollok(stdscr, TRUE); /* reset to driver's default */ @@ -5179,7 +5178,7 @@ saywhat(NCURSES_CONST char *text) { wmove(stdscr, LINES - 1, 0); wclrtoeol(stdscr); - if (text != 0 && *text != '\0') { + if (text != NULL && *text != '\0') { waddstr(stdscr, text); waddstr(stdscr, "; "); } @@ -5193,10 +5192,10 @@ static PANEL * mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx) { WINDOW *win; - PANEL *pan = 0; + PANEL *pan = NULL; - if ((win = newwin(rows, cols, tly, tlx)) != 0) { - if ((pan = new_panel(win)) == 0) { + if ((win = newwin(rows, cols, tly, tlx)) != NULL) { + if ((pan = new_panel(win)) == NULL) { delwin(win); } else if (UseColors) { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) ((color == COLOR_BLUE) @@ -5249,7 +5248,7 @@ init_panel(WINDOW *win) } static void -fill_panel(PANEL *pan) +fill_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5286,7 +5285,7 @@ init_wide_panel(WINDOW *win) } static void -fill_wide_panel(PANEL *pan) +fill_wide_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5336,7 +5335,8 @@ canned_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST char *cmd) } static int -demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) +demo_panels(void (*InitPanel) (WINDOW *), + void (*FillPanel) (NCURSES_CONST PANEL *)) { int count; int itmp; @@ -5926,7 +5926,7 @@ pad_test(bool recur GCC_UNUSED) { WINDOW *panpad = newpad(PAD_HIGH, PAD_WIDE); - if (panpad == 0) { + if (panpad == NULL) { Cannot("cannot create requested pad"); return ERR; } @@ -5989,7 +5989,7 @@ flushinp_test(bool recur GCC_UNUSED) getbegyx(win, by, bx); sw = w / 3; sh = h / 3; - if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == 0) + if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == NULL) return ERR; #ifdef A_COLOR @@ -6137,7 +6137,7 @@ menu_test(bool recur GCC_UNUSED) refresh(); for (ap = animals; *ap; ap++) { - if ((*ip = new_item(*ap, "")) != 0) + if ((*ip = new_item(*ap, "")) != NULL) ++ip; } *ip = (ITEM *) 0; @@ -6215,8 +6215,8 @@ tracetrace(unsigned tlevel) static size_t need = 12; int n; - if (buf == 0) { - for (n = 0; t_tbl[n].name != 0; n++) + if (buf == NULL) { + for (n = 0; t_tbl[n].name != NULL; n++) need += strlen(t_tbl[n].name) + 2; buf = typeMalloc(char, need); if (!buf) @@ -6227,7 +6227,7 @@ tracetrace(unsigned tlevel) _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { - for (n = 1; t_tbl[n].name != 0; n++) + for (n = 1; t_tbl[n].name != NULL; n++) if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) { _nc_STRCAT(buf, t_tbl[n].name, need); _nc_STRCAT(buf, ", ", need); @@ -6246,7 +6246,8 @@ static int run_trace_menu(MENU * m) { ITEM **items; - ITEM *i, **p; + NCURSES_CONST ITEM *i; + ITEM **p; for (;;) { bool changed = FALSE; @@ -6258,14 +6259,14 @@ run_trace_menu(MENU * m) i = current_item(m); if (i == items[0]) { if (item_value(i)) { - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(*p, FALSE); changed = TRUE; } } } else { - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(items[0], FALSE); changed = TRUE; @@ -6298,8 +6299,8 @@ trace_set(bool recur GCC_UNUSED) refresh(); - for (n = 0; t_tbl[n].name != 0; n++) { - if ((*ip = new_item(t_tbl[n].name, "")) != 0) { + for (n = 0; t_tbl[n].name != NULL; n++) { + if ((*ip = new_item(t_tbl[n].name, "")) != NULL) { ++ip; } } @@ -6424,17 +6425,17 @@ edit_secure(FIELD *me, int c) if (field_info(me, &rows, &cols, &frow, &fcol, &nrow, &nbuf) == E_OK && nbuf > 0) { - char *source = field_buffer(me, 1); + NCURSES_CONST char *source = field_buffer(me, 1); size_t have = (source ? strlen(source) : 0) + 1; size_t need = 80 + have; char *temp = malloc(need); - if (temp != 0) { + if (temp != NULL) { size_t len; _nc_STRNCPY(temp, source ? source : "", have + 1); len = (size_t) (char *) field_userptr(me); if (c <= KEY_MAX) { - if (isgraph(c) && (len + 1) < sizeof(temp)) { + if (isgraph(UChar(c)) && (len + 1) < sizeof(temp)) { temp[len++] = (char) c; temp[len] = 0; set_field_buffer(me, 1, temp); @@ -6484,7 +6485,7 @@ edit_secure(FIELD *me, int c) } static int -form_virtualize(FORM *f, WINDOW *w) +form_virtualize(NCURSES_CONST FORM *f, WINDOW *w) { /* *INDENT-OFF* */ static const struct { @@ -6658,7 +6659,7 @@ CHAR_CHECK_CB(mi_char_check) static FIELDCHECK_CB(pw_field_check) { - char *s = field_buffer(fld, 0); + NCURSES_CONST char *s = field_buffer(fld, 0); int n; for (n = 0; s[n] != '\0'; ++n) { @@ -6680,7 +6681,8 @@ static int form_test(bool recur GCC_UNUSED) { FORM *form; - FIELD *f[12], *secure; + FIELD *f[12]; + NCURSES_CONST FIELD *secure; FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check); FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check); int c; @@ -6732,7 +6734,7 @@ form_test(bool recur GCC_UNUSED) set_field_type(f[n - 1], fty_passwd); f[n] = (FIELD *) 0; - if ((form = new_form(f)) != 0) { + if ((form = new_form(f)) != NULL) { WINDOW *w; int finished = 0; @@ -6761,7 +6763,7 @@ form_test(bool recur GCC_UNUSED) free_form(form); } - for (c = 0; f[c] != 0; c++) + for (c = 0; f[c] != NULL; c++) free_field(f[c]); free_fieldtype(fty_middle); free_fieldtype(fty_passwd); @@ -6795,7 +6797,7 @@ make_overlap(int n) getmaxyx(stdscr, y, x); if (y < 23 || x < 80) { Cannot("The screen is too small for this test"); - result = 0; + result = NULL; } else { int ymax = y - (overlap_HEAD + overlap_FOOT); int high = ymax / 5; /* equal-sized parts for cross */ @@ -7176,7 +7178,7 @@ overlap_test_3(WINDOW *a) } static void -overlap_test_4(int flavor, WINDOW *a, WINDOW *b) +overlap_test_4(int flavor, NCURSES_CONST WINDOW *a, WINDOW *b) { switch ((otCOPY) flavor) { case otCOPY_overwrite: @@ -7203,9 +7205,9 @@ overlap_test(bool recur GCC_UNUSED) int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0) { + if ((win1 = make_overlap(0)) == NULL) { return ERR; - } else if ((win2 = make_overlap(1)) == 0) { + } else if ((win2 = make_overlap(1)) == NULL) { delwin(win1); return ERR; } @@ -7403,9 +7405,9 @@ x_overlap_test(bool recur GCC_UNUSED) int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0) { + if ((win1 = make_overlap(0)) == NULL) { return ERR; - } else if ((win2 = make_overlap(1)) == 0) { + } else if ((win2 = make_overlap(1)) == NULL) { delwin(win1); return ERR; } @@ -7644,7 +7646,7 @@ usage(int ok) ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" #endif #if USE_SOFTKEYS - ," -e fmt specify format for soft-keys test (e)" + ," -e FMT specify format for soft-keys test (e)" #endif #if HAVE_RIPOFFLINE ," -F rip-off footer line (can repeat)" @@ -7655,13 +7657,13 @@ usage(int ok) ," -p file rgb values to use in 'd' rather than ncurses's builtin" #endif #if USE_LIBPANEL - ," -s msec specify nominal time for panel-demo (default: 1, to hold)" + ," -s MSECS specify nominal time for panel-demo (default: 1, to hold)" #endif #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -D mask specify trace mask (may toggle with ^T)" #endif #if HAVE_COLOR_CONTENT ," -x use xterm-compatible control for reading color palette" @@ -7899,12 +7901,12 @@ main(int argc, char *argv[]) bool monochrome = FALSE; #if HAVE_COLOR_CONTENT bool xterm_colors = FALSE; - char *palette_file = 0; + NCURSES_CONST char *palette_file = NULL; #endif setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "D:EFHTa:de:mp:s:x")) != -1) { switch (ch) { #ifdef NCURSES_VERSION_PATCH #if HAVE_USE_DEFAULT_COLORS @@ -7968,8 +7970,8 @@ main(int argc, char *argv[]) break; #endif #ifdef TRACE - case 't': - save_trace = (unsigned) strtol(optarg, 0, 0); + case 'D': + save_trace = (unsigned) strtol(optarg, NULL, 0); break; #endif #if HAVE_COLOR_CONTENT @@ -7977,11 +7979,8 @@ main(int argc, char *argv[]) xterm_colors = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/newdemo.c b/test/newdemo.c index 78761534d7c5..bbcb2bfe96c6 100644 --- a/test/newdemo.c +++ b/test/newdemo.c @@ -2,7 +2,7 @@ * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. * - * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $ + * $Id: newdemo.c,v 1.50 2025/07/05 15:11:35 tom Exp $ */ #include <test.priv.h> @@ -250,11 +250,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -288,7 +285,7 @@ main(int argc, char *argv[]) set_colors(win, 2, COLOR_RED, COLOR_RED); box(win, ACS_VLINE, ACS_HLINE); wrefresh(win); - /* Do ramdom output of a character */ + /* Do random output of a character */ use_colors(win, 1, A_NORMAL); c = 'a'; for (i = 0; i < 5000; ++i) { diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright index 7546e1cc1f71..2249ad5e1130 100644 --- a/test/package/debian-mingw/copyright +++ b/test/package/debian-mingw/copyright @@ -1,79 +1,68 @@ -Upstream source https://invisible-island.net/ncurses/ncurses-examples.html +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ncurses-examples +Upstream-Contact: Thomas E. Dickey <dickey@invisible-island.net> +Source: https://invisible-island.net/ncurses/ncurses-examples.html -Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> - -------------------------------------------------------------------------------- Files: * -Copyright: 2017-2023,2024 Thomas E. Dickey -Copyright: 1998-2016,2017 Free Software Foundation, Inc. -License: X11 - -Files: aclocal.m4 package -Copyright: 2003-2023,2024 by Thomas E. Dickey -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, distribute with modifications, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name(s) of the above copyright - holders shall not be used in advertising or otherwise to promote the - sale, use or other dealings in this Software without prior written - authorization. - -------------------------------------------------------------------------------- -Files: install-sh -Copyright: 1994 X Consortium -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - - FSF changes to this file are in the public domain. - - Calling this script install-sh is preferred over install.sh, to prevent - `make' implicit rules from creating a file called install from it - when there is no Makefile. - - This script is compatible with the BSD install script, but was written - from scratch. It can only install one file at a time, a restriction - shared with many OS's install programs. - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2' - --- vile: txtmode file-encoding=utf-8 +Copyright: 2017-2024,2025 by Thomas E. Dickey + 1998-2016,2017 Free Software Foundation, Inc. +License: X11 License Distribution Modification Variant + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, distribute with modifications, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization. +Comment: + https://invisible-island.net/ncurses/ncurses-license.html + +Files: aclocal.m4 package +Copyright: 2003-2024,2025 by Thomas E. Dickey +License: X11 License Distribution Modification Variant + +Files: install-sh +Copyright: 1994 X Consortium +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the sale, + use or other dealings in this Software without prior written authorization. + +Files: terminal.xbm +Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah +License: StandardML-NJ +Comment: vile: txtmode file-encoding=utf-8 diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules index 152cd3c77f95..3a791507d1d1 100755 --- a/test/package/debian-mingw/rules +++ b/test/package/debian-mingw/rules @@ -43,7 +43,7 @@ configure-stamp: --prefix=$(MINGW_TOP) \ --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ --datadir=\$${prefix}/share/$(NCURSES_PKG) \ - --with-screen=ncursesw6 \ + --with-screen=ncursesw6td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig touch configure-stamp diff --git a/test/package/debian-mingw/watch b/test/package/debian-mingw/watch index ec075b189b01..c35c8e38ee9f 100644 --- a/test/package/debian-mingw/watch +++ b/test/package/debian-mingw/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright index 7546e1cc1f71..2249ad5e1130 100644 --- a/test/package/debian-mingw64/copyright +++ b/test/package/debian-mingw64/copyright @@ -1,79 +1,68 @@ -Upstream source https://invisible-island.net/ncurses/ncurses-examples.html +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ncurses-examples +Upstream-Contact: Thomas E. Dickey <dickey@invisible-island.net> +Source: https://invisible-island.net/ncurses/ncurses-examples.html -Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> - -------------------------------------------------------------------------------- Files: * -Copyright: 2017-2023,2024 Thomas E. Dickey -Copyright: 1998-2016,2017 Free Software Foundation, Inc. -License: X11 - -Files: aclocal.m4 package -Copyright: 2003-2023,2024 by Thomas E. Dickey -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, distribute with modifications, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name(s) of the above copyright - holders shall not be used in advertising or otherwise to promote the - sale, use or other dealings in this Software without prior written - authorization. - -------------------------------------------------------------------------------- -Files: install-sh -Copyright: 1994 X Consortium -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - - FSF changes to this file are in the public domain. - - Calling this script install-sh is preferred over install.sh, to prevent - `make' implicit rules from creating a file called install from it - when there is no Makefile. - - This script is compatible with the BSD install script, but was written - from scratch. It can only install one file at a time, a restriction - shared with many OS's install programs. - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2' - --- vile: txtmode file-encoding=utf-8 +Copyright: 2017-2024,2025 by Thomas E. Dickey + 1998-2016,2017 Free Software Foundation, Inc. +License: X11 License Distribution Modification Variant + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, distribute with modifications, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization. +Comment: + https://invisible-island.net/ncurses/ncurses-license.html + +Files: aclocal.m4 package +Copyright: 2003-2024,2025 by Thomas E. Dickey +License: X11 License Distribution Modification Variant + +Files: install-sh +Copyright: 1994 X Consortium +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the sale, + use or other dealings in this Software without prior written authorization. + +Files: terminal.xbm +Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah +License: StandardML-NJ +Comment: vile: txtmode file-encoding=utf-8 diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules index 02175a66ee5b..571b9a7edf08 100755 --- a/test/package/debian-mingw64/rules +++ b/test/package/debian-mingw64/rules @@ -43,7 +43,7 @@ configure-stamp: --prefix=$(MINGW_TOP) \ --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ --datadir=\$${prefix}/share/$(NCURSES_PKG) \ - --with-screen=ncursesw6 \ + --with-screen=ncursesw6td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig touch configure-stamp diff --git a/test/package/debian-mingw64/watch b/test/package/debian-mingw64/watch index ec075b189b01..c35c8e38ee9f 100644 --- a/test/package/debian-mingw64/watch +++ b/test/package/debian-mingw64/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/package/debian/copyright b/test/package/debian/copyright index 7546e1cc1f71..2249ad5e1130 100644 --- a/test/package/debian/copyright +++ b/test/package/debian/copyright @@ -1,79 +1,68 @@ -Upstream source https://invisible-island.net/ncurses/ncurses-examples.html +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ncurses-examples +Upstream-Contact: Thomas E. Dickey <dickey@invisible-island.net> +Source: https://invisible-island.net/ncurses/ncurses-examples.html -Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> - -------------------------------------------------------------------------------- Files: * -Copyright: 2017-2023,2024 Thomas E. Dickey -Copyright: 1998-2016,2017 Free Software Foundation, Inc. -License: X11 - -Files: aclocal.m4 package -Copyright: 2003-2023,2024 by Thomas E. Dickey -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, distribute with modifications, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name(s) of the above copyright - holders shall not be used in advertising or otherwise to promote the - sale, use or other dealings in this Software without prior written - authorization. - -------------------------------------------------------------------------------- -Files: install-sh -Copyright: 1994 X Consortium -License: X11 - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - - FSF changes to this file are in the public domain. - - Calling this script install-sh is preferred over install.sh, to prevent - `make' implicit rules from creating a file called install from it - when there is no Makefile. - - This script is compatible with the BSD install script, but was written - from scratch. It can only install one file at a time, a restriction - shared with many OS's install programs. - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2' - --- vile: txtmode file-encoding=utf-8 +Copyright: 2017-2024,2025 by Thomas E. Dickey + 1998-2016,2017 Free Software Foundation, Inc. +License: X11 License Distribution Modification Variant + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, distribute with modifications, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization. +Comment: + https://invisible-island.net/ncurses/ncurses-license.html + +Files: aclocal.m4 package +Copyright: 2003-2024,2025 by Thomas E. Dickey +License: X11 License Distribution Modification Variant + +Files: install-sh +Copyright: 1994 X Consortium +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the sale, + use or other dealings in this Software without prior written authorization. + +Files: terminal.xbm +Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah +License: StandardML-NJ +Comment: vile: txtmode file-encoding=utf-8 diff --git a/test/package/debian/ncurses-examples.lintian-overrides b/test/package/debian/ncurses-examples.lintian-overrides new file mode 100644 index 000000000000..2b063e9d23b1 --- /dev/null +++ b/test/package/debian/ncurses-examples.lintian-overrides @@ -0,0 +1,7 @@ +# $Id: ncurses-examples.lintian-overrides,v 1.1 2025/06/14 21:12:31 tom Exp $ + +# "function" is used in an awk script +bash-term-in-posix-shell 'function scaled(' [usr/libexec/ncurses-examples/tput-initc:*] + +# workaround for lintian bug +incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/libexec/ncurses-examples/tracemunch] diff --git a/test/package/debian/ncursest-examples.lintian-overrides b/test/package/debian/ncursest-examples.lintian-overrides new file mode 100644 index 000000000000..7be45eb0e268 --- /dev/null +++ b/test/package/debian/ncursest-examples.lintian-overrides @@ -0,0 +1,7 @@ +# $Id: ncursest-examples.lintian-overrides,v 1.1 2025/06/14 21:12:31 tom Exp $ + +# "function" is used in an awk script +bash-term-in-posix-shell 'function scaled(' [usr/libexec/ncursest-examples/tput-initc:*] + +# workaround for lintian bug +incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/libexec/ncursest-examples/tracemunch] diff --git a/test/package/debian/rules b/test/package/debian/rules index 2cc34f7305ef..02cd1840b26e 100755 --- a/test/package/debian/rules +++ b/test/package/debian/rules @@ -1,11 +1,15 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Cristoph Lameter. +# $Id: rules,v 1.15 2025/06/14 21:15:59 tom Exp $ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +SHELL = /bin/bash +DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all + +include /usr/share/dpkg/buildflags.mk + # packages NCURSES_PKG = ncurses-examples NCURSEST_PKG = ncursest-examples @@ -18,10 +22,6 @@ PACKAGES.arch = $(NCURSES_PKG) $(NCURSEST_PKG) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -34,9 +34,7 @@ endif verbose = # -v configure = \ - CFLAGS="$(CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" ../../configure \ + ../../configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -75,7 +73,7 @@ config-$(NCURSES_PKG)-stamp: cd t/ncurses6; $(configure) \ --datadir=\$${datarootdir}/$(NCURSES_PKG) \ - --with-screen=ncursesw6 + --with-screen=ncursesw6td touch $@ @@ -87,7 +85,7 @@ config-$(NCURSEST_PKG)-stamp: cd t/ncursest6; $(configure) \ --datadir=\$${datarootdir}/$(NCURSEST_PKG) \ - --with-screen=ncursestw6 + --with-screen=ncursestw6td touch $@ @@ -153,6 +151,7 @@ ifneq ($(PACKAGES.arch),) rm -f $(PACKAGES.arch:%=install-%-stamp) dh_testdir dh_testroot + dh_lintian $(verbose) $(PACKAGES.arch:%=-p%) dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%) dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) NEWS dh_strip $(verbose) $(PACKAGES.arch:%=-p%) diff --git a/test/package/debian/watch b/test/package/debian/watch index ec075b189b01..c35c8e38ee9f 100644 --- a/test/package/debian/watch +++ b/test/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec index bfadd10e850b..f597c008451c 100644 --- a/test/package/mingw-ncurses-examples.spec +++ b/test/package/mingw-ncurses-examples.spec @@ -4,11 +4,11 @@ Summary: ncurses-examples - example/test programs from ncurses %global AppProgram ncurses-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: mingw-ncurses-examples.spec,v 1.11 2023/02/25 23:10:34 tom Exp $ +# $Id: mingw-ncurses-examples.spec,v 1.13 2025/06/21 18:35:49 tom Exp $ Name: mingw32-ncurses6-examples Version: %{AppVersion} Release: %{AppRelease} -License: X11 +License: X11 License Distribution Modification Variant Group: Development/Libraries URL: https://invisible-island.net/ncurses/%{AppProgram}.html Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz @@ -113,6 +113,9 @@ popd %changelog +* RPM_DATE Thomas Dickey +- testing ncurses MAJOR.MINOR.YYYYMMDD + * Sat Feb 25 2023 Thomas Dickey - use libexecdir for programs rather than subdir of bindir - amend URLs per rpmlint diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec index 8f1a3cbe52d1..905c719166e6 100644 --- a/test/package/ncurses-examples.spec +++ b/test/package/ncurses-examples.spec @@ -3,11 +3,11 @@ Summary: example/test programs from ncurses %global AltProgram ncursest-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: ncurses-examples.spec,v 1.22 2023/02/25 23:10:49 tom Exp $ +# $Id: ncurses-examples.spec,v 1.24 2025/06/21 18:35:49 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} -License: MIT +License: X11 License Distribution Modification Variant Group: Applications/Development URL: https://invisible-island.net/ncurses/%{AppProgram}.html Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz @@ -97,6 +97,9 @@ popd %changelog # each patch should add its ChangeLog entries here +* RPM_DATE Thomas Dickey +- testing ncurses MAJOR.MINOR.YYYYMMDD + * Sat Feb 25 2023 Thomas Dickey - amend URLs per rpmlint diff --git a/test/padview.c b/test/padview.c index 0defee3430e0..b56047169157 100644 --- a/test/padview.c +++ b/test/padview.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ /* * clone of view.c, using pads * - * $Id: padview.c,v 1.22 2022/12/04 00:40:11 tom Exp $ + * $Id: padview.c,v 1.29 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -88,8 +88,9 @@ show_all(const char *tag, WINDOW *my_pad, int my_row) wattrset(stdscr, COLOR_PAIR(my_pair)); clear(); + i = (int) (sizeof(temp) - strlen(tag) - 8); _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) - "view %.*s", (int) strlen(tag), tag); + "view %.*s", i, tag); i = (int) strlen(temp); _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i) " %.*s", (int) sizeof(temp) - i - 2, fname); @@ -124,7 +125,7 @@ read_file(const char *filename) size_t len; struct stat sb; char *my_blob; - char **my_vec = 0; + char **my_vec = NULL; WINDOW *my_pad; if (stat(filename, &sb) != 0 @@ -136,11 +137,11 @@ read_file(const char *filename) failed("input is empty"); } - if ((fp = fopen(filename, "r")) == 0) { + if ((fp = fopen(filename, "r")) == NULL) { failed("cannot open input-file"); } - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) { failed("cannot allocate memory for input-file"); } @@ -171,7 +172,7 @@ read_file(const char *filename) } num_lines = k; if (pass == 0) { - if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) { failed("cannot allocate line-vector #1"); } } else { @@ -182,7 +183,7 @@ read_file(const char *filename) #if USE_WIDEC_SUPPORT if (!memcmp("\357\273\277", my_blob, 3)) { - char *s = my_blob + 3; + const char *s = my_blob + 3; char *d = my_blob; Trace(("trim BOM")); do { @@ -199,7 +200,7 @@ read_file(const char *filename) } width = (width + 1) * 5; my_pad = newpad(height, width); - if (my_pad == 0) + if (my_pad == NULL) failed("cannot allocate pad workspace"); if (try_color) { wattrset(my_pad, COLOR_PAIR(my_pair)); @@ -213,7 +214,7 @@ read_file(const char *filename) for (k = 0; my_vec[k]; ++k) { char *s; #if USE_WIDEC_SUPPORT - char *last = my_vec[k] + (int) strlen(my_vec[k]); + const char *last = my_vec[k] + (int) strlen(my_vec[k]); wchar_t wch[2]; size_t rc; #ifndef state_unused @@ -256,15 +257,15 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" #if USE_WIDEC_SUPPORT ," -n use waddch (bytes) rather then wadd_wch (wide-chars)" #endif - ," -s start in single-step mode, waiting for input" + ," -s start in single-step mode" #ifdef TRACE ," -t trace screen updates" - ," -T NUM specify trace mask" + ," -D NUM specify trace mask" #endif }; size_t n; @@ -279,7 +280,7 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -301,7 +302,7 @@ main(int argc, char *argv[]) " s - use entered count for halfdelay() parameter", " - if no entered count, stop nodelay()", " <space> - begin nodelay()", - 0 + NULL }; int ch; @@ -318,9 +319,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; case 'i': @@ -335,11 +336,11 @@ main(int argc, char *argv[]) single_step = TRUE; break; #ifdef TRACE - case 'T': + case 'D': { - char *next = 0; + char *next = NULL; int tvalue = (int) strtol(optarg, &next, 0); - if (tvalue < 0 || (next != 0 && *next != 0)) + if (tvalue < 0 || (next != NULL && *next != 0)) usage(FALSE); curses_trace((unsigned) tvalue); } @@ -348,11 +349,8 @@ main(int argc, char *argv[]) curses_trace(TRACE_CALLS); break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -532,7 +530,7 @@ main(int argc, char *argv[]) beep(); break; } - if (c >= KEY_MIN || (c > 0 && !isdigit(c))) { + if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) { got_number = FALSE; value = 0; } diff --git a/test/pair_content.c b/test/pair_content.c index 2b759a82466d..de1ccbd6e441 100644 --- a/test/pair_content.c +++ b/test/pair_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $ + * $Id: pair_content.c,v 1.26 2025/07/05 15:21:56 tom Exp $ */ #define NEED_TIME_H @@ -181,7 +181,7 @@ run_test(void) my_color_t fg; my_color_t bg; if (PairContent(pair, &fg, &bg) == OK) { - if (expected != 0) { + if (expected != NULL) { if (fg != expected[pair].fg) success = FALSE; if (bg != expected[pair].bg) @@ -213,10 +213,10 @@ usage(int ok) ,"Options:" ," -f PAIR first color pair to test (default: 1)" ," -i interactive, showing test-progress" - ," -l PAIR last color pair to test (default: max_pairs-1)" + ," -F PAIR last color pair to test (default: max_pairs-1)" ," -n do not initialize color pairs" ," -p print data for color pairs instead of testing" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s initialize pairs sequentially rather than random" #if USE_EXTENDED_COLOR ," -x use extended color pairs/values" @@ -236,7 +236,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) { switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) @@ -245,7 +245,7 @@ main(int argc, char *argv[]) case 'i': i_opt = 1; break; - case 'l': + case 'F': if ((l_opt = atoi(optarg)) <= 0) usage(FALSE); break; @@ -267,11 +267,8 @@ main(int argc, char *argv[]) x_opt = 1; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/parse_rgb.h b/test/parse_rgb.h index df315b58be68..1efd972e4181 100644 --- a/test/parse_rgb.h +++ b/test/parse_rgb.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: parse_rgb.h,v 1.5 2020/02/02 23:34:34 tom Exp $ + * $Id: parse_rgb.h,v 1.7 2025/01/18 15:03:33 tom Exp $ * * Sample implementation of ncurses RGB extension from user_caps(5). */ @@ -49,7 +49,7 @@ parse_rgb(int *r_max, int *g_max, int *b_max) int bits; int pwr2; int r = 0, g = 0, b = 0; - char *data; + const char *data; char ch; for (max_bits = 0, pwr2 = 1; @@ -58,13 +58,13 @@ parse_rgb(int *r_max, int *g_max, int *b_max) ; } - if (tigetflag("RGB") > 0) { + if (tigetflag(UserCap(RGB)) > 0) { result = OK; r = g = b = (max_bits + 2) / 3; - } else if ((bits = tigetnum("RGB")) > 0) { + } else if ((bits = tigetnum(UserCap(RGB))) > 0) { result = OK; r = g = b = bits; - } else if ((data = tigetstr("RGB")) != ABSENT_STRING + } else if ((data = tigetstr(UserCap(RGB))) != ABSENT_STRING && data != CANCELLED_STRING && sscanf(data, "%d/%d/%d%c", &r, &g, &b, &ch) == 3) { result = OK; diff --git a/test/picsmap.c b/test/picsmap.c index b582f3aada5d..1347cd242e4c 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.149 2023/04/23 23:20:37 tom Exp $ + * $Id: picsmap.c,v 1.155 2025/07/05 15:11:35 tom Exp $ * * Author: Thomas E. Dickey * @@ -109,7 +109,7 @@ static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static int gather_c_values(int); -static FILE *logfp = 0; +static FILE *logfp = NULL; static double aspect_ratio = 0.6; static bool in_curses = FALSE; static bool debugging = FALSE; @@ -138,7 +138,7 @@ static bool use_extended_colors = FALSE; static void logmsg(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -151,7 +151,7 @@ logmsg(const char *fmt, ...) static void logmsg2(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -163,7 +163,7 @@ logmsg2(const char *fmt, ...) static void close_log(void) { - if (logfp != 0) { + if (logfp != NULL) { logmsg("Allocations:"); logmsg("%8ld file", (long) how_much.file); logmsg("%8ld name", (long) how_much.name); @@ -174,7 +174,7 @@ close_log(void) logmsg("%8ld cell", (long) how_much.cell); logmsg("%8ld window", LINES * COLS * (long) sizeof(NCURSES_CH_T)); fclose(logfp); - logfp = 0; + logfp = NULL; } } @@ -199,7 +199,7 @@ failed(const char *msg) static void warning(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -219,7 +219,7 @@ warning(const char *fmt, ...) static void free_data(char **data) { - if (data != 0) { + if (data != NULL) { free(data[0]); free(data); } @@ -228,12 +228,12 @@ free_data(char **data) static PICS_HEAD * free_pics_head(PICS_HEAD * pics) { - if (pics != 0) { + if (pics != NULL) { free(pics->fgcol); free(pics->cells); free(pics->name); free(pics); - pics = 0; + pics = NULL; } return pics; } @@ -305,14 +305,14 @@ gather_c_values(int fg) reading_ncols[next].count = 0; check_c_values(__LINE__); - if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != 0) { + if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != NULL) { found = P2I(*ft); } else { if (reading_last + 2 >= reading_size) { int more = ((MAX(reading_last, reading_size) + 2) * 3) / 2; int last = reading_last + 1; FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols); - if (p == 0) + if (p == NULL) goto done; reading_size = more; @@ -323,7 +323,7 @@ gather_c_values(int fg) } ++reading_last; how_much.pair += sizeof(FG_NODE); - if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != 0) { + if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != NULL) { found = P2I(*ft); if (found != next) logmsg("OOPS expected slot %d, got %d", next, found); @@ -370,24 +370,24 @@ finish_c_values(PICS_HEAD * head) reading_last = 0; reading_size = 0; - reading_ncols = 0; + reading_ncols = NULL; } static void dispose_c_values(void) { #if HAVE_TSEARCH - if (reading_ntree != 0) { + if (reading_ntree != NULL) { int n; for (n = 0; n < reading_last; ++n) { tdelete(I2P(n), &reading_ntree, compare_c_values); } - reading_ntree = 0; + reading_ntree = NULL; } #endif - if (reading_ncols != 0) { + if (reading_ncols != NULL) { free(reading_ncols); - reading_ncols = 0; + reading_ncols = NULL; } reading_last = 0; reading_size = 0; @@ -413,7 +413,7 @@ is_file(const char *filename, struct stat *sb) static char ** read_file(const char *filename) { - char **result = 0; + char **result = NULL; struct stat sb; if (!quiet) { @@ -430,9 +430,9 @@ read_file(const char *filename) result = typeCalloc(char *, size + 1); how_much.file += ((size + 1) * 2); - if (blob != 0 && result != 0) { + if (blob != NULL && result != NULL) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { logmsg("opened %s", filename); if (fread(blob, sizeof(char), size, fp) == size) { @@ -457,7 +457,7 @@ read_file(const char *filename) result[k++] = blob + j; } } - result[k] = 0; + result[k] = NULL; if (k && !binary) { debugmsg2("[%5d] %s\n", k, result[k - 1]); } @@ -471,7 +471,7 @@ read_file(const char *filename) debugmsg("...file is empty"); free(blob); free(result); - result = 0; + result = NULL; } else if (binary) { debugmsg("...file is non-text"); } @@ -494,7 +494,7 @@ usage(int ok) ," -d invoke use_default_colors" #endif ," -L add debugging information to logfile" - ," -l FILE write informational messages to FILE" + ," -F FILE write informational messages to FILE" ," -p FILE color-palette file (default \"$TERM.dat\")" ," -q less verbose" ," -r FILE xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")" @@ -548,20 +548,20 @@ static char ** read_palette(const char *filename) { static const char *data_dir = DATA_DIR; - char **result = 0; + char **result = NULL; size_t last = strlen(filename); size_t need = (strlen(data_dir) + 20 + last); char *full_name = malloc(need); char *s; struct stat sb; - if (full_name != 0) { + if (full_name != NULL) { int tries; for (tries = 0; tries < 8; ++tries) { *(s = full_name) = '\0'; if (tries & 1) { - if (strchr(filename, '/') == 0) { + if (strchr(filename, '/') == NULL) { _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir); } else { continue; @@ -574,7 +574,7 @@ read_palette(const char *filename) _nc_STRCAT(full_name, filename, need); if (tries & 4) { char *t = s; - char *tc; + const char *tc; int num; char chr; int found = 0; @@ -582,7 +582,7 @@ read_palette(const char *filename) if (*t == '-') { if (sscanf(t, "-%d%c", &num, &chr) == 2 && chr == 'c' && - (tc = strchr(t, chr)) != 0 && + (tc = strchr(t, chr)) != NULL && !(strncmp) (tc, "color", 5)) { found = 1; } @@ -622,7 +622,7 @@ read_palette(const char *filename) static void init_palette(const char *palette_file) { - if (palette_file != 0) { + if (palette_file != NULL) { char **data = read_palette(palette_file); all_colors = typeMalloc(RGB_DATA, (unsigned) COLORS); @@ -641,12 +641,12 @@ init_palette(const char *palette_file) #else memset(all_colors, 0, sizeof(RGB_DATA) * (size_t) COLORS); #endif - if (data != 0) { + if (data != NULL) { int n; int red, green, blue; int scale = MaxSCALE; int c; - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (sscanf(data[n], "scale:%d", &c) == 1) { scale = c; } else if (sscanf(data[n], "%d:%d %d %d", @@ -677,9 +677,9 @@ init_palette(const char *palette_file) } if ((power2 != COLORS) || ((shift % 3) != 0)) { - if (all_colors == 0) { + if (all_colors == NULL) { init_palette(getenv("TERM")); - if (all_colors == 0) { + if (all_colors == NULL) { giveup("With %d colors, you need a palette-file", COLORS); } } @@ -704,7 +704,7 @@ map_color(int value) int green = (value & 0x00ff00) >> 8; int blue = (value & 0x0000ff) >> 0; - if (all_colors != 0) { + if (all_colors != NULL) { #define Diff2(n,m) ((m) - all_colors[n].m) * ((m) - all_colors[n].m) #define Diff2S(n) Diff2(n,red) + Diff2(n,green) + Diff2(n,blue) int d2 = Diff2S(0); @@ -823,7 +823,7 @@ match_c(const char *source, const char *pattern, ...) limit = -1; ip = va_arg(ap, int *); lv = strtol(source, &cp, ch == 'd' ? 10 : 16); - if (cp != 0 && cp != source) { + if (cp != NULL && cp != source) { *ip = (int) lv; source = cp; } else { @@ -834,13 +834,13 @@ match_c(const char *source, const char *pattern, ...) /* floating point for pixels... */ fp = va_arg(ap, float *); lv = strtol(source, &cp, 10); - if (cp == 0 || cp == source) + if (cp == NULL || cp == source) goto finish; *fp = (float) lv; source = cp; if (*source == '.') { lv = strtol(++source, &cp, 10); - if (cp == 0 || cp == source) + if (cp == NULL || cp == source) goto finish; { float scale = 1.0f; @@ -907,7 +907,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3) s += cpp; while (*s++ == '\t') { char *t; - for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) { + for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == NULL;) { if (*s == ' ') { s = skip_cs(s); break; @@ -915,7 +915,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3) *t++ = *s++; *t = '\0'; } - for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == 0;) { + for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == NULL;) { *t++ = *s++; *t = '\0'; } @@ -938,16 +938,18 @@ parse_rgb(char **data) char *s, *t; size_t item = 0; size_t need; - RGB_NAME *result = 0; + RGB_NAME *result = NULL; - for (need = 0; data[need] != 0; ++need) ; + for (need = 0; data[need] != NULL; ++need) ; result = typeCalloc(RGB_NAME, need + 2); how_much.name += (sizeof(RGB_NAME) * (need + 2)); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(t = data[n]) >= sizeof(buf) - 1) continue; + _nc_STRCPY(buf, t, sizeof(buf)); + t = buf; if (*(s = skip_s(t)) == '!') continue; @@ -992,10 +994,10 @@ CaselessCmp(const char *a, const char *b) static RGB_NAME * lookup_rgb(const char *name) { - RGB_NAME *result = 0; - if (rgb_table != 0) { + RGB_NAME *result = NULL; + if (rgb_table != NULL) { int n; - for (n = 0; rgb_table[n].name != 0; ++n) { + for (n = 0; rgb_table[n].name != NULL; ++n) { if (!CaselessCmp(name, rgb_table[n].name)) { result = &rgb_table[n]; break; @@ -1028,7 +1030,7 @@ parse_xbm(char **data) gather_c_values(0); gather_c_values(0xffffff); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(s = data[n]) >= sizeof(buf) - 1) continue; switch (state) { @@ -1036,10 +1038,10 @@ parse_xbm(char **data) case 1: case 2: if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) { - if ((t = strstr(buf, "_width")) != 0) { + if ((t = strstr(buf, "_width")) != NULL) { state |= 1; result->wide = (short) bytes_of(num); - } else if ((t = strstr(buf, "_height")) != 0) { + } else if ((t = strstr(buf, "_height")) != NULL) { state |= 2; result->high = (short) num; } else { @@ -1066,7 +1068,7 @@ parse_xbm(char **data) result->cells = typeCalloc(PICS_CELL, cells); how_much.cell += (sizeof(PICS_CELL) * cells); - if ((s = strchr(s, L_CURLY)) == 0) + if ((s = strchr(s, L_CURLY)) == NULL) break; ++s; } else { @@ -1146,16 +1148,18 @@ parse_xpm(char **data) char arg1[BUFSIZ]; char arg2[BUFSIZ]; char arg3[BUFSIZ]; - char **list = 0; + char **list = NULL; debugmsg("called parse_xpm"); result = typeCalloc(PICS_HEAD, 1); how_much.head += sizeof(PICS_HEAD); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(s = data[n]) >= sizeof(buf) - 1) continue; + _nc_STRCPY(buf, s, sizeof(buf)); + s = buf; switch (state) { case 0: if (match_c(s, " /* XPM */ ")) { @@ -1199,7 +1203,7 @@ parse_xpm(char **data) num_colors++; free(list[reading_last]); list[reading_last] = strdup(arg1); - if ((by_name = lookup_rgb(arg3)) != 0) { + if ((by_name = lookup_rgb(arg3)) != NULL) { found = gather_c_values(by_name->value); } else if (*arg3 == '#') { char *rgb = arg3 + 1; @@ -1225,7 +1229,7 @@ parse_xpm(char **data) if (num_colors >= result->colors) { finish_c_values(result); state = 4; - if (list[0] == 0) + if (list[0] == NULL) list[0] = strdup("\033"); } break; @@ -1237,7 +1241,7 @@ parse_xpm(char **data) /* FIXME - factor out */ for (c = 0; c < result->colors; ++c) { - if (list[c] == 0) { + if (list[c] == NULL) { /* should not happen... */ continue; } @@ -1312,8 +1316,8 @@ parse_img(const char *filename) result = typeCalloc(PICS_HEAD, 1); how_much.head += sizeof(PICS_HEAD); - if ((pp = popen(cmd, "r")) != 0) { - if (fgets(buffer, sizeof(buffer), pp) != 0) { + if ((pp = popen(cmd, "r")) != NULL) { + if (fgets(buffer, sizeof(buffer), pp) != NULL) { size_t n = strlen(filename); debugmsg2("...read %s", buffer); if (strlen(buffer) > n && @@ -1339,12 +1343,12 @@ parse_img(const char *filename) _nc_STRCAT(cmd, " 2>/dev/null", need); logmsg("...opening pipe to %s", cmd); - if ((pp = popen(cmd, "r")) != 0) { + if ((pp = popen(cmd, "r")) != NULL) { int count = 0; int col = 0; int row = 0; int len = 0; - while (fgets(buffer, sizeof(buffer), pp) != 0) { + while (fgets(buffer, sizeof(buffer), pp) != NULL) { debugmsg2("[%5d] %s", count + 1, buffer); if (strlen(buffer) > 160) { /* 80 columns would be enough */ okay = FALSE; @@ -1374,11 +1378,11 @@ parse_img(const char *filename) int r, g, b, nocolor; float rf, gf, bf; unsigned check; - char *t; - char *s = t = strchr(buffer, '#'); + char *s = strchr(buffer, '#'); + const char *t = s; bool matched = FALSE; - if (s != 0) { + if (s != NULL) { /* after the "#RGB", there are differences - just ignore */ while (*s != '\0' && !isspace(UChar(*s))) ++s; @@ -1470,11 +1474,11 @@ static PICS_HEAD * read_picture(const char *filename, char **data) { PICS_HEAD *pics; - if ((pics = parse_xbm(data)) == 0) { + if ((pics = parse_xbm(data)) == NULL) { dispose_c_values(); - if ((pics = parse_xpm(data)) == 0) { + if ((pics = parse_xpm(data)) == NULL) { dispose_c_values(); - if ((pics = parse_img(filename)) == 0) { + if ((pics = parse_img(filename)) == NULL) { dispose_c_values(); free_data(data); warning("unexpected file-format for \"%s\"", filename); @@ -1492,7 +1496,7 @@ read_picture(const char *filename, char **data) #define fg_color(pics,n) (pics->fgcol[n].fgcol) static void -dump_picture(PICS_HEAD * pics) +dump_picture(const PICS_HEAD * pics) { int y, x; @@ -1636,7 +1640,7 @@ report_colors(PICS_HEAD * pics) int total; char buffer[256]; - if (logfp == 0) + if (logfp == NULL) return; qsort(pics->fgcol, (size_t) pics->colors, sizeof(FG_NODE), compare_fg_counts); @@ -1727,10 +1731,10 @@ main(int argc, char *argv[]) int ch; int opt_d = FALSE; char ignore_ch; - const char *palette_path = 0; + const char *palette_path = NULL; const char *rgb_path = RGB_PATH; - while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) { switch (ch) { case 'a': if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1 @@ -1748,8 +1752,8 @@ main(int argc, char *argv[]) case 'L': debugging = TRUE; break; - case 'l': - if ((logfp = fopen(optarg, "a")) == 0) + case 'F': + if ((logfp = fopen(optarg, "a")) == NULL) failed(optarg); break; case 'p': @@ -1767,7 +1771,7 @@ main(int argc, char *argv[]) #if USE_EXTENDED_COLORS case 'x': { - char *s = optarg; + const char *s = optarg; while (*s) { switch (*s++) { case 'p': @@ -1784,11 +1788,8 @@ main(int argc, char *argv[]) } break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -1808,11 +1809,11 @@ main(int argc, char *argv[]) PICS_HEAD *pics; char **data = read_file(argv[n]); - if (data == 0) { + if (data == NULL) { warning("cannot read \"%s\"", argv[n]); continue; } - if ((pics = read_picture(argv[n], data)) != 0) { + if ((pics = read_picture(argv[n], data)) != NULL) { if (in_curses) { show_picture(pics); } else { diff --git a/test/popup_msg.c b/test/popup_msg.c index 09eff5e39430..7bacfacb21e5 100644 --- a/test/popup_msg.c +++ b/test/popup_msg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.c,v 1.11 2021/12/18 21:19:19 tom Exp $ + * $Id: popup_msg.c,v 1.15 2024/12/07 22:22:51 tom Exp $ * * Show a multi-line message in a window which may extend beyond the screen. * @@ -62,7 +62,7 @@ end_popup(void) * Display a temporary window, e.g., to display a help-message. */ void -popup_msg(WINDOW *parent, const char *const *msg) +popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg) { int x0 = 4; int y0 = 2; @@ -78,16 +78,16 @@ popup_msg(WINDOW *parent, const char *const *msg) int last_y; int ch = ERR; - for (n = 0; msg[n] != 0; ++n) { + for (n = 0; msg[n] != NULL; ++n) { int check = (int) strlen(msg[n]); if (width < check) width = check; } length = n; - if ((help = newwin(high, wide, y0, x0)) == 0) + if ((help = newwin(high, wide, y0, x0)) == NULL) return; - if ((data = newpad(length + 1, width + 1)) == 0) { + if ((data = newpad(length + 2, width + 1)) == NULL) { delwin(help); return; } @@ -96,6 +96,7 @@ popup_msg(WINDOW *parent, const char *const *msg) keypad(data, TRUE); + waddstr(data, "Press ^[ or ^Q to exit this window.\n\n"); for (n = 0; n < length; ++n) { waddstr(data, msg[n]); if ((n + 1) < length) { @@ -170,12 +171,12 @@ popup_msg(WINDOW *parent, const char *const *msg) void popup_msg2(WINDOW *parent, char **msg) { - popup_msg(parent, (const char *const *) msg); + popup_msg(parent, (NCURSES_CONST char *const *) msg); } #else void -popup_msg(WINDOW *parent, const char *const *msg) +popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg) { (void) parent; (void) msg; diff --git a/test/popup_msg.h b/test/popup_msg.h index 88dff73b2014..6b08fd78756f 100644 --- a/test/popup_msg.h +++ b/test/popup_msg.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.h,v 1.5 2020/02/02 23:34:34 tom Exp $ + * $Id: popup_msg.h,v 1.6 2024/10/06 21:17:54 tom Exp $ * * Utility functions for a popup-message or help-screen. */ @@ -37,7 +37,7 @@ #include <test.priv.h> -extern void popup_msg(WINDOW *parent, const char *const *msg); +extern void popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg); extern void popup_msg2(WINDOW *parent, char **msg); #endif /* POPUP_MSG_H_incl */ diff --git a/test/programs b/test/programs index 16ecf810391e..3f784d30ef00 100644 --- a/test/programs +++ b/test/programs @@ -1,6 +1,6 @@ -# $Id: programs,v 1.57 2023/11/10 11:48:38 tom Exp $ +# $Id: programs,v 1.58 2024/06/29 18:49:58 tom Exp $ ############################################################################## -# Copyright 2018-2022,2023 Thomas E. Dickey # +# Copyright 2018-2023,2024 Thomas E. Dickey # # Copyright 2006-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -100,8 +100,8 @@ test_delwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_delwin test_endwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_endwin test_get_wstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_get_wstr popup_msg test_getstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_getstr popup_msg -test_instr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_instr -test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr +test_instr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_instr popup_msg +test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr popup_msg test_mouse $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_mouse test_opaque $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_opaque test_setupterm $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_setupterm diff --git a/test/railroad.c b/test/railroad.c index 4d7c0700de5f..1a874f5750a8 100644 --- a/test/railroad.c +++ b/test/railroad.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2000-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2000 * - * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $ + * $Id: railroad.c,v 1.31 2025/12/14 10:58:45 tom Exp $ * * A simple demo of the termcap interface. */ @@ -83,13 +83,13 @@ PutChar(int ch) static void Backup(void) { - tputs(backup != 0 ? backup : "\b", 1, outc); + tputs(backup != NULL ? backup : "\b", 1, outc); } static void MyShowCursor(int flag) { - if (startC != 0 && finisC != 0) { + if (startC != NULL && finisC != NULL) { tputs(flag ? startC : finisC, 1, outc); } } @@ -97,7 +97,7 @@ MyShowCursor(int flag) static void StandOut(int flag) { - if (startS != 0 && finisS != 0) { + if (startS != NULL && finisS != NULL) { tputs(flag ? startS : finisS, 1, outc); } } @@ -105,7 +105,7 @@ StandOut(int flag) static void Underline(int flag) { - if (startU != 0 && finisU != 0) { + if (startU != NULL && finisU != NULL) { tputs(flag ? startU : finisU, 1, outc); } } @@ -113,10 +113,10 @@ Underline(int flag) static void ShowSign(char *string) { - char *base = string; + const char *base = string; int first, last; - if (moveit != 0) { + if (moveit != NULL) { tputs(tgoto(moveit, 0, height - 1), 1, outc); tputs(wipeit, 1, outc); } @@ -124,7 +124,7 @@ ShowSign(char *string) while (*string != 0) { int ch = *string; if (ch != ' ') { - if (moveit != 0) { + if (moveit != NULL) { for (first = length - 2; first >= (string - base); first--) { if (first < length - 1) { tputs(tgoto(moveit, first + 1, height - 1), 1, outc); @@ -152,7 +152,7 @@ ShowSign(char *string) Underline(0); } } - if (moveit != 0) + if (moveit != NULL) Backup(); } StandOut(1); @@ -161,7 +161,7 @@ ShowSign(char *string) fflush(stdout); string++; } - if (moveit != 0) + if (moveit != NULL) tputs(wipeit, 1, outc); putchar('\n'); } @@ -190,9 +190,9 @@ railroad(char **args) char area[1024], *ap = area; int z; - if (name == 0) -#ifdef EXP_WIN32_DRIVER - name = "ms-terminal"; + if (name == NULL) +#ifdef DEFAULT_TERM_ENV + name = DEFAULT_TERM_ENV; #else name = "dumb"; #endif @@ -205,12 +205,12 @@ railroad(char **args) length = tgetnum("co"); moveit = tgetstr("cm", &ap); - if (wipeit == 0 - || moveit == 0 + if (wipeit == NULL + || moveit == NULL || height <= 0 || length <= 0) { - wipeit = 0; - moveit = 0; + wipeit = NULL; + moveit = NULL; height = 0; length = 0; } @@ -262,11 +262,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -276,7 +273,7 @@ main(int argc, char *argv[]) } else { static char world[] = "Hello World"; static char *hello[] = - {world, 0}; + {world, NULL}; railroad(hello); } ExitProgram(EXIT_SUCCESS); diff --git a/test/rain.c b/test/rain.c index 1b1d81a05bcb..5c8ac0ae865f 100644 --- a/test/rain.c +++ b/test/rain.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $ + * $Id: rain.c,v 1.64 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> #include <popup_msg.h> @@ -45,7 +45,7 @@ WANT_USE_WINDOW(); struct DATA; -typedef void (*DrawPart) (struct DATA *); +typedef void (*DrawPart) (const struct DATA *); typedef struct DATA { int y, x; @@ -118,25 +118,25 @@ next_j(int j) } static void -part1(DATA * drop) +part1(const DATA * drop) { MvAddCh(drop->y, drop->x, '.'); } static void -part2(DATA * drop) +part2(const DATA * drop) { MvAddCh(drop->y, drop->x, 'o'); } static void -part3(DATA * drop) +part3(const DATA * drop) { MvAddCh(drop->y, drop->x, 'O'); } static void -part4(DATA * drop) +part4(const DATA * drop) { MvAddCh(drop->y - 1, drop->x, '-'); MvAddStr(drop->y, drop->x - 1, "|.|"); @@ -144,7 +144,7 @@ part4(DATA * drop) } static void -part5(DATA * drop) +part5(const DATA * drop) { MvAddCh(drop->y - 2, drop->x, '-'); MvAddStr(drop->y - 1, drop->x - 1, "/ \\"); @@ -154,7 +154,7 @@ part5(DATA * drop) } static void -part6(DATA * drop) +part6(const DATA * drop) { MvAddCh(drop->y - 2, drop->x, ' '); MvAddStr(drop->y - 1, drop->x - 1, " "); @@ -186,7 +186,7 @@ really_draw(WINDOW *win, void *arg) } static void -draw_part(void (*func) (DATA *), int state, DATA * data) +draw_part(void (*func) (const DATA *), int state, DATA * data) { data->func = func; data->state = state; @@ -229,7 +229,7 @@ draw_drop(void *arg) * Find myself in the list of threads so we can count the number of loops. */ for (mystats = 0; mystats < MAX_THREADS; ++mystats) { -#if defined(_NC_WINDOWS) && !defined(__WINPTHREADS_VERSION) +#if defined(_NC_WINDOWS_NATIVE) && !defined(__WINPTHREADS_VERSION) if (drop_threads[mystats].myself.p == pthread_self().p) #else if (drop_threads[mystats].myself == pthread_self()) @@ -328,14 +328,14 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q/Q exit the program", " s do single-step", " <space> undo single-step", "", - 0 + NULL }; bool done = FALSE; @@ -356,11 +356,8 @@ main(int argc, char *argv[]) d_option = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/redraw.c b/test/redraw.c index 749f790b3fd3..ef1d43ecfcb6 100644 --- a/test/redraw.c +++ b/test/redraw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $ + * $Id: redraw.c,v 1.21 2025/07/05 15:11:35 tom Exp $ * * Demonstrate the redrawwin() and wredrawln() functions. * Thomas Dickey - 2006/11/4 @@ -61,7 +61,7 @@ trash(int beg_x, int max_x, int cur_x) static void test_redraw(WINDOW *win) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " ^Q/ESC/q - quit", @@ -76,7 +76,7 @@ test_redraw(WINDOW *win) "", "Other control characters are added to the screen in printable form.", "Other printable characters are added to the screen as is.", - 0 + NULL }; WINDOW *win1; @@ -85,7 +85,7 @@ test_redraw(WINDOW *win) int max_y, max_x; int beg_y, beg_x; - assert(win != 0); + assert(win != NULL); scrollok(win, TRUE); keypad(win, TRUE); @@ -224,11 +224,8 @@ main(int argc, char *argv[]) case 'n': no_init = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/savescreen.c b/test/savescreen.c index 3ea619306a84..107bbd134ab4 100644 --- a/test/savescreen.c +++ b/test/savescreen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $ + * $Id: savescreen.c,v 1.68 2025/07/05 15:21:56 tom Exp $ * * Demonstrate save/restore functions from the curses library. * Thomas Dickey - 2007/7/14 @@ -89,14 +89,14 @@ cleanup(char *files[]) if (!keep_dumps) { int n; - for (n = 0; files[n] != 0; ++n) { + for (n = 0; files[n] != NULL; ++n) { unlink(files[n]); } } } static int -load_screen(char *filename) +load_screen(NCURSES_CONST char *filename) { int result; @@ -170,10 +170,10 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) #if USE_WIDEC_SUPPORT cchar_t mycc; #endif - char *filename = files[which]; + NCURSES_CONST char *filename = files[which]; bool dumped = FALSE; - if (filename != 0) { + if (filename != NULL) { dumped = TRUE; show_what(color, ++which, last); if (scr_dump(filename) == ERR) { @@ -216,7 +216,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) static void editor_help(void) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "You are now in the screen-editor, which allows you to make some", "lines on the screen, as well as save copies of the screen to a", @@ -230,7 +230,7 @@ editor_help(void) " a toggle between '#' and graphic symbol for drawing", " c change color drawn by line to next in palette", " h,j,k,l or arrows to move around the screen, drawing", - 0 + NULL }; popup_msg(stdscr, msgs); } @@ -238,7 +238,7 @@ editor_help(void) static void replay_help(void) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "You are now in the screen-loader, which allows you to view", "the dumped/restored screens.", @@ -247,7 +247,7 @@ replay_help(void) " q quit", " <space> load the next screen", " <backspace> load the previous screen", - 0 + NULL }; popup_msg(stdscr, msgs); } @@ -261,7 +261,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -f file fill/initialize screen using text from this file" + ," -f FILE fill/initialize screen using text from this file" ," -i use scr_init/scr_restore rather than scr_set" ," -k keep the restored dump-files rather than removing them" ," -r replay the screen-dump files" @@ -286,7 +286,7 @@ main(int argc, char *argv[]) bool replaying = FALSE; bool done = FALSE; char **files; - char *fill_by = 0; + NCURSES_CONST char *fill_by = NULL; #if USE_WIDEC_SUPPORT cchar_t mycc; static const wchar_t mywc[2] = @@ -309,11 +309,8 @@ main(int argc, char *argv[]) case 'r': replaying = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -366,7 +363,7 @@ main(int argc, char *argv[]) * After that, use color pairs for constructing a test-pattern, e.g., * imitating xterm's scripts. */ - if (fill_by == 0) { + if (fill_by == NULL) { if (COLORS <= 256) { for (n = 0; n < COLORS; ++n) init_pair((short) (n + MAX_ANSI), (short) n, (short) n); @@ -407,7 +404,7 @@ main(int argc, char *argv[]) } #endif } - if ((fill_by == 0) && !replaying) { + if ((fill_by == NULL) && !replaying) { #if USE_WIDEC_SUPPORT int cube = 0; #endif @@ -484,9 +481,9 @@ main(int argc, char *argv[]) } } - if (fill_by != 0) { + if (fill_by != NULL) { FILE *fp = fopen(fill_by, "r"); - if (fp != 0) { + if (fp != NULL) { bool filled = FALSE; move(1, 0); while ((ch = fgetc(fp)) != EOF) { @@ -577,7 +574,7 @@ main(int argc, char *argv[]) int x = 0; int color = 0; int altchars = 0; - bool dirty = use_colors || (fill_by != 0); + bool dirty = use_colors || (fill_by != NULL); while (!done) { switch (get_command(color, which, last)) { diff --git a/test/savescreen.sh b/test/savescreen.sh index 1ffab2fcc170..5856e43bf093 100755 --- a/test/savescreen.sh +++ b/test/savescreen.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2020,2022 Thomas E. Dickey # +# Copyright 2020-2022,2025 Thomas E. Dickey # # Copyright 2007-2009,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -27,7 +27,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: savescreen.sh,v 1.8 2022/07/16 16:34:34 tom Exp $ +# $Id: savescreen.sh,v 1.9 2025/06/14 15:06:24 tom Exp $ # # Use this script to exercise "savescreen". # It starts by generating a series of temporary-filenames, which are passed @@ -40,27 +40,26 @@ MY_DIR=$TMPDIR/savescreen$$ trap "rm -rf $MY_DIR; exit 1" 1 2 3 trap "rm -rf $MY_DIR" 0 umask 077 -mkdir $MY_DIR || exit 1 +mkdir "$MY_DIR" || exit 1 PARAMS= NFILES=4 PREFIX=$MY_DIR/savescreen n=0 BEGINS=$PREFIX-$n.tmp -while test $n != $NFILES +while [ "$n" != $NFILES ] do LATEST=$PREFIX-$n.tmp PARAMS="$PARAMS $LATEST" - n=`expr $n + 1` + n=`expr "$n" + 1` done ${0%.sh} $PARAMS -if test -f $BEGINS +if [ -f "$BEGINS" ] then - while test -f $BEGINS + while [ -f "$BEGINS" ] do - "${0%.sh}" -r $PARAMS - test $? != 0 && break + "${0%.sh}" -r $PARAMS || break done else echo "No screens were saved" diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c index 72b20cfb0c1d..5db7ddd60b7a 100644 --- a/test/sp_tinfo.c +++ b/test/sp_tinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,7 +28,7 @@ ****************************************************************************/ /* - * $Id: sp_tinfo.c,v 1.29 2023/06/24 14:14:56 tom Exp $ + * $Id: sp_tinfo.c,v 1.31 2025/07/05 15:21:56 tom Exp $ * * TOTO: add option for non-sp-funcs interface */ @@ -138,7 +138,7 @@ static void show_string(MYDATA * data, const char *name, const char *value) { fprintf(data->fp, " %s = ", name); - if (value == 0) { + if (value == NULL) { fprintf(data->fp, "(missing)"); } else if (value == (char *) -1) { fprintf(data->fp, "(canceled)"); @@ -218,7 +218,7 @@ do_stuff(MYDATA * data) define_key_sp(sp, my_text, my_code); has_key_sp(sp, 0); key_defined_sp(sp, my_text); - if ((s = keybound_sp(sp, my_code, 0)) != 0) + if ((s = keybound_sp(sp, my_code, 0)) != NULL) free(s); #endif keyname_sp(sp, '?'); @@ -240,7 +240,7 @@ do_stuff(MYDATA * data) typeahead_sp(sp, FALSE); /* waddch */ use_env_sp(sp, FALSE); /* newterm */ use_tioctl_sp(sp, FALSE); /* newterm */ - intrflush_sp(sp, 0, 0); /* wgetch */ + intrflush_sp(sp, NULL, 0); /* wgetch */ flushinp_sp(sp); /* waddch */ halfdelay_sp(sp, 5); /* wgetch */ @@ -319,11 +319,8 @@ main(int argc, char *argv[]) case 't': opt_t = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/tclock.c b/test/tclock.c index 1a749628914d..b0374a1a240a 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,4 +1,4 @@ -/* $Id: tclock.c,v 1.48 2023/02/25 16:42:22 tom Exp $ */ +/* $Id: tclock.c,v 1.52 2025/07/05 15:11:35 tom Exp $ */ #define NEED_TIME_H #include <test.priv.h> @@ -145,7 +145,7 @@ main(int argc, char *argv[]) int lastbeep = -1; bool odd = FALSE; time_t tim; - struct tm *t; + const struct tm *t; char szChar[20]; char *text; short my_bg = COLOR_BLACK; @@ -161,11 +161,8 @@ main(int argc, char *argv[]) d_option = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -220,7 +217,7 @@ main(int argc, char *argv[]) for (;;) { napms(100); - tim = time(0); + tim = time(NULL); t = localtime(&tim); hours = (t->tm_hour + (t->tm_min / 60.0)); @@ -293,7 +290,7 @@ main(int argc, char *argv[]) int main(void) { - printf("This program requires the header math.h and trignometric functions\n"); + printf("This program requires the header math.h and trigonometric functions\n"); ExitProgram(EXIT_FAILURE); } #endif diff --git a/test/test.priv.h b/test/test.priv.h index a901185b8df0..3c0c2d36979d 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */ +/* $Id: test.priv.h,v 1.229 2025/12/06 21:21:06 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -183,6 +183,30 @@ #define HAVE_MATH_H 0 #endif +#ifndef HAVE_MBLEN +#define HAVE_MBLEN 0 +#endif + +#ifndef HAVE_MBRLEN +#define HAVE_MBRLEN 0 +#endif + +#ifndef HAVE_MBRTOWC +#define HAVE_MBRTOWC 0 +#endif + +#ifndef HAVE_MBSRTOWCS +#define HAVE_MBSRTOWCS 0 +#endif + +#ifndef HAVE_MBSTOWCS +#define HAVE_MBSTOWCS 0 +#endif + +#ifndef HAVE_MBTOWC +#define HAVE_MBTOWC 0 +#endif + #ifndef HAVE_MENU_H #define HAVE_MENU_H 0 #endif @@ -275,6 +299,10 @@ #define HAVE_SYS_SELECT_H 0 #endif +#ifndef HAVE_SYS_TIME_SELECT +#define HAVE_SYS_TIME_SELECT 0 +#endif + #ifndef HAVE_TERMATTRS #define HAVE_TERMATTRS 0 #endif @@ -363,6 +391,18 @@ #define HAVE_VID_PUTS 0 #endif +#ifndef HAVE_WCSRTOMBS +#define HAVE_WCSRTOMBS 0 +#endif + +#ifndef HAVE_WCSTOMBS +#define HAVE_WCSTOMBS 0 +#endif + +#ifndef HAVE_WCWIDTH +#define HAVE_WCWIDTH 0 +#endif + #ifndef HAVE_WINSDELLN #define HAVE_WINSDELLN 0 #endif @@ -743,16 +783,28 @@ extern int optind; #define HELP_KEY_2 KEY_F(1) /* our "standard" options for getopt, needed for help2man */ +#define OPTS_COMMAND 'c' +#define OPTS_LOGGING 'l' #define OPTS_USAGE 'h' #define OPTS_VERSION 'V' -#define OPTS_COMMON "hV" +#define OPTS_COMMON "c:l:hV" #define USAGE_COMMON \ "Common options:"\ ," -h show this message"\ ," -V show version of curses" +/* reserve -c/-l for command/logging */ +#define CASE_COMMON \ + case OPTS_COMMAND: \ + case OPTS_LOGGING: \ + usage(ch == OPTS_USAGE); \ + ExitProgram(EXIT_FAILURE); \ + case OPTS_VERSION: \ + show_version(argv); \ + ExitProgram(EXIT_SUCCESS) + #if HAVE_CURSES_VERSION -#define format_version(buffer, size) strcpy(buffer, curses_version()) +#define format_version(buffer, size) _nc_STRCPY(buffer, curses_version(), size) #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH) #define format_version(buffer, size) \ _nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \ @@ -760,13 +812,13 @@ extern int optind; NCURSES_VERSION_MINOR, \ NCURSES_VERSION_PATCH) #else -#define format_version(buffer, size) strcpy(buffer, "ncurses-examples") +#define format_version(buffer, size) _nc_STRCPY(buffer, "ncurses-examples", size) #endif #define VERSION_COMMON() \ static char *version_common(char **argv) { \ - char *base = argv[0]; \ - char *part = strrchr(base, '/'); \ + const char *base = argv[0]; \ + const char *part = strrchr(base, '/'); \ size_t need = strlen(base) + 80; \ char *result = malloc(need); \ if (result != NULL) { \ @@ -853,6 +905,12 @@ extern "C" { #endif /* + * To make them easier to find, user-defined capabilities used within ncurses + * should be tagged with this macro: + */ +#define UserCap(name) #name + +/* * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4 * curses did, and some implementations provide them anyway, but undeclared. */ @@ -916,8 +974,8 @@ extern int TABSIZE; * Workaround in case getcchar() returns a positive value when the source * string produces only a L'\0'. */ -#define TEST_CCHAR(s, count, then_stmt, else_stmt) \ - if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \ +#define TEST_CCHAR(s, then_stmt, else_stmt) \ + if (getcchar(s, NULL, NULL, NULL, NULL) > 0) { \ wchar_t test_wch[CCHARW_MAX + 2]; \ attr_t test_attrs; \ NCURSES_PAIRS_T test_pair; \ @@ -1047,12 +1105,12 @@ extern int TABSIZE; #define EXIT_FAILURE 1 #endif -#undef _NC_WINDOWS +#undef _NC_WINDOWS_NATIVE #if (defined(_WIN32) || defined(_WIN64)) -#define _NC_WINDOWS 1 +#define _NC_WINDOWS_NATIVE 1 #endif -#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) +#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER) #if defined(PDCURSES) #ifdef WINVER @@ -1066,11 +1124,8 @@ extern int TABSIZE; #include <sys/time.h> /* for struct timeval */ #undef sleep #define sleep(n) Sleep((n) * 1000) -#define SIGHUP 1 -#define SIGKILL 9 -#define getlogin() "username" -#elif defined(EXP_WIN32_DRIVER) +#else /* !PDCURSES */ #if defined(HAVE_NCURSESW_NCURSES_H) #include <ncursesw/nc_win32.h> @@ -1080,23 +1135,23 @@ extern int TABSIZE; #include <nc_win32.h> #endif -#else +#endif /* PDCURSES */ -#if defined(HAVE_NCURSESW_NCURSES_H) -#include <ncursesw/nc_mingw.h> -#elif defined(HAVE_NCURSES_NCURSES_H) -#include <ncurses/nc_mingw.h> -#else -#include <nc_mingw.h> +#define getlogin() "username" + +#ifndef SIGHUP +#define SIGHUP 1 #endif +#ifndef SIGKILL +#define SIGKILL 9 #endif /* conflicts in test/firstlast.c */ #undef large #undef small -#endif +#endif /* WIN32... */ #ifdef NEED_TIME_H #if TIME_WITH_SYS_TIME @@ -1184,7 +1239,7 @@ extern char *_nc_strstr(const char *, const char *); #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0) #endif -#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) +#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER) #define SetupAlarm(opt) (void)opt #else #define SetupAlarm(opt) if (opt) alarm((unsigned)opt) diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index f69e1ddc271a..c2f204872a59 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $ + * $Id: test_add_wchstr.c,v 1.38 2025/11/01 20:04:59 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -88,7 +88,7 @@ static cchar_t *temp_buffer; static size_t temp_length; #define TempBuffer(source_len, source_cast) \ - if (source != 0) { \ + if (source != NULL) { \ const char *temp; \ size_t need = source_len + 1; \ wchar_t have[2]; \ @@ -107,7 +107,7 @@ static size_t temp_length; if (!pass_ctls \ && have[0] != 0 \ && have[0] < 256 \ - && (temp = unctrl((chtype) have[0])) != 0 \ + && (temp = unctrl((chtype) have[0])) != NULL \ && strlen(temp) > 1) { \ while (*temp != '\0') { \ have[0] = (wchar_t) *temp++; \ @@ -117,9 +117,9 @@ static size_t temp_length; setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \ } \ } while (have[0] != 0); \ - } else if (temp_buffer != 0) { \ + } else if (temp_buffer != NULL) { \ free(temp_buffer); \ - temp_buffer = 0; \ + temp_buffer = NULL; \ temp_length = 0; \ } \ return temp_buffer; @@ -136,7 +136,7 @@ ChWLen(const wchar_t *source) for (n = 0; source[n] != 0; ++n) { const char *s; - if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) { + if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != NULL) { adjust += (strlen(s) - 1); } } @@ -158,7 +158,7 @@ ChWStr(const wchar_t *source) } static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -197,7 +197,7 @@ ColOf(const wchar_t *buffer, int length, int margin) int result; for (n = 0, result = margin + 1; n < length; ++n) { - int ch = buffer[n]; + int ch = (int) buffer[n]; switch (ch) { case '\n': /* actually newline should clear the remainder of the line @@ -310,9 +310,9 @@ recursive_test(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove @@ -591,11 +591,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_addchstr.c b/test/test_addchstr.c index cddc31528fc4..9aab678fa7e1 100644 --- a/test/test_addchstr.c +++ b/test/test_addchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $ + * $Id: test_addchstr.c,v 1.32 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the waddchstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -82,7 +82,7 @@ ChLen(const char *source) for (n = 0; n < result; ++n) { const char *s = unctrl(UChar(source[n])); - if (s != 0) { + if (s != NULL) { adjust += (strlen(s) - 1); } } @@ -94,7 +94,7 @@ ChLen(const char *source) static chtype * ChStr(const char *source) { - if (source != 0) { + if (source != NULL) { size_t need = ChLen(source) + 1; int n = 0; @@ -107,7 +107,7 @@ ChStr(const char *source) do { const char *s; chtype ch = UChar(*source++); - if (!pass_ctls && (s = unctrl(ch)) != 0) { + if (!pass_ctls && (s = unctrl(ch)) != NULL) { while (*s != '\0') { temp_buffer[n++] = UChar(*s++); } @@ -116,9 +116,9 @@ ChStr(const char *source) } } while (source[0] != 0); temp_buffer[n] = 0; - } else if (temp_buffer != 0) { + } else if (temp_buffer != NULL) { free(temp_buffer); - temp_buffer = 0; + temp_buffer = NULL; temp_length = 0; } return temp_buffer; @@ -169,7 +169,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -218,9 +218,9 @@ recursive_test(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove @@ -509,11 +509,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_addstr.c b/test/test_addstr.c index ba8a90e5cd82..d34b4a9cd86c 100644 --- a/test/test_addstr.c +++ b/test/test_addstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $ + * $Id: test_addstr.c,v 1.23 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the waddstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -91,7 +91,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -140,9 +140,9 @@ recursive_test(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove @@ -420,11 +420,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_addwstr.c b/test/test_addwstr.c index 9e51f49df149..d380a77a74e6 100644 --- a/test/test_addwstr.c +++ b/test/test_addwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2022,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addwstr.c,v 1.22 2023/05/27 20:13:10 tom Exp $ + * $Id: test_addwstr.c,v 1.26 2025/11/01 20:04:59 tom Exp $ * * Demonstrate the waddwstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -82,7 +82,7 @@ static bool w_opt = FALSE; static int n_opt = -1; static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -120,7 +120,7 @@ ColOf(const wchar_t *const buffer, int length, int margin) int result; for (n = 0, result = margin + 1; n < length; ++n) { - int ch = buffer[n]; + int ch = (int) buffer[n]; switch (ch) { case '\n': /* actually newline should clear the remainder of the line @@ -233,9 +233,9 @@ recursive_test(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove @@ -512,11 +512,8 @@ main(int argc, char *argv[]) case 'w': w_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_arrays.c b/test/test_arrays.c index f89cb280f05f..998791b9f411 100644 --- a/test/test_arrays.c +++ b/test/test_arrays.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $ + * $Id: test_arrays.c,v 1.16 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -53,7 +53,7 @@ extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[]; static bool opt_C; static bool opt_T; -static bool opt_c; +static bool opt_s; static bool opt_f; static bool opt_n; static bool opt_t; @@ -66,7 +66,7 @@ dump_array(const char *name, NCURSES_CONST char *const *list) int n; printf("%s:\n", name); - for (n = 0; list[n] != 0; ++n) { + for (n = 0; list[n] != NULL; ++n) { printf("%5d:%s\n", n, list[n]); } } @@ -75,15 +75,15 @@ static void dump_plain(void) { PLAIN(opt_T && opt_n, boolnames); - PLAIN(opt_C && opt_c, boolcodes); + PLAIN(opt_C && opt_s, boolcodes); PLAIN(opt_T && opt_f, boolfnames); PLAIN(opt_T && opt_n, numnames); - PLAIN(opt_C && opt_c, numcodes); + PLAIN(opt_C && opt_s, numcodes); PLAIN(opt_T && opt_f, numfnames); PLAIN(opt_T && opt_n, strnames); - PLAIN(opt_C && opt_c, strcodes); + PLAIN(opt_C && opt_s, strcodes); PLAIN(opt_T && opt_f, strfnames); } @@ -99,7 +99,7 @@ dump_table(void) STRING(opt_t, "Index"); STRING(opt_t, "Type"); STRING(opt_n, "Name"); - STRING(opt_c, "Code"); + STRING(opt_s, "Code"); STRING(opt_f, "FName"); printf("\n"); @@ -108,7 +108,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "bool"); STRING(opt_T && opt_n, boolnames[r]); - STRING(opt_C && opt_c, boolcodes[r]); + STRING(opt_C && opt_s, boolcodes[r]); STRING(opt_T && opt_f, boolfnames[r]); printf("\n"); } @@ -118,7 +118,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "num"); STRING(opt_T && opt_n, numnames[r]); - STRING(opt_C && opt_c, numcodes[r]); + STRING(opt_C && opt_s, numcodes[r]); STRING(opt_T && opt_f, numfnames[r]); printf("\n"); } @@ -128,7 +128,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "str"); STRING(opt_T && opt_n, strnames[r]); - STRING(opt_C && opt_c, strcodes[r]); + STRING(opt_C && opt_s, strcodes[r]); STRING(opt_T && opt_f, strfnames[r]); printf("\n"); } @@ -148,7 +148,7 @@ usage(int ok) ,"Options:" ," -C print termcap names" ," -T print terminfo names" - ," -c print termcap names" + ," -s print short termcap names" ," -f print full terminfo names" ," -n print short terminfo names" ," -t print the result as CSV table" @@ -168,7 +168,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CTsfnt")) != -1) { switch (ch) { case 'C': opt_C = TRUE; @@ -176,8 +176,8 @@ main(int argc, char *argv[]) case 'T': opt_T = TRUE; break; - case 'c': - opt_c = TRUE; + case 's': + opt_s = TRUE; break; case 'f': opt_f = TRUE; @@ -188,11 +188,8 @@ main(int argc, char *argv[]) case 't': opt_t = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -202,8 +199,8 @@ main(int argc, char *argv[]) if (!(opt_T || opt_C)) { opt_T = opt_C = TRUE; } - if (!(opt_c || opt_f || opt_n)) { - opt_c = opt_f = opt_n = TRUE; + if (!(opt_s || opt_f || opt_n)) { + opt_s = opt_f = opt_n = TRUE; } if (opt_t) { diff --git a/test/test_delwin.c b/test/test_delwin.c index 09ef5c538e4e..8ed5a34faf72 100644 --- a/test/test_delwin.c +++ b/test/test_delwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2022,2023 Thomas E. Dickey * + * Copyright 2022-2023,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,7 +27,7 @@ ****************************************************************************/ /* - * $Id: test_delwin.c,v 1.5 2023/05/27 20:34:51 tom Exp $ + * $Id: test_delwin.c,v 1.6 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -82,11 +82,8 @@ main(int argc, char **argv) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_endwin.c b/test/test_endwin.c index 8e0d283cd2cc..9258b3cbbfc2 100644 --- a/test/test_endwin.c +++ b/test/test_endwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2023 Thomas E. Dickey * + * Copyright 2023-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_endwin.c,v 1.2 2023/11/10 15:17:19 tom Exp $ + * $Id: test_endwin.c,v 1.5 2025/07/05 15:21:56 tom Exp $ */ #include <test.priv.h> @@ -38,11 +38,11 @@ usage(int ok) "Usage: test_endwin [options]" ,"" ,"Options:" - ," -e call endwin() an extra time" - ," -i call initscr() before endwin()" - ," -n call newterm() before endwin()" - ," -r call refresh() before endwin()" - ," -s call getch() after endwin(), to refresh screen" + ," -e call endwin() an extra time" + ," -i call initscr() before endwin()" + ," -n call newterm() before endwin()" + ," -r call refresh() before endwin()" + ," -s call getch() after endwin(), to refresh screen" ,"" ,USAGE_COMMON }; @@ -67,7 +67,7 @@ main(int argc, char *argv[]) int rc_e1 = OK; int rc_e2 = OK; int rc_e3 = OK; - SCREEN *sp = NULL; + const SCREEN *sp = NULL; bool opt_e = FALSE; bool opt_i = FALSE; bool opt_n = FALSE; @@ -91,11 +91,8 @@ main(int argc, char *argv[]) case 's': opt_s = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c index 2a788fce8dfa..2af095f1b905 100644 --- a/test/test_get_wstr.c +++ b/test/test_get_wstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $ + * $Id: test_get_wstr.c,v 1.18 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -69,7 +69,7 @@ Quit(int ch) } static int -Remainder(WINDOW *txtwin) +Remainder(const WINDOW *txtwin) { int result = getmaxx(txtwin) - getcurx(txtwin); return (result > 0) ? result : 0; @@ -138,7 +138,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit) static int recursive_test(int level, char **argv, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -158,10 +158,10 @@ recursive_test(int level, char **argv, WINDOW *strwin) "", " w - recur to subwindow", " ?,<F1> - show help-screen", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int rc; @@ -172,7 +172,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) int actual; wint_t buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -200,7 +200,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -250,7 +250,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) case 'w': recursive_test(level + 1, argv, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -384,11 +384,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_getstr.c b/test/test_getstr.c index dbc0a0a271ed..8e1720b834e4 100644 --- a/test/test_getstr.c +++ b/test/test_getstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $ + * $Id: test_getstr.c,v 1.21 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -76,7 +76,7 @@ Quit(int ch) } static int -Remainder(WINDOW *txtwin) +Remainder(NCURSES_CONST WINDOW *txtwin) { int result = getmaxx(txtwin) - getcurx(txtwin); return (result > 0) ? result : 0; @@ -145,7 +145,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit) static int recursive_test(int level, char **argv, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -165,10 +165,10 @@ recursive_test(int level, char **argv, WINDOW *strwin) "", " w - recur to subwindow", " ?,<F1> - show help-screen", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int rc; @@ -180,7 +180,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) char buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -208,7 +208,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -258,7 +258,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) case 'w': recursive_test(level + 1, argv, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -391,11 +391,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_instr.c b/test/test_instr.c index c87bdd707212..cb8faa697bff 100644 --- a/test/test_instr.c +++ b/test/test_instr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $ + * $Id: test_instr.c,v 1.17 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -44,6 +44,7 @@ */ #include <test.priv.h> +#include <popup_msg.h> #define BASE_Y 6 #define MAX_COLS 1024 @@ -55,24 +56,44 @@ Quit(int ch) } static void -show_1st(WINDOW *win, int line, char *buffer) +show_1st(WINDOW *win, int line, NCURSES_CONST char *buffer) { MvWAddStr(win, line, 5, buffer); } static void -showmore(WINDOW *win, int line, char *buffer) +showmore(WINDOW *win, int line, NCURSES_CONST char *buffer) { wmove(win, line, 0); wclrtoeol(win); show_1st(win, line, buffer); } +static void +show_help(WINDOW *win) +{ + static NCURSES_CONST char *msgs[] = + { + "Show file contents and a viewport from the variants of winstr." + ,"Use h/j/k/l or arrow keys to move the viewport." + ,"" + ,"Other commands:" + ,"+ increases the buffer-size used." + ,"- decreases the buffer-size used." + ,"w opens new window on the next filename." + ,"q quits the current file/window." + ,"? shows this help-window" + ,NULL + }; + + popup_msg(win, msgs); +} + static int recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -81,7 +102,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) char buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +131,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -153,7 +174,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': recursive_test(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -169,8 +190,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) } break; case '+': - ++limit; + if (limit + 2 < MAX_COLS) { + ++limit; + } else { + beep(); + } break; + case HELP_KEY_1: + show_help(txtwin); + continue; default: beep(); break; @@ -262,19 +290,18 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } setlocale(LC_ALL, ""); - if (optind + 1 > argc) + if (optind + 1 > argc) { + fprintf(stderr, "At least one text-file is needed\n"); usage(FALSE); + } initscr(); diff --git a/test/test_inwstr.c b/test/test_inwstr.c index c22add7b8fa9..ab12470ea724 100644 --- a/test/test_inwstr.c +++ b/test/test_inwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $ + * $Id: test_inwstr.c,v 1.13 2025/07/05 15:21:56 tom Exp $ * * Author: Thomas E Dickey * @@ -47,6 +47,8 @@ #if USE_WIDEC_SUPPORT +#include <popup_msg.h> + #define BASE_Y 6 #define MAX_COLS 1024 @@ -57,24 +59,44 @@ Quit(int ch) } static void -show_1st(WINDOW *win, int line, wchar_t *buffer) +show_1st(WINDOW *win, int line, const wchar_t *buffer) { (void) mvwaddwstr(win, line, 5, buffer); } static void -showmore(WINDOW *win, int line, wchar_t *buffer) +showmore(WINDOW *win, int line, const wchar_t *buffer) { wmove(win, line, 0); wclrtoeol(win); show_1st(win, line, buffer); } +static void +show_help(WINDOW *win) +{ + static NCURSES_CONST char *msgs[] = + { + "Show file contents and a viewport from the variants of winwstr." + ,"Use h/j/k/l or arrow keys to move the viewport." + ,"" + ,"Other commands:" + ,"+ increases the buffer-size used." + ,"- decreases the buffer-size used." + ,"w opens new window on the next filename." + ,"q quits the current file/window." + ,"? shows this help-window" + ,NULL + }; + + popup_msg(win, msgs); +} + static int recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -82,7 +104,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) int limit = getmaxx(strwin) - 5; wchar_t buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +132,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -153,7 +175,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': recursive_test(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -169,8 +191,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) } break; case '+': - ++limit; + if (limit + 2 < MAX_COLS) { + ++limit; + } else { + beep(); + } break; + case HELP_KEY_1: + show_help(txtwin); + continue; default: beep(); break; @@ -262,19 +291,18 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } setlocale(LC_ALL, ""); - if (optind + 1 > argc) + if (optind + 1 > argc) { + fprintf(stderr, "At least one text-file is needed\n"); usage(FALSE); + } initscr(); diff --git a/test/test_mouse.c b/test/test_mouse.c index 5508ea42f503..5a47f2b5253a 100644 --- a/test/test_mouse.c +++ b/test/test_mouse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2022-2023,2024 Thomas E. Dickey * + * Copyright 2022-2024,2025 Thomas E. Dickey * * Copyright 2022 Leonid S. Usov <leonid.s.usov at gmail.com> * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -20,9 +20,14 @@ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * ****************************************************************************/ /* - * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $ + * $Id: test_mouse.c,v 1.38 2025/07/05 15:11:35 tom Exp $ * * Author: Leonid S Usov * @@ -31,20 +36,20 @@ #include <test.priv.h> -#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS) +#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS_NATIVE) static int logoffset = 0; static void raw_loop(void) { - char *xtermcap; + const char *xtermcap; printf("Entering raw mode. Ctrl-c to quit.\n"); newterm(NULL, stdout, stdin); raw(); - xtermcap = tigetstr("XM"); + xtermcap = tigetstr(UserCap(XM)); if (!VALID_STRING(xtermcap)) { fprintf(stderr, "couldn't get XM terminfo"); return; @@ -214,8 +219,8 @@ usage(int ok) ,USAGE_COMMON ,"Options:" ," -r show raw input stream, injecting a new line before every ESC" - ," -i n set mouse interval to n; default is 0 (no double-clicks)" - ," -T term use terminal description other than $TERM" + ," -i NUM set mouse interval to NUM; default is 0 (no double-clicks)" + ," -T TERM override $TERM" }; unsigned n; for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) { @@ -253,11 +258,8 @@ main(int argc, char *argv[]) putenv(my_environ); } break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_opaque.c b/test/test_opaque.c index 09b98c009019..8d833248e8b9 100644 --- a/test/test_opaque.c +++ b/test/test_opaque.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $ + * $Id: test_opaque.c,v 1.20 2025/07/05 15:11:35 tom Exp $ * * Author: Thomas E Dickey * @@ -79,7 +79,7 @@ static bool test_opaque_idcok(WINDOW *win, int mode) { if (mode >= 0) { - idcok(win, mode); + idcok(win, (bool) mode); } return is_idcok(win); } @@ -88,7 +88,7 @@ static bool test_opaque_idlok(WINDOW *win, int mode) { if (mode >= 0) { - idlok(win, mode); + idlok(win, (bool) mode); } return is_idlok(win); } @@ -97,7 +97,7 @@ static bool test_opaque_immedok(WINDOW *win, int mode) { if (mode >= 0) { - immedok(win, mode); + immedok(win, (bool) mode); } return is_immedok(win); } @@ -106,7 +106,7 @@ static bool test_opaque_keypad(WINDOW *win, int mode) { if (mode >= 0) { - keypad(win, mode); + keypad(win, (bool) mode); } return is_keypad(win); } @@ -115,7 +115,7 @@ static bool test_opaque_leaveok(WINDOW *win, int mode) { if (mode >= 0) { - leaveok(win, mode); + leaveok(win, (bool) mode); } return is_leaveok(win); } @@ -124,7 +124,7 @@ static bool test_opaque_nodelay(WINDOW *win, int mode) { if (mode >= 0) { - nodelay(win, mode); + nodelay(win, (bool) mode); } return is_nodelay(win); } @@ -133,7 +133,7 @@ static bool test_opaque_notimeout(WINDOW *win, int mode) { if (mode >= 0) { - notimeout(win, mode); + notimeout(win, (bool) mode); } return is_notimeout(win); } @@ -142,7 +142,7 @@ static bool test_opaque_scrollok(WINDOW *win, int mode) { if (mode >= 0) { - scrollok(win, mode); + scrollok(win, (bool) mode); } return is_scrollok(win); } @@ -151,21 +151,39 @@ static bool test_opaque_syncok(WINDOW *win, int mode) { if (mode >= 0) { - syncok(win, mode); + syncok(win, (bool) mode); } return is_syncok(win); } static int -status_y(WINDOW *stswin, int cell) +height_of(const WINDOW *win) { - return (cell % getmaxy(stswin)); + int result = getmaxy(win); + if (result <= 0) + result = 1; + return result; } static int -status_x(WINDOW *stswin, int cell) +width_of(const WINDOW *win) { - return (15 * (cell / getmaxy(stswin))); + int result = getmaxx(win); + if (result <= 0) + result = 1; + return result; +} + +static int +status_y(const WINDOW *stswin, int cell) +{ + return (cell % height_of(stswin)); +} + +static int +status_x(const WINDOW *stswin, int cell) +{ + return (15 * (cell / height_of(stswin))); } static void @@ -269,8 +287,8 @@ show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active) static int test_opaque(int level, char **argv, WINDOW *stswin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -278,7 +296,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) bool in_status = FALSE; int active = 0; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -289,8 +307,8 @@ test_opaque(int level, char **argv, WINDOW *stswin) wnoutrefresh(txtbox); txtwin = derwin(txtbox, - getmaxy(txtbox) - 2, - getmaxx(txtbox) - 2, + height_of(txtbox) - 2, + width_of(txtbox) - 2, 1, 1); base_y = 0; } else { @@ -306,7 +324,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -365,7 +383,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) break; case KEY_DOWN: case 'j': - if (txt_y < getmaxy(txtwin) - 1) + if (txt_y < height_of(txtwin) - 1) txt_y++; else beep(); @@ -386,14 +404,14 @@ test_opaque(int level, char **argv, WINDOW *stswin) break; case KEY_RIGHT: case 'l': - if (txt_x < getmaxx(txtwin) - 1) + if (txt_x < width_of(txtwin) - 1) txt_x++; else beep(); break; case 'w': test_opaque(level + 1, argv, stswin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -483,11 +501,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_setupterm.c b/test/test_setupterm.c index 24d7c46c7773..3f53bf89b0d6 100644 --- a/test/test_setupterm.c +++ b/test/test_setupterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2022,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_setupterm.c,v 1.17 2023/06/24 14:19:52 tom Exp $ + * $Id: test_setupterm.c,v 1.19 2025/07/05 15:21:56 tom Exp $ * * A simple demo of setupterm/restartterm. */ @@ -98,9 +98,9 @@ test_rc(NCURSES_CONST char *name, int actual_rc, int actual_err) int expect_rc = -1; int expect_err = -1; - if (name == 0) + if (name == NULL) name = getenv("TERM"); - if (name == 0) + if (name == NULL) name = "?"; switch (*name) { @@ -207,11 +207,8 @@ main(int argc, char *argv[]) r_opt = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -244,7 +241,7 @@ main(int argc, char *argv[]) } if (a_opt) { - static char predef[][9] = + static char predef[][12] = {"vt100", "dumb", "lpr", "unknown", "none-such"}; if (optind < argc) { usage(FALSE); diff --git a/test/test_sgr.c b/test/test_sgr.c index 8763dca3cd34..6120344eabb6 100644 --- a/test/test_sgr.c +++ b/test/test_sgr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2015-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_sgr.c,v 1.22 2023/05/27 20:13:10 tom Exp $ + * $Id: test_sgr.c,v 1.28 2025/07/05 15:11:35 tom Exp $ * * A simple demo of the sgr/sgr0 terminal capabilities. */ @@ -63,9 +63,12 @@ static long total_values; static char * make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -106,10 +109,10 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { @@ -129,7 +132,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif @@ -142,10 +145,10 @@ free_dblist(void) #define MASK_REV (1 << 2) static void -dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0) +dumpit(unsigned bits, unsigned ignore, NCURSES_CONST char *sgr, NCURSES_CONST char *sgr0) { - static const char sample[] = "abcdefghijklm"; - static char params[] = "SURBDBIPA"; + static NCURSES_CONST char sample[] = "abcdefghijklm"; + static NCURSES_CONST char params[] = "SURBDBIPA"; unsigned n; printf("%4u ", bits); @@ -177,12 +180,11 @@ one_bit(unsigned a, unsigned b) static void brute_force(const char *name) { - unsigned count; - char *my_sgr; - char *my_sgr0; - char *my_bold; - char *my_revs; - char *my_smso; + NCURSES_CONST char *my_sgr; + NCURSES_CONST char *my_sgr0; + NCURSES_CONST char *my_bold; + NCURSES_CONST char *my_revs; + NCURSES_CONST char *my_smso; char *my_name = strdup(name); if (db_list) { @@ -219,6 +221,7 @@ brute_force(const char *name) unsigned ignore = 0; unsigned reason = 0; unsigned repeat = 0; + unsigned count; for (count = 0; count < MAXSGR; ++count) { values[count] = tparm(my_sgr, BITS2P(1), @@ -230,20 +233,20 @@ brute_force(const char *name) BITS2P(7), BITS2P(8), BITS2P(9)); - if (values[count] != 0) { + if (values[count] != NULL) { values[count] = strdup(values[count]); } } for (count = 0; count < MAXSGR; ++count) { - if (values[count] != 0) { + if (values[count] != NULL) { for (j = count + 1; j < MAXSGR; ++j) { - if (values[j] == 0) + if (values[j] == NULL) continue; if (strcmp(values[count], values[j])) continue; if (one_bit(count, j)) { free(values[j]); - values[j] = 0; + values[j] = NULL; } } } @@ -253,7 +256,7 @@ brute_force(const char *name) for (count = 0; count < MAXSGR; ++count) { if ((count & mask) != 0) continue; - if (values[count] != 0 && values[count + mask] != 0) { + if (values[count] != NULL && values[count + mask] != NULL) { mask = 0; break; } @@ -272,14 +275,14 @@ brute_force(const char *name) } } for (count = 0; count < MAXSGR; ++count) { - if (values[count] != 0) { + if (values[count] != NULL) { bool found = FALSE; if ((repeat & MASK_SMSO) != 0 && (count & MASK_SMSO) != 0) { found = TRUE; } else { for (j = 0; j < count; ++j) { - if (values[j] != 0 && !strcmp(values[j], values[count])) { + if (values[j] != NULL && !strcmp(values[j], values[count])) { if ((repeat & MASK_SMSO) != 0 && (j & MASK_SMSO) != 0 && (count & reason) != 0) { @@ -334,7 +337,7 @@ int main(int argc, char *argv[]) { int ch; - char *name; + const char *name; while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) { switch (ch) { @@ -350,11 +353,8 @@ main(int argc, char *argv[]) case 'q': q_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -366,10 +366,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static const char dumb[] = "dumb"; brute_force(dumb); } diff --git a/test/test_termattrs.c b/test/test_termattrs.c index ec44cc227544..cae60f298062 100644 --- a/test/test_termattrs.c +++ b/test/test_termattrs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2025 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_termattrs.c,v 1.8 2022/12/10 23:23:27 tom Exp $ + * $Id: test_termattrs.c,v 1.9 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the termattrs and term_attrs functions. */ @@ -170,11 +170,8 @@ main(int argc, char *argv[]) w_opt = TRUE; break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_tparm.c b/test/test_tparm.c index 50289defdf60..d377b59d238d 100644 --- a/test/test_tparm.c +++ b/test/test_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2022,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_tparm.c,v 1.39 2023/11/11 01:00:03 tom Exp $ + * $Id: test_tparm.c,v 1.45 2025/07/05 15:11:35 tom Exp $ * * Exercise tparm/tiparm, either for all possible capabilities with fixed * parameters, or one capability with specific combinations of parameters. @@ -52,7 +52,7 @@ if (length + 2 >= limit) { \ limit *= 2; \ array = typeRealloc(char *, limit, array); \ - if (array == 0) { \ + if (array == NULL) { \ failed("no memory: " #array); \ } \ } @@ -107,11 +107,11 @@ output_func(int ch) } static int -isNumeric(char *source) +isNumeric(NCURSES_CONST char *source) { - char *next = 0; + char *next = NULL; long value = strtol(source, &next, 0); - int result = (next == 0 || next == source || *next != '\0') ? 0 : 1; + int result = (next == NULL || next == source || *next != '\0') ? 0 : 1; (void) value; return result; } @@ -121,10 +121,10 @@ relevant(const char *name, const char *value) { int code = 1; if (VALID_STRING(value)) { - if (strstr(value, "%p") == 0 - && strstr(value, "%d") == 0 - && strstr(value, "%s") == 0 - && (!p_opt || strstr(value, "$<") == 0)) { + if (strstr(value, "%p") == NULL + && strstr(value, "%d") == NULL + && strstr(value, "%s") == NULL + && (!p_opt || strstr(value, "$<") == NULL)) { if (v_opt > 2) printf("? %s noparams\n", name); code = 0; @@ -245,7 +245,7 @@ analyze_format(const char *format, int *mask, char **p_is_s) #define NS_9(fmt) NS_8(fmt), NumStr(8) static void -test_tparm(const char *name, const char *format, long *number, char **string) +test_tparm(const char *name, NCURSES_CONST char *format, long *number, char **string) { char *use_strings[MAX_PARM]; char *result = NULL; @@ -334,7 +334,7 @@ test_tparm(const char *name, const char *format, long *number, char **string) } if (v_opt > 1) { int n; - printf(".. %3d =", result != 0 ? (int) strlen(result) : -1); + printf(".. %3d =", result != NULL ? (int) strlen(result) : -1); for (n = 0; n < nparam; ++n) { if (use_strings[n]) { if (number[n]) { @@ -398,7 +398,7 @@ main(int argc, char *argv[]) int r_run, t_run, n_run; char *old_term = getenv("TERM"); int r_opt = 1; - char *t_opt = 0; + char *t_opt = NULL; int std_caps = 0; /* predefine items in all_caps[] */ int len_caps = 0; /* cur # of items in all_caps[] */ @@ -423,7 +423,10 @@ main(int argc, char *argv[]) char **str_parms = typeCalloc(char *, max_parms); long use_parms = 1; - if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0) + if (all_caps == NULL + || all_terms == NULL + || num_parms == NULL + || str_parms == NULL) failed("no memory"); while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) { @@ -453,11 +456,8 @@ main(int argc, char *argv[]) case 'v': ++v_opt; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -479,7 +479,7 @@ main(int argc, char *argv[]) */ while (optind < argc) { if (isNumeric(argv[optind])) { - char *dummy = 0; + char *dummy = NULL; long value = strtol(argv[optind], &dummy, 0); num_parms[len_parms] = (int) value; } @@ -504,11 +504,11 @@ main(int argc, char *argv[]) * Make a list of values for $TERM. Accept "-" for standard input to * simplify scripting a check of the whole database. */ - old_term = strdup((old_term == 0) ? "unknown" : old_term); - if (t_opt != 0) { + old_term = strdup((old_term == NULL) ? "unknown" : old_term); + if (t_opt != NULL) { if (!strcmp(t_opt, "-")) { char buffer[BUFSIZ]; - while (fgets(buffer, sizeof(buffer) - 1, stdin) != 0) { + while (fgets(buffer, sizeof(buffer) - 1, stdin) != NULL) { char *s = buffer; char *t; while (isspace(UChar(s[0]))) @@ -520,20 +520,20 @@ main(int argc, char *argv[]) if (len_terms + 2 >= max_terms) { max_terms *= 2; all_terms = typeRealloc(char *, max_terms, all_terms); - if (all_terms == 0) + if (all_terms == NULL) failed("no memory: all_terms"); } all_terms[len_terms++] = s; } } else { char *s = t_opt; - char *t; - while ((t = strtok(s, ",")) != 0) { - s = 0; + NCURSES_CONST char *t; + while ((t = strtok(s, ",")) != NULL) { + s = NULL; if (len_terms + 2 >= max_terms) { max_terms *= 2; all_terms = typeRealloc(char *, max_terms, all_terms); - if (all_terms == 0) + if (all_terms == NULL) failed("no memory: all_terms"); } all_terms[len_terms++] = strdup(t); @@ -542,7 +542,7 @@ main(int argc, char *argv[]) } else { all_terms[len_terms++] = strdup(old_term); } - all_terms[len_terms] = 0; + all_terms[len_terms] = NULL; if (v_opt) { printf("%d term%s:\n", PLURAL(len_terms)); if (v_opt > 3) { @@ -561,7 +561,7 @@ main(int argc, char *argv[]) */ if (len_caps == 0) { #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) - for (n = 0; strnames[n] != 0; ++n) { + for (n = 0; strnames[n] != NULL; ++n) { GrowArray(all_caps, max_caps, len_caps); all_caps[len_caps++] = strdup(strnames[n]); } @@ -571,7 +571,7 @@ main(int argc, char *argv[]) #endif } std_caps = len_caps; - all_caps[len_caps] = 0; + all_caps[len_caps] = NULL; if (v_opt) { printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps)); if (v_opt > 3) { @@ -603,7 +603,7 @@ main(int argc, char *argv[]) #if NCURSES_XNAMES len_caps = std_caps; if (cur_term) { - TERMTYPE *term = (TERMTYPE *) cur_term; + NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term; for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { GrowArray(all_caps, max_caps, len_caps); GrowArray(cap_name, max_name, len_caps); @@ -631,7 +631,7 @@ main(int argc, char *argv[]) } if (v_opt) { - printf("[%d:%d] %d paramerized cap%s * %ld test-case%s \"%s\"\n", + printf("[%d:%d] %d parameterized cap%s * %ld test-case%s \"%s\"\n", r_run + 1, r_opt, PLURAL(use_caps), PLURAL(use_parms), @@ -664,7 +664,7 @@ main(int argc, char *argv[]) free(all_caps[n]); } #endif - if (cur_term != 0) { + if (cur_term != NULL) { del_curterm(cur_term); } else { printf("? no cur_term\n"); diff --git a/test/test_unget_wch.c b/test/test_unget_wch.c index 58085304c90c..413d23b6ba9f 100644 --- a/test/test_unget_wch.c +++ b/test/test_unget_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2022 Thomas E. Dickey * + * Copyright 2022,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_unget_wch.c,v 1.4 2022/12/10 23:31:31 tom Exp $ + * $Id: test_unget_wch.c,v 1.5 2025/07/05 15:21:56 tom Exp $ * * Demonstrate the unget_wch and unget functions. */ @@ -62,11 +62,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_vid_puts.c b/test/test_vid_puts.c index 0d7d7abbe9f0..b6d8a87137b6 100644 --- a/test/test_vid_puts.c +++ b/test/test_vid_puts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $ + * $Id: test_vid_puts.c,v 1.19 2025/07/05 15:22:23 tom Exp $ * * Demonstrate the vid_puts and vid_attr functions. * Thomas Dickey - 2013/01/12 @@ -63,7 +63,7 @@ outs(const char *s) static void cleanup(void) { - if (cur_term != 0) { + if (cur_term != NULL) { outs(exit_attribute_mode); if (!outs(orig_colors)) outs(orig_pair); @@ -134,11 +134,8 @@ main(int argc, char *argv[]) case 'p': p_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/test_vidputs.c b/test/test_vidputs.c index 31dc9da4da0f..aba0e34476f7 100644 --- a/test/test_vidputs.c +++ b/test/test_vidputs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $ + * $Id: test_vidputs.c,v 1.18 2025/07/05 15:22:23 tom Exp $ * * Demonstrate the vidputs and vidattr functions. * Thomas Dickey - 2013/01/12 @@ -51,7 +51,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -63,7 +63,7 @@ outs(const char *s) static void cleanup(void) { - if (cur_term != 0) { + if (cur_term != NULL) { outs(exit_attribute_mode); if (!outs(orig_colors)) outs(orig_pair); @@ -134,11 +134,8 @@ main(int argc, char *argv[]) case 'p': p_opt = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/testaddch.c b/test/testaddch.c index e393c3cc5190..c7165aefbc9e 100644 --- a/test/testaddch.c +++ b/test/testaddch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2025 Thomas E. Dickey * * Copyright 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>, * to demonstrate an inconsistency between ncurses and SVr4 curses. * - * $Id: testaddch.c,v 1.15 2022/12/10 23:44:18 tom Exp $ + * $Id: testaddch.c,v 1.16 2025/07/05 15:22:23 tom Exp $ */ #include <test.priv.h> @@ -70,11 +70,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } diff --git a/test/testcurs.c b/test/testcurs.c index 750e5a450b1d..d113f1d157ce 100644 --- a/test/testcurs.c +++ b/test/testcurs.c @@ -6,7 +6,7 @@ * wrs(5/28/93) -- modified to be consistent (perform identically) with either * PDCurses or under Unix System V, R4 * - * $Id: testcurs.c,v 1.58 2023/05/28 14:23:34 tom Exp $ + * $Id: testcurs.c,v 1.61 2025/07/05 15:11:35 tom Exp $ */ #include <test.priv.h> @@ -245,7 +245,7 @@ inputTest(WINDOW *win) wclrtobot(win); if (c >= KEY_MIN) wprintw(win, "Key Pressed: %s", keyname(c)); - else if (isprint(c)) + else if (isprint(UChar(c))) wprintw(win, "Key Pressed: %c", c); else wprintw(win, "Key Pressed: %s", unctrl(UChar(c))); @@ -488,14 +488,14 @@ outputTest(WINDOW *win) *Buffer = 0; scanw("%s", Buffer); - if (TIGETSTR("cvvis", "vs") != 0) { + if (TIGETSTR("cvvis", "vs") != NULL) { wclear(win); curs_set(2); MvWAddStr(win, 1, 1, "The cursor should appear as a block (visible)"); Continue(win); } - if (TIGETSTR("civis", "vi") != 0) { + if (TIGETSTR("civis", "vi") != NULL) { wclear(win); curs_set(0); MvWAddStr(win, 1, 1, @@ -503,7 +503,7 @@ outputTest(WINDOW *win) Continue(win); } - if (TIGETSTR("cnorm", "ve") != 0) { + if (TIGETSTR("cnorm", "ve") != NULL) { wclear(win); curs_set(1); MvWAddStr(win, 1, 1, "The cursor should be an underline (normal)"); @@ -592,7 +592,7 @@ padTest(WINDOW *dummy GCC_UNUSED) { WINDOW *pad; - if ((pad = newpad(50, 100)) != 0) { + if ((pad = newpad(50, 100)) != NULL) { WINDOW *spad; wattron(pad, A_REVERSE); @@ -609,7 +609,7 @@ padTest(WINDOW *dummy GCC_UNUSED) raw(); wgetch(pad); - if ((spad = subpad(pad, 12, 25, 6, 52)) != 0) { + if ((spad = subpad(pad, 12, 25, 6, 52)) != NULL) { MvWAddStr(spad, 2, 2, "This is a new subpad"); box(spad, 0, 0); delwin(spad); @@ -708,11 +708,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -748,8 +745,8 @@ main(int argc, char *argv[]) keypad(stdscr, TRUE); raw(); key = getch(); - if (key < KEY_MIN && key > 0 && isalpha(key)) { - if (islower(key)) + if (key < KEY_MIN && key > 0 && isalpha(UChar(key))) { + if (islower(UChar(key))) key = toupper(key); for (n = 0; n < MAX_OPTIONS; ++n) { if (key == command[n].text[0]) { diff --git a/test/testscanw.c b/test/testscanw.c index 415250c6edb3..cfac4547f106 100644 --- a/test/testscanw.c +++ b/test/testscanw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2002,2006 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * Date: 1997/03/17 * From: bayern@morpheus.cis.yale.edu * - * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $ + * $Id: testscanw.c,v 1.17 2025/07/05 15:22:23 tom Exp $ */ #include <test.priv.h> @@ -65,11 +65,8 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { switch (ch) { - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -85,7 +82,7 @@ main(int argc, char *argv[]) curses_trace(TRACE_UPDATE | TRACE_CALLS); #endif while (optind < argc) { - char *token = argv[optind++]; + const char *token = argv[optind++]; if (isdigit(UChar(*token))) move(atoi(token), 0); else if (!strcmp(token, "k+")) diff --git a/test/tput-colorcube b/test/tput-colorcube index 67a4997a6392..493f3825f0b7 100755 --- a/test/tput-colorcube +++ b/test/tput-colorcube @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2025 Thomas E. Dickey # # Copyright 2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -27,12 +27,12 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: tput-colorcube,v 1.2 2020/02/02 23:34:34 tom Exp $ +# $Id: tput-colorcube,v 1.3 2025/06/14 14:45:23 tom Exp $ # Use this script to print an xterm-style color cube, e.g., as done in # the xterm 88colors2.pl and 256colors2.pl scripts. failed() { - printf "?? $*\n" >&2 + printf "?? %s\n" "$1" >&2 exit 1 } @@ -51,13 +51,13 @@ else failed "expected one parameter or none" fi -colors=$(tput -T $myterm colors 2>/dev/null) -if [ ${colors:-0} -le 0 ] +colors=$(tput -T "$myterm" colors 2>/dev/null) +if [ "${colors:-0}" -le 0 ] then myterm=${myterm%%-color} - colors=$(tput -T $myterm colors 2>/dev/null) + colors=$(tput -T "$myterm" colors 2>/dev/null) fi -if [ ${colors:-0} -le 0 ] +if [ "${colors:-0}" -le 0 ] then failed "terminal $myterm does not support color" fi @@ -67,25 +67,25 @@ printf "System colors:\n" color=0 inrow=$colors to_do=$colors -[ $colors -gt 256 ] && colors=256 -[ $inrow -gt 8 ] && inrow=8 -[ $to_do -gt 16 ] && to_do=16 -while [ $color -lt $to_do ] +[ "$colors" -gt 256 ] && colors=256 +[ "$inrow" -gt 8 ] && inrow=8 +[ "$to_do" -gt 16 ] && to_do=16 +while [ "$color" -lt "$to_do" ] do - [ $color = $inrow ] && newline - tput setab $color + [ "$color" = "$inrow" ] && newline + tput setab "$color" printf ' ' - color=$(expr $color + 1) + color=$(expr "$color" + 1) done newline -[ $colors -le 16 ] && exit +[ "$colors" -le 16 ] && exit -if [ $colors = 256 ] +if [ "$colors" = 256 ] then cube=6 ramp=232 -elif [ $colors -ge 88 ] +elif [ "$colors" -ge 88 ] then cube=4 ramp=80 @@ -94,38 +94,38 @@ else fi printf "\n" -printf "Color cube, ${cube}x${cube}x${cube}:\n" +printf "Color cube, %dx%dx%d:\n" $cube $cube $cube g=0 cube2=$(expr $cube \* $cube) -while [ $g -lt $cube ] +while [ "$g" -lt "$cube" ] do r=0 - while [ $r -lt $cube ] + while [ "$r" -lt "$cube" ] do b=0 - while [ $b -lt $cube ] + while [ "$b" -lt "$cube" ] do - color=$(expr 16 + \( $r \* $cube2 \) + \( $g \* $cube \) + $b) - tput setab $color + color=$(expr 16 + \( "$r" \* "$cube2" \) + \( "$g" \* "$cube" \) + "$b") + tput setab "$color" printf ' ' - b=$(expr $b + 1) + b=$(expr "$b" + 1) done tput op printf ' ' - r=$(expr $r + 1) + r=$(expr "$r" + 1) done newline - g=$(expr $g + 1) + g=$(expr "$g" + 1) done printf "\n" printf "Grayscale ramp:\n" color=$ramp -while [ $color -lt $colors ] +while [ "$color" -lt "$colors" ] do - tput setab $color + tput setab "$color" printf ' ' - color=$(expr $color + 1) + color=$(expr "$color" + 1) done newline # vi:ts=4 sw=4 diff --git a/test/tput-initc b/test/tput-initc index 9d71c4f61875..ff3b52acf05a 100755 --- a/test/tput-initc +++ b/test/tput-initc @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2025 Thomas E. Dickey # # Copyright 2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -27,14 +27,14 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: tput-initc,v 1.6 2020/02/02 23:34:34 tom Exp $ +# $Id: tput-initc,v 1.7 2025/06/14 14:06:55 tom Exp $ # Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for # default palettes of xterm and Linux console. This script reads the numbers # and (assuming the same or compatible terminal) uses tput to (re)initialize # the palette using those numbers. failed() { - printf "?? $*\n" >&2 + printf "?? %s\n" "$1" >&2 exit 1 } @@ -70,7 +70,7 @@ do ;; esac done -shift $(expr $OPTIND - 1) +shift "$(expr "$OPTIND" - 1)" if [ $# = 1 ] then @@ -93,22 +93,21 @@ then fi myterm=${file%%.dat} -colors=$(tput -T $myterm colors 2>/dev/null) -if [ ${colors:-0} -le 0 ] +colors=$(tput -T "$myterm" colors 2>/dev/null) +if [ "${colors:-0}" -le 0 ] then myterm=${myterm%%-color} - colors=$(tput -T $myterm colors 2>/dev/null) + colors=$(tput -T "$myterm" colors 2>/dev/null) fi -if [ ${colors:-0} -le 0 ] +if [ "${colors:-0}" -le 0 ] then failed "terminal $myterm does not support color" fi -cat $file |\ awk -v opt_r=$opt_r \ -v opt_s=$opt_s \ - -v colors=$colors \ - -v myterm=$myterm ' + -v colors="$colors" \ + -v myterm="$myterm" < "$file" ' BEGIN { limit = 1000; range = -1; diff --git a/test/view.c b/test/view.c index 72e0cfbb6b97..fc7cc1ed4e67 100644 --- a/test/view.c +++ b/test/view.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -52,7 +52,7 @@ * scroll operation worked, and the refresh() code only had to do a * partial repaint. * - * $Id: view.c,v 1.145 2022/12/04 00:40:11 tom Exp $ + * $Id: view.c,v 1.151 2025/07/05 15:22:23 tom Exp $ */ #include <test.priv.h> @@ -93,8 +93,7 @@ ch_len(NCURSES_CH_T *src) #if USE_WIDEC_SUPPORT for (;;) { - int count; - TEST_CCHAR(src, count, { + TEST_CCHAR(src, { int len = wcwidth(test_wch[0]); result += (len > 0) ? len : 1; ++src; @@ -115,7 +114,7 @@ finish(int sig) { endwin(); #if NO_LEAKS - if (vec_lines != 0) { + if (vec_lines != NULL) { int n; for (n = 0; n < num_lines; ++n) { free(vec_lines[n]); @@ -173,7 +172,7 @@ show_all(const char *tag) move(i, 0); printw("%*d:", digits, actual); clrtoeol(); - if ((s = lptr[i - 1]) == 0) { + if ((s = lptr[i - 1]) == NULL) { continue; } len = ch_len(s); @@ -186,12 +185,10 @@ show_all(const char *tag) */ { int j; - int width = 1; + int width; for (j = actual = 0; j < shift; ++j) { - int count; - - TEST_CCHAR(s + j, count, { + TEST_CCHAR(s + j, { width = wcwidth(test_wch[0]); } , { @@ -236,7 +233,7 @@ read_file(const char *filename) size_t len; struct stat sb; char *my_blob; - char **my_vec = 0; + char **my_vec = NULL; WINDOW *my_win; if (stat(filename, &sb) != 0 @@ -248,11 +245,11 @@ read_file(const char *filename) failed("input is empty"); } - if ((fp = fopen(filename, "r")) == 0) { + if ((fp = fopen(filename, "r")) == NULL) { failed("cannot open input-file"); } - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) { failed("cannot allocate memory for input-file"); } @@ -283,7 +280,7 @@ read_file(const char *filename) } num_lines = k; if (pass == 0) { - if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) { failed("cannot allocate line-vector #1"); } } else { @@ -294,7 +291,7 @@ read_file(const char *filename) #if USE_WIDEC_SUPPORT if (!memcmp("\357\273\277", my_blob, 3)) { - char *s = my_blob + 3; + const char *s = my_blob + 3; char *d = my_blob; Trace(("trim BOM")); do { @@ -310,11 +307,11 @@ read_file(const char *filename) } width = (width + 1) * 5; my_win = newwin(2, width, 0, 0); - if (my_win == 0) { + if (my_win == NULL) { failed("cannot allocate temporary window"); } - if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) { + if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == NULL) { failed("cannot allocate line-vector #2"); } @@ -329,7 +326,7 @@ read_file(const char *filename) char *s; int y, x; #if USE_WIDEC_SUPPORT - char *last = my_vec[k] + (int) strlen(my_vec[k]); + const char *last = my_vec[k] + (int) strlen(my_vec[k]); wchar_t wch[2]; size_t rc; #ifndef state_unused @@ -361,7 +358,7 @@ read_file(const char *filename) x = width - 1; wmove(my_win, 0, 0); /* "x + 1" works with standard curses; some implementations are buggy */ - if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) { + if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == NULL) { failed("cannot allocate line-vector #3"); } #if USE_WIDEC_SUPPORT @@ -385,15 +382,15 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" #if USE_WIDEC_SUPPORT ," -n use waddch (bytes) rather then wadd_wch (wide-chars)" #endif - ," -s start in single-step mode, waiting for input" + ," -s start in single-step mode" #ifdef TRACE ," -t trace screen updates" - ," -T NUM specify trace mask" + ," -D NUM specify trace mask" #endif }; size_t n; @@ -408,7 +405,7 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -430,7 +427,7 @@ main(int argc, char *argv[]) " s - use entered count for halfdelay() parameter", " - if no entered count, stop nodelay()", " <space> - begin nodelay()", - 0 + NULL }; int ch; @@ -446,9 +443,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; case 'i': @@ -463,11 +460,11 @@ main(int argc, char *argv[]) single_step = TRUE; break; #ifdef TRACE - case 'T': + case 'D': { - char *next = 0; + char *next = NULL; int tvalue = (int) strtol(optarg, &next, 0); - if (tvalue < 0 || (next != 0 && *next != 0)) + if (tvalue < 0 || (next != NULL && *next != 0)) usage(FALSE); curses_trace((unsigned) tvalue); } @@ -476,11 +473,8 @@ main(int argc, char *argv[]) curses_trace(TRACE_CALLS); break; #endif - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -659,7 +653,7 @@ main(int argc, char *argv[]) beep(); break; } - if (c >= KEY_MIN || (c > 0 && !isdigit(c))) { + if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) { got_number = FALSE; value = 0; } diff --git a/test/widechars.h b/test/widechars.h index 2578a9253992..fe38243b0539 100644 --- a/test/widechars.h +++ b/test/widechars.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #if USE_WIDEC_SUPPORT -#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER) +#if defined(_NC_MINGW) /* * MinGW has wide-character functions, but they do not work correctly. */ diff --git a/test/worm.c b/test/worm.c index 7c4842e4004f..5dc04ae037fa 100644 --- a/test/worm.c +++ b/test/worm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -53,7 +53,7 @@ traces will be dumped. The program stops and waits for one character of input at the beginning and end of the interval. - $Id: worm.c,v 1.89 2022/12/24 20:46:49 tom Exp $ + $Id: worm.c,v 1.95 2025/07/05 15:11:35 tom Exp $ */ #include <test.priv.h> @@ -97,7 +97,7 @@ typedef struct worm { static unsigned long sequence = 0; static bool quitting = FALSE; -static WORM worm[MAX_WORMS]; +static WORM *worm; static int max_refs; static int **refs; static int last_x, last_y; @@ -105,6 +105,8 @@ static int last_x, last_y; static const char *field; static int length = 16, number = 3; static chtype trail = ' '; +static bool from_center = FALSE; +static int max_iterations = -1; static unsigned pending; @@ -118,10 +120,6 @@ pthread_mutex_t pending_mutex; #else #define Locked(statement) statement #endif - -#ifdef TRACE -static int generation, trace_start, trace_end; -#endif /* TRACE */ /* *INDENT-OFF* */ static const struct options { int nopts; @@ -274,7 +272,9 @@ draw_worm(WINDOW *win, void *data) attrs = w->attrs | (is_pending ? A_REVERSE : 0); if ((x = w->xpos[h = w->head]) < 0) { - wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0); + y = w->ypos[h] = (from_center ? (LINES / 2) : last_y); + x = w->xpos[h] = (from_center ? (COLS / 2) : 0); + wmove(win, y, x); waddch(win, attrs); refs[y][x]++; } else { @@ -463,11 +463,12 @@ usage(int ok) ," -d invoke use_default_colors" #endif ," -f fill screen with copies of \"WORM\" at start" - ," -l <n> set length of worms" - ," -n <n> set number of worms" + ," -i NUM maximum iterations before exiting" + ," -M NUM set length of worms" + ," -m start worms from the middle of the screen" + ," -n NUM set number of worms" ," -t leave trail of \".\"" #ifdef TRACE - ," -T <start>,<end> set trace interval" ," -N suppress cursor-movement optimization" #endif }; @@ -491,13 +492,14 @@ main(int argc, char *argv[]) struct worm *w; int *ip; bool done = FALSE; + int iteration_count = 0; #if HAVE_USE_DEFAULT_COLORS bool opt_d = FALSE; #endif setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfi:mn:t")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -507,14 +509,24 @@ main(int argc, char *argv[]) case 'f': field = "WORM"; break; - case 'l': + case 'i': + if ((max_iterations = atoi(optarg)) < 1) { + fprintf(stderr, "%s: Invalid maximum iterations %d\n", *argv, + max_iterations); + usage(FALSE); + } + break; + case 'M': if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) { fprintf(stderr, "%s: Invalid length\n", *argv); usage(FALSE); } break; + case 'm': + from_center = !from_center; + break; case 'n': - if ((number = atoi(optarg)) < 1 || number > MAX_WORMS) { + if ((number = atoi(optarg)) < 1) { fprintf(stderr, "%s: Invalid number of worms\n", *argv); usage(FALSE); } @@ -523,19 +535,12 @@ main(int argc, char *argv[]) trail = '.'; break; #ifdef TRACE - case 'T': - if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2) - usage(FALSE); - break; case 'N': _nc_optimize_enable ^= OPTIMIZE_ALL; /* declared by ncurses */ break; #endif /* TRACE */ - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -553,6 +558,11 @@ main(int argc, char *argv[]) last_y = LINES - 1; last_x = COLS - 1; + worm = typeMalloc(WORM, (size_t) number); + if (worm == NULL) { + fprintf(stderr, "%s: not enough memory for %d worms\n", *argv, number); + ExitProgram(EXIT_FAILURE); + } #ifdef A_COLOR if (has_colors()) { int bg = COLOR_BLACK; @@ -631,19 +641,6 @@ main(int argc, char *argv[]) while (!done) { Locked(++sequence); if ((ch = get_input()) > 0) { -#ifdef TRACE - if (trace_start || trace_end) { - if (generation == trace_start) { - curses_trace(TRACE_CALLS); - get_input(); - } else if (generation == trace_end) { - curses_trace(0); - get_input(); - } - - generation++; - } -#endif #ifdef KEY_RESIZE if (ch == KEY_RESIZE) { @@ -668,7 +665,11 @@ main(int argc, char *argv[]) } done = draw_all_worms(); - napms(10); + if (max_iterations < 0) { + napms(10); + } else if (iteration_count++ > max_iterations) { + done = TRUE; + } USING_WINDOW1(stdscr, wrefresh, safe_wrefresh); } diff --git a/test/xmas.c b/test/xmas.c index 9ba3a26c02e0..a7a41597742e 100644 --- a/test/xmas.c +++ b/test/xmas.c @@ -92,7 +92,7 @@ /******************************************************************************/ /* - * $Id: xmas.c,v 1.39 2022/12/04 00:40:11 tom Exp $ + * $Id: xmas.c,v 1.41 2025/07/05 15:11:35 tom Exp $ */ #include <test.priv.h> @@ -140,7 +140,7 @@ set_color(WINDOW *win, chtype color) { if (has_colors()) { int n = (int) (color + 1); - if (my_pairs == 0) + if (my_pairs == NULL) my_pairs = typeCalloc(bool, (size_t) (COLORS + 1)); if (!my_pairs[n]) { init_pair((short) n, (short) color, (short) my_bg); @@ -638,7 +638,7 @@ done(int sig GCC_UNUSED) stop_curses(); #if NO_LEAKS - if (my_pairs != 0) + if (my_pairs != NULL) free(my_pairs); #endif @@ -690,11 +690,8 @@ main(int argc, char *argv[]) case 'q': opt_q = TRUE; break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); default: - usage(ch == OPTS_USAGE); + CASE_COMMON; /* NOTREACHED */ } } @@ -715,44 +712,44 @@ main(int argc, char *argv[]) } curs_set(0); - if ((treescrn = newwin(16, 27, 3, 53)) == 0 || - (treescrn2 = newwin(16, 27, 3, 53)) == 0 || - (treescrn3 = newwin(16, 27, 3, 53)) == 0 || - (treescrn4 = newwin(16, 27, 3, 53)) == 0 || - (treescrn5 = newwin(16, 27, 3, 53)) == 0 || - (treescrn6 = newwin(16, 27, 3, 53)) == 0 || - (treescrn7 = newwin(16, 27, 3, 53)) == 0 || - (treescrn8 = newwin(16, 27, 3, 53)) == 0 || + if ((treescrn = newwin(16, 27, 3, 53)) == NULL || + (treescrn2 = newwin(16, 27, 3, 53)) == NULL || + (treescrn3 = newwin(16, 27, 3, 53)) == NULL || + (treescrn4 = newwin(16, 27, 3, 53)) == NULL || + (treescrn5 = newwin(16, 27, 3, 53)) == NULL || + (treescrn6 = newwin(16, 27, 3, 53)) == NULL || + (treescrn7 = newwin(16, 27, 3, 53)) == NULL || + (treescrn8 = newwin(16, 27, 3, 53)) == NULL || - (dotdeer0 = newwin(3, 71, 0, 8)) == 0 || + (dotdeer0 = newwin(3, 71, 0, 8)) == NULL || - (stardeer0 = newwin(4, 56, 0, 8)) == 0 || + (stardeer0 = newwin(4, 56, 0, 8)) == NULL || - (lildeer0 = newwin(7, 53, 0, 8)) == 0 || - (lildeer1 = newwin(2, 4, 0, 0)) == 0 || - (lildeer2 = newwin(2, 4, 0, 0)) == 0 || - (lildeer3 = newwin(2, 4, 0, 0)) == 0 || + (lildeer0 = newwin(7, 53, 0, 8)) == NULL || + (lildeer1 = newwin(2, 4, 0, 0)) == NULL || + (lildeer2 = newwin(2, 4, 0, 0)) == NULL || + (lildeer3 = newwin(2, 4, 0, 0)) == NULL || - (middeer0 = newwin(15, 42, 0, 8)) == 0 || - (middeer1 = newwin(3, 7, 0, 0)) == 0 || - (middeer2 = newwin(3, 7, 0, 0)) == 0 || - (middeer3 = newwin(3, 7, 0, 0)) == 0 || + (middeer0 = newwin(15, 42, 0, 8)) == NULL || + (middeer1 = newwin(3, 7, 0, 0)) == NULL || + (middeer2 = newwin(3, 7, 0, 0)) == NULL || + (middeer3 = newwin(3, 7, 0, 0)) == NULL || - (bigdeer0 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer1 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer2 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer3 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer4 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer0 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer1 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer2 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer3 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer4 = newwin(10, 23, 0, 0)) == NULL || - (lookdeer0 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer1 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer2 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer3 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer4 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer0 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer1 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer2 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer3 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer4 = newwin(10, 25, 0, 0)) == NULL || - (w_holiday = newwin(1, 26, 3, 27)) == 0 || + (w_holiday = newwin(1, 26, 3, 27)) == NULL || - (w_del_msg = newwin(1, 19, 23, 60)) == 0) { + (w_del_msg = newwin(1, 19, 23, 60)) == NULL) { stop_curses(); fprintf(stderr, "Cannot create windows - screen too small\n"); ExitProgram(EXIT_FAILURE); |