diff --git a/Ada95/gen/adacurses-config.in b/Ada95/gen/adacurses-config.in index 7e33ec92..ec0b6b68 100644 --- a/Ada95/gen/adacurses-config.in +++ b/Ada95/gen/adacurses-config.in @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: adacurses-config.in,v 1.5 2009/01/11 00:08:19 tom Exp $ +# $Id: adacurses-config.in,v 1.6 2010/03/06 21:05:01 tom Exp $ ############################################################################## -# Copyright (c) 2007,2009 Free Software Foundation, Inc. # +# Copyright (c) 2007-2009,2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -43,22 +43,37 @@ VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@ CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS" LIBS="-L$ADA_OBJECTS -lAdaCurses" +THIS="adacurses" + case "x$1" in - x--version) - echo AdaCurses $VERSION - ;; - x--cflags) - echo $CFLAGS - ;; - x--libs) - echo $LIBS - ;; - x) - # if no parameter is given, give what gnatmake needs - echo "$CFLAGS -i -largs $LIBS" - ;; - *) - echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2 - exit 1 - ;; + x--version) + echo AdaCurses $VERSION + ;; + x--cflags) + echo $CFLAGS + ;; + x--libs) + echo $LIBS + ;; + x) + # if no parameter is given, give what gnatmake needs + echo "$CFLAGS -i -largs $LIBS" + ;; + x--help) + cat <&2 + exit 1 + ;; esac diff --git a/MANIFEST b/MANIFEST index 4f6df01c..a284b529 100644 --- a/MANIFEST +++ b/MANIFEST @@ -533,6 +533,8 @@ ./include/tic.h ./include/unctrl.h.in ./install-sh +./man/MKada_config.in +./man/MKncu_config.in ./man/MKterminfo.sh ./man/Makefile.in ./man/captoinfo.1m diff --git a/NEWS b/NEWS index 848b45f9..d240ab00 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1507 2010/02/27 21:51:12 tom Exp $ +-- $Id: NEWS,v 1.1509 2010/03/06 21:03:02 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20100306 + + generate manpages for the *-config scripts, adapted from help2man + (suggested by Sven Joachim). + + use va_copy() in _nc_printf_string() to avoid conflicting use of + va_list value in _nc_printf_length() (report by Wim Lewis). + 20100227 + add Ada95/configure script, to use in tar-file created by Ada95/make-tar.sh diff --git a/aclocal.m4 b/aclocal.m4 index c7523f98..9db0a644 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.491 2010/01/30 23:42:10 tom Exp $ +dnl $Id: aclocal.m4,v 1.492 2010/03/06 18:47:56 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -62,13 +62,13 @@ AC_DEFUN([AM_LANGINFO_CODESET], fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADA_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15 +dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07 dnl ------------------- dnl Construct the list of include-options for the C programs in the Ada95 dnl binding. AC_DEFUN([CF_ADA_INCLUDE_DIRS], [ -ACPPFLAGS="-I. -I../../include $ACPPFLAGS" +ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" if test "$srcdir" != "."; then ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" fi @@ -5259,6 +5259,36 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_VA_COPY version: 2 updated: 2010/03/04 05:37:29 +dnl ---------- +dnl check for va_copy, part of stdarg.h +dnl Also, workaround for glibc's __va_copy, by checking for both. +AC_DEFUN([CF_VA_COPY],[ +AC_CACHE_CHECK(for va_copy, cf_cv_have_va_copy,[ +AC_TRY_LINK([ +#include +],[ + static va_list dst; + static va_list src; + va_copy(dst, src)], + cf_cv_have_va_copy=yes, + cf_cv_have_va_copy=no)]) + +test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY) + +AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[ +AC_TRY_LINK([ +#include +],[ + static va_list dst; + static va_list src; + __va_copy(dst, src)], + cf_cv_have___va_copy=yes, + cf_cv_have___va_copy=no)]) + +test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY) +]) +dnl --------------------------------------------------------------------------- dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 dnl ---------- dnl Use AC_VERBOSE w/o the warnings diff --git a/configure b/configure index 05688b4e..fb2bc3f0 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.484 . +# From configure.in Revision: 1.487 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20081225. # @@ -14872,13 +14872,113 @@ test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:14875: checking for pid_t" >&5 +echo "$as_me:14875: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 14882 "configure" +#include "confdefs.h" + +#include + +int +main () +{ + + static va_list dst; + static va_list src; + va_copy(dst, src) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14899: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14902: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14908: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_va_copy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_va_copy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:14918: result: $cf_cv_have_va_copy" >&5 +echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + +test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF +#define HAVE_VA_COPY 1 +EOF + +echo "$as_me:14925: checking for __va_copy" >&5 +echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 +if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 14932 "configure" +#include "confdefs.h" + +#include + +int +main () +{ + + static va_list dst; + static va_list src; + __va_copy(dst, src) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14949: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14952: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14955: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14958: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have___va_copy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:14968: result: $cf_cv_have___va_copy" >&5 +echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + +test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF +#define HAVE___VA_COPY 1 +EOF + +echo "$as_me:14975: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14881 "configure" +#line 14981 "configure" #include "confdefs.h" $ac_includes_default int @@ -14893,16 +14993,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14896: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14996: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14899: \$? = $ac_status" >&5 + echo "$as_me:14999: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14902: \"$ac_try\"") >&5 + { (eval echo "$as_me:15002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14905: \$? = $ac_status" >&5 + echo "$as_me:15005: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -14912,7 +15012,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14915: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:15015: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -14927,23 +15027,23 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14930: checking for $ac_header" >&5 +echo "$as_me:15030: 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 14936 "configure" +#line 15036 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14940: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15040: \"$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:14946: \$? = $ac_status" >&5 + echo "$as_me:15046: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14962,7 +15062,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14965: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15065: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:15078: 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 14984 "configure" +#line 15084 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15012,16 +15112,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15015: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15115: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15018: \$? = $ac_status" >&5 + echo "$as_me:15118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15021: \"$ac_try\"") >&5 + { (eval echo "$as_me:15121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15024: \$? = $ac_status" >&5 + echo "$as_me:15124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15031,7 +15131,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15034: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15134: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:15146: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15066,15 +15166,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15069: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15072: \$? = $ac_status" >&5 + echo "$as_me:15172: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15074: \"$ac_try\"") >&5 + { (eval echo "$as_me:15174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15077: \$? = $ac_status" >&5 + echo "$as_me:15177: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -15086,7 +15186,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15089: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:15189: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -15100,12 +15200,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:15103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:15203: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:15108: checking for working vfork" >&5 + echo "$as_me:15208: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15114,7 +15214,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 15117 "configure" +#line 15217 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -15211,15 +15311,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15314: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15217: \$? = $ac_status" >&5 + echo "$as_me:15317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15219: \"$ac_try\"") >&5 + { (eval echo "$as_me:15319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15222: \$? = $ac_status" >&5 + echo "$as_me:15322: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -15231,13 +15331,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15234: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:15334: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:15240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:15340: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -15264,7 +15364,7 @@ fi # special check for test/ditto.c -echo "$as_me:15267: checking for openpty in -lutil" >&5 +echo "$as_me:15367: 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 @@ -15272,7 +15372,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15275 "configure" +#line 15375 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15291,16 +15391,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15294: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15297: \$? = $ac_status" >&5 + echo "$as_me:15397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15300: \"$ac_try\"") >&5 + { (eval echo "$as_me:15400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15303: \$? = $ac_status" >&5 + echo "$as_me:15403: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -15311,7 +15411,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15314: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:15414: 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 @@ -15319,7 +15419,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:15322: checking for openpty header" >&5 +echo "$as_me:15422: 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 @@ -15330,7 +15430,7 @@ else for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 15333 "configure" +#line 15433 "configure" #include "confdefs.h" #include <$cf_header> @@ -15347,16 +15447,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15353: \$? = $ac_status" >&5 + echo "$as_me:15453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15356: \"$ac_try\"") >&5 + { (eval echo "$as_me:15456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15359: \$? = $ac_status" >&5 + echo "$as_me:15459: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -15374,7 +15474,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:15377: result: $cf_cv_func_openpty" >&5 +echo "$as_me:15477: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -15426,7 +15526,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 15429 "configure" +#line 15529 "configure" #include "confdefs.h" #include int @@ -15438,16 +15538,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15541: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15444: \$? = $ac_status" >&5 + echo "$as_me:15544: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15447: \"$ac_try\"") >&5 + { (eval echo "$as_me:15547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15450: \$? = $ac_status" >&5 + echo "$as_me:15550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15464,7 +15564,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}:15467: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me-configure}:15567: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -15498,7 +15598,7 @@ if test -n "$with_hashed_db/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}:15501: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me-configure}:15601: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -15509,23 +15609,23 @@ fi fi esac -echo "$as_me:15512: checking for db.h" >&5 +echo "$as_me:15612: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15518 "configure" +#line 15618 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15522: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15622: \"$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:15528: \$? = $ac_status" >&5 + echo "$as_me:15628: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15544,11 +15644,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15547: result: $ac_cv_header_db_h" >&5 +echo "$as_me:15647: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test $ac_cv_header_db_h = yes; then -echo "$as_me:15551: checking for version of db" >&5 +echo "$as_me:15651: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15559,10 +15659,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 do -echo "${as_me-configure}:15562: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me-configure}:15662: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 15565 "configure" +#line 15665 "configure" #include "confdefs.h" $ac_includes_default @@ -15592,16 +15692,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15695: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15598: \$? = $ac_status" >&5 + echo "$as_me:15698: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15601: \"$ac_try\"") >&5 + { (eval echo "$as_me:15701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15604: \$? = $ac_status" >&5 + echo "$as_me:15704: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -15615,16 +15715,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:15618: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:15718: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:15622: error: Cannot determine version of db" >&5 + { { echo "$as_me:15722: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:15627: checking for db libraries" >&5 +echo "$as_me:15727: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15638,10 +15738,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "${as_me-configure}:15641: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me-configure}:15741: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 15644 "configure" +#line 15744 "configure" #include "confdefs.h" $ac_includes_default @@ -15696,16 +15796,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15699: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15799: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15702: \$? = $ac_status" >&5 + echo "$as_me:15802: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15705: \"$ac_try\"") >&5 + { (eval echo "$as_me:15805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15708: \$? = $ac_status" >&5 + echo "$as_me:15808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -15725,11 +15825,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:15728: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:15828: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:15732: error: Cannot determine library for db" >&5 + { { echo "$as_me:15832: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -15739,7 +15839,7 @@ fi else - { { echo "$as_me:15742: error: Cannot find db.h" >&5 + { { echo "$as_me:15842: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -15754,7 +15854,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:15757: checking if we should include stdbool.h" >&5 +echo "$as_me:15857: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -15762,7 +15862,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15765 "configure" +#line 15865 "configure" #include "confdefs.h" int @@ -15774,23 +15874,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15777: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15877: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15780: \$? = $ac_status" >&5 + echo "$as_me:15880: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15783: \"$ac_try\"") >&5 + { (eval echo "$as_me:15883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15786: \$? = $ac_status" >&5 + echo "$as_me:15886: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15793 "configure" +#line 15893 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -15806,16 +15906,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15809: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15812: \$? = $ac_status" >&5 + echo "$as_me:15912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15815: \"$ac_try\"") >&5 + { (eval echo "$as_me:15915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15818: \$? = $ac_status" >&5 + echo "$as_me:15918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -15829,13 +15929,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:15832: result: yes" >&5 +then echo "$as_me:15932: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15834: result: no" >&5 +else echo "$as_me:15934: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15838: checking for builtin bool type" >&5 +echo "$as_me:15938: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_cc_bool_type+set}" = set; then @@ -15843,7 +15943,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15846 "configure" +#line 15946 "configure" #include "confdefs.h" #include @@ -15858,16 +15958,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15861: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15961: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15864: \$? = $ac_status" >&5 + echo "$as_me:15964: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15867: \"$ac_try\"") >&5 + { (eval echo "$as_me:15967: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15870: \$? = $ac_status" >&5 + echo "$as_me:15970: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -15880,9 +15980,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:15883: result: yes" >&5 +then echo "$as_me:15983: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15885: result: no" >&5 +else echo "$as_me:15985: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15904,7 +16004,7 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:15907: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:16007: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15913,7 +16013,7 @@ else cf_save="$LIBS" LIBS="-l$cf_stdcpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15916 "configure" +#line 16016 "configure" #include "confdefs.h" #include @@ -15929,16 +16029,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16032: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15935: \$? = $ac_status" >&5 + echo "$as_me:16035: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15938: \"$ac_try\"") >&5 + { (eval echo "$as_me:16038: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15941: \$? = $ac_status" >&5 + echo "$as_me:16041: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -15950,12 +16050,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:15953: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:16053: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" fi - echo "$as_me:15958: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:16058: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15971,15 +16071,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:15974: \"$ac_try\"") >&5 +if { (eval echo "$as_me:16074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15977: \$? = $ac_status" >&5 + echo "$as_me:16077: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:15979: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:16079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15982: \$? = $ac_status" >&5 + echo "$as_me:16082: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -15990,10 +16090,10 @@ rm -f conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:15993: result: yes" >&5 + echo "$as_me:16093: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15996: result: no" >&5 + echo "$as_me:16096: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16013,12 +16113,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:16016: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:16116: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" LIBS="-l$cf_gpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16021 "configure" +#line 16121 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -16032,16 +16132,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16038: \$? = $ac_status" >&5 + echo "$as_me:16138: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16041: \"$ac_try\"") >&5 + { (eval echo "$as_me:16141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16044: \$? = $ac_status" >&5 + echo "$as_me:16144: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -16060,7 +16160,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16063 "configure" +#line 16163 "configure" #include "confdefs.h" #include @@ -16074,16 +16174,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16077: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16080: \$? = $ac_status" >&5 + echo "$as_me:16180: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16083: \"$ac_try\"") >&5 + { (eval echo "$as_me:16183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16086: \$? = $ac_status" >&5 + echo "$as_me:16186: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -16100,7 +16200,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" - echo "$as_me:16103: result: $cf_cxx_library" >&5 + echo "$as_me:16203: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -16116,7 +16216,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return -echo "$as_me:16119: checking how to run the C++ preprocessor" >&5 +echo "$as_me:16219: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -16133,18 +16233,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 16136 "configure" +#line 16236 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:16141: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16241: \"$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:16147: \$? = $ac_status" >&5 + echo "$as_me:16247: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -16167,17 +16267,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 16170 "configure" +#line 16270 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16174: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16274: \"$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:16180: \$? = $ac_status" >&5 + echo "$as_me:16280: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -16214,7 +16314,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:16217: result: $CXXCPP" >&5 +echo "$as_me:16317: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -16224,18 +16324,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 16227 "configure" +#line 16327 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:16232: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16332: \"$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:16238: \$? = $ac_status" >&5 + echo "$as_me:16338: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -16258,17 +16358,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 16261 "configure" +#line 16361 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16265: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16365: \"$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:16271: \$? = $ac_status" >&5 + echo "$as_me:16371: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -16296,7 +16396,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:16299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:16399: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -16311,23 +16411,23 @@ ac_main_return=return for ac_header in iostream typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16314: checking for $ac_header" >&5 +echo "$as_me:16414: 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 16320 "configure" +#line 16420 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16324: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16424: \"$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:16330: \$? = $ac_status" >&5 + echo "$as_me:16430: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -16346,7 +16446,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16349: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16449: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:16460: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 16363 "configure" +#line 16463 "configure" #include "confdefs.h" #include @@ -16377,16 +16477,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16383: \$? = $ac_status" >&5 + echo "$as_me:16483: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16386: \"$ac_try\"") >&5 + { (eval echo "$as_me:16486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16389: \$? = $ac_status" >&5 + echo "$as_me:16489: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -16395,7 +16495,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:16398: result: $cf_iostream_namespace" >&5 + echo "$as_me:16498: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then cat >>confdefs.h <<\EOF @@ -16405,7 +16505,7 @@ EOF fi fi -echo "$as_me:16408: checking if we should include stdbool.h" >&5 +echo "$as_me:16508: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -16413,7 +16513,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 16416 "configure" +#line 16516 "configure" #include "confdefs.h" int @@ -16425,23 +16525,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16428: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16528: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16431: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16434: \"$ac_try\"") >&5 + { (eval echo "$as_me:16534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16437: \$? = $ac_status" >&5 + echo "$as_me:16537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16444 "configure" +#line 16544 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -16457,16 +16557,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16460: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16560: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16463: \$? = $ac_status" >&5 + echo "$as_me:16563: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16466: \"$ac_try\"") >&5 + { (eval echo "$as_me:16566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16469: \$? = $ac_status" >&5 + echo "$as_me:16569: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -16480,13 +16580,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:16483: result: yes" >&5 +then echo "$as_me:16583: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:16485: result: no" >&5 +else echo "$as_me:16585: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:16489: checking for builtin bool type" >&5 +echo "$as_me:16589: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_builtin_bool+set}" = set; then @@ -16494,7 +16594,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 16497 "configure" +#line 16597 "configure" #include "confdefs.h" #include @@ -16509,16 +16609,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16512: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16612: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16515: \$? = $ac_status" >&5 + echo "$as_me:16615: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16518: \"$ac_try\"") >&5 + { (eval echo "$as_me:16618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16521: \$? = $ac_status" >&5 + echo "$as_me:16621: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -16531,13 +16631,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:16534: result: yes" >&5 +then echo "$as_me:16634: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:16536: result: no" >&5 +else echo "$as_me:16636: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:16540: checking for size of bool" >&5 +echo "$as_me:16640: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16548,7 +16648,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16551 "configure" +#line 16651 "configure" #include "confdefs.h" #include @@ -16590,15 +16690,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16593: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16693: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16596: \$? = $ac_status" >&5 + echo "$as_me:16696: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16598: \"$ac_try\"") >&5 + { (eval echo "$as_me:16698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16601: \$? = $ac_status" >&5 + echo "$as_me:16701: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -16616,18 +16716,18 @@ fi fi rm -f cf_test.out -echo "$as_me:16619: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:16719: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:16625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:16725: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi -echo "$as_me:16630: checking for special defines needed for etip.h" >&5 +echo "$as_me:16730: checking for special defines needed for etip.h" >&5 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 cf_save_CXXFLAGS="$CXXFLAGS" cf_result="none" @@ -16639,7 +16739,7 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >conftest.$ac_ext <<_ACEOF -#line 16642 "configure" +#line 16742 "configure" #include "confdefs.h" #include @@ -16653,16 +16753,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16659: \$? = $ac_status" >&5 + echo "$as_me:16759: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16662: \"$ac_try\"") >&5 + { (eval echo "$as_me:16762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16665: \$? = $ac_status" >&5 + echo "$as_me:16765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:16786: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:16691: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:16791: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16705,7 +16805,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16708 "configure" +#line 16808 "configure" #include "confdefs.h" class TEST { @@ -16724,15 +16824,15 @@ void main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16727: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16730: \$? = $ac_status" >&5 + echo "$as_me:16830: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16732: \"$ac_try\"") >&5 + { (eval echo "$as_me:16832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16735: \$? = $ac_status" >&5 + echo "$as_me:16835: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -16751,7 +16851,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:16754: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:16854: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF @@ -16760,7 +16860,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:16763: checking if $CXX accepts static_cast" >&5 +echo "$as_me:16863: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16774,7 +16874,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 16777 "configure" +#line 16877 "configure" #include "confdefs.h" class NCursesPanel @@ -16818,16 +16918,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16821: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16824: \$? = $ac_status" >&5 + echo "$as_me:16924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16827: \"$ac_try\"") >&5 + { (eval echo "$as_me:16927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16830: \$? = $ac_status" >&5 + echo "$as_me:16930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -16845,7 +16945,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:16848: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:16948: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -16893,7 +16993,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:16896: checking for size of bool" >&5 +echo "$as_me:16996: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16904,7 +17004,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16907 "configure" +#line 17007 "configure" #include "confdefs.h" #include @@ -16946,15 +17046,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16949: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16952: \$? = $ac_status" >&5 + echo "$as_me:17052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16954: \"$ac_try\"") >&5 + { (eval echo "$as_me:17054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16957: \$? = $ac_status" >&5 + echo "$as_me:17057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -16972,25 +17072,25 @@ fi fi rm -f cf_test.out -echo "$as_me:16975: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:17075: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:16981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:17081: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:16987: checking for fallback type of bool" >&5 + echo "$as_me:17087: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in #(vi i?86) cf_cv_type_of_bool=char ;; #(vi *) cf_cv_type_of_bool=int ;; esac - echo "$as_me:16993: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:17093: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -17019,7 +17119,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:17022: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:17122: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -17029,7 +17129,7 @@ if test "$cf_with_ada" != "no" ; then cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:17032: checking for $ac_word" >&5 +echo "$as_me:17132: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17044,7 +17144,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_gnat_exists="yes" -echo "$as_me:17047: found $ac_dir/$ac_word" >&5 +echo "$as_me:17147: found $ac_dir/$ac_word" >&5 break done @@ -17053,10 +17153,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:17056: result: $gnat_exists" >&5 + echo "$as_me:17156: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:17059: result: no" >&5 + echo "$as_me:17159: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17064,11 +17164,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_ada_make= else -echo "$as_me:17067: checking for gnat version" >&5 +echo "$as_me:17167: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:17071: result: $cf_gnat_version" >&5 +echo "$as_me:17171: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -17091,7 +17191,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:17094: checking for $ac_word" >&5 +echo "$as_me:17194: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17106,7 +17206,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:17109: found $ac_dir/$ac_word" >&5 +echo "$as_me:17209: found $ac_dir/$ac_word" >&5 break done @@ -17115,10 +17215,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:17118: result: $M4_exists" >&5 + echo "$as_me:17218: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:17121: result: no" >&5 + echo "$as_me:17221: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17127,7 +17227,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17130: checking if GNAT works" >&5 + echo "$as_me:17230: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -f conftest* @@ -17155,14 +17255,14 @@ else fi rm -f conftest* - echo "$as_me:17158: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:17258: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi if test "$cf_cv_prog_gnat_correct" = yes; then ADAFLAGS="-O3 -gnatpn $ADAFLAGS" - echo "$as_me:17165: checking if GNAT pragma Unreferenced works" >&5 + echo "$as_me:17265: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 rm -f conftest* @@ -17189,7 +17289,7 @@ else fi rm -f conftest* - echo "$as_me:17192: result: $cf_cv_pragma_unreferenced" >&5 + echo "$as_me:17292: result: $cf_cv_pragma_unreferenced" >&5 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 # if the pragma is supported, use it (needed in the Trace code). @@ -17242,7 +17342,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:17245: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:17345: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17284,7 +17384,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:17287: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:17387: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17309,7 +17409,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:17312: checking for library subsets" >&5 +echo "$as_me:17412: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -17350,7 +17450,7 @@ fi test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:17353: result: $LIB_SUBSETS" >&5 +echo "$as_me:17453: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -17371,7 +17471,7 @@ elif test "$includedir" != "/usr/include"; then fi fi -ACPPFLAGS="-I. -I../../include $ACPPFLAGS" +ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" if test "$srcdir" != "."; then ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" fi @@ -17388,7 +17488,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:17391: checking default library suffix" >&5 +echo "$as_me:17491: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17399,10 +17499,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:17402: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:17502: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:17405: checking default library-dependency suffix" >&5 +echo "$as_me:17505: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -17455,10 +17555,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:17458: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:17558: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:17461: checking default object directory" >&5 +echo "$as_me:17561: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17474,12 +17574,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:17477: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:17577: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 # libtool thinks it can make c++ shared libraries (perhaps only g++) if test "$cf_with_cxx" = yes ; then -echo "$as_me:17482: checking c++ library-dependency suffix" >&5 +echo "$as_me:17582: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX @@ -17536,7 +17636,7 @@ else test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" fi -echo "$as_me:17539: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:17639: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -17691,12 +17791,12 @@ fi ;; esac -echo "$as_me:17694: checking where we will install curses.h" >&5 +echo "$as_me:17794: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 test "$with_overwrite" = no && \ test "x$includedir" = 'x${prefix}/include' && \ includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:17699: result: $includedir" >&5 +echo "$as_me:17799: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -17704,7 +17804,7 @@ echo "${ECHO_T}$includedir" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:17707: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:17807: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -17721,7 +17821,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:17724: checking for src modules" >&5 +echo "$as_me:17824: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -17784,7 +17884,7 @@ EOF fi fi done -echo "$as_me:17787: result: $cf_cv_src_modules" >&5 +echo "$as_me:17887: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -17825,6 +17925,7 @@ fi if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in" fi DIRS_TO_MAKE="lib" @@ -17953,18 +18054,18 @@ fi ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared"; then -echo "$as_me:17956: checking for updated LDFLAGS" >&5 +echo "$as_me:18057: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LDFLAGS" ; then -echo "$as_me:17959: result: maybe" >&5 +echo "$as_me:18060: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me-configure}:17963: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me-configure}:18064: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me-configure}:17967: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me-configure}:18068: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 case "$EXTRA_LDFLAGS" in #(vi -Wl,-rpath,*) #(vi @@ -17986,7 +18087,7 @@ if test -n "$cf_rpath_hack" ; then do test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 -echo "${as_me-configure}:17989: testing Filtering $cf_rpath_src ..." 1>&5 +echo "${as_me-configure}:18090: testing Filtering $cf_rpath_src ..." 1>&5 case $cf_rpath_src in #(vi -L*) #(vi @@ -17997,7 +18098,7 @@ echo "${as_me-configure}:17989: testing Filtering $cf_rpath_src ..." 1>&5 fi test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 -echo "${as_me-configure}:18000: testing ...Filter $cf_rpath_tmp ..." 1>&5 +echo "${as_me-configure}:18101: testing ...Filter $cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" ;; @@ -18007,15 +18108,15 @@ echo "${as_me-configure}:18000: testing ...Filter $cf_rpath_tmp ..." 1>&5 LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me-configure}:18010: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me-configure}:18111: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me-configure}:18014: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me-configure}:18115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 fi else -echo "$as_me:18018: result: no" >&5 +echo "$as_me:18119: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18046,6 +18147,7 @@ test "$use_database" = yes && \ SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in" SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in" +SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${DFT_ARG_SUFFIX}${cf_cv_abi_version}-config.1:man/MKncu_config.in" if test x"$enable_pc_files" = xyes ; then \ SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in" @@ -18135,7 +18237,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:18138: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18240: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -18311,7 +18413,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18314: error: ambiguous option: $1 + { { echo "$as_me:18416: 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;} @@ -18330,7 +18432,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18333: error: unrecognized option: $1 + -*) { { echo "$as_me:18435: 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;} @@ -18429,7 +18531,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:18432: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18534: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18825,7 +18927,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:18828: creating $ac_file" >&5 + { echo "$as_me:18930: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18843,7 +18945,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:18846: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:18948: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18856,7 +18958,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18859: error: cannot find input file: $f" >&5 + { { echo "$as_me:18961: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18922,7 +19024,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:18925: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19027: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18933,7 +19035,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:18936: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19038: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18946,7 +19048,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18949: error: cannot find input file: $f" >&5 + { { echo "$as_me:19051: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19004,7 +19106,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:19007: $ac_file is unchanged" >&5 + { echo "$as_me:19109: $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/configure.in b/configure.in index aed0dbde..5e3a8243 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.484 2010/02/27 21:34:00 tom Exp $ +dnl $Id: configure.in,v 1.487 2010/03/06 21:29:37 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.13.20020210) -AC_REVISION($Revision: 1.484 $) +AC_REVISION($Revision: 1.487 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1394,6 +1394,7 @@ CF_TYPE_SIGACTION CF_SIZECHANGE CF_FUNC_MEMMOVE CF_FUNC_POLL +CF_VA_COPY AC_FUNC_VFORK # special check for test/ditto.c @@ -1870,6 +1871,7 @@ CF_SRC_MODULES($modules_to_build) if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in" fi CF_DIRS_TO_MAKE @@ -1904,6 +1906,7 @@ test "$use_database" = yes && \ SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in" SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in" +SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${DFT_ARG_SUFFIX}${cf_cv_abi_version}-config.1:man/MKncu_config.in" if test x"$enable_pc_files" = xyes ; then \ SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in" diff --git a/dist.mk b/dist.mk index a3151d6f..258faf03 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.748 2010/02/26 21:31:09 tom Exp $ +# $Id: dist.mk,v 1.749 2010/03/06 17:59:20 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 7 -NCURSES_PATCH = 20100227 +NCURSES_PATCH = 20100306 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/ncurses_defs b/include/ncurses_defs index b07f5f1f..9879cdfe 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.41 2008/11/16 00:19:59 juergen Exp $ +# $Id: ncurses_defs,v 1.42 2010/03/06 18:08:33 tom Exp $ ############################################################################## -# Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. # +# Copyright (c) 2000-2008,2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -115,6 +115,7 @@ HAVE_SETBUF HAVE_SETBUFFER HAVE_SETUPTERM 1 HAVE_SETVBUF +HAVE_SGTTY_H HAVE_SIGACTION HAVE_SIGVEC HAVE_SIZECHANGE diff --git a/man/MKada_config.in b/man/MKada_config.in new file mode 100644 index 00000000..487a9a82 --- /dev/null +++ b/man/MKada_config.in @@ -0,0 +1,56 @@ +.\"*************************************************************************** +.\" Copyright (c) 2010 Free Software Foundation, Inc. * +.\" * +.\" Permission is hereby granted, free of charge, to any person obtaining a * +.\" copy of this software and associated documentation files (the * +.\" "Software"), 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. * +.\"*************************************************************************** +.\" +.\" $Id: MKada_config.in,v 1.3 2010/03/06 22:29:06 tom Exp $ +.TH ADACURSES "1" "" "" "User Commands" +.SH NAME +adacurses-config \- helper script for AdaCurses libraries +.SH SYNOPSIS +.B adacurses-config +[\fIoptions\fR] +.SH DESCRIPTION +This is a shell script which simplifies configuring an application to use +the AdaCurses library binding to ncurses. +.SH OPTIONS +.TP +\fB\-\-cflags\fR +echos the gnat (Ada compiler) flags needed to compile with adacurses +.TP +\fB\-\-libs\fR +echos the gnat libraries needed to link with adacurses +.TP +\fB\-\-version\fR +echos the release+patchdate version of adacurses +.TP +\fB\-\-help\fR +prints this message +.SH "SEE ALSO" +\fBcurses\fR(3X) +.PP +This describes \fBncurses\fR +version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). diff --git a/man/MKncu_config.in b/man/MKncu_config.in new file mode 100644 index 00000000..3de772c9 --- /dev/null +++ b/man/MKncu_config.in @@ -0,0 +1,98 @@ +.\"*************************************************************************** +.\" Copyright (c) 2010 Free Software Foundation, Inc. * +.\" * +.\" Permission is hereby granted, free of charge, to any person obtaining a * +.\" copy of this software and associated documentation files (the * +.\" "Software"), 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. * +.\"*************************************************************************** +.\" +.\" $Id: MKncu_config.in,v 1.3 2010/03/06 22:29:17 tom Exp $ +.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 "" +.SH NAME +@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \- helper script for ncurses libraries +.SH SYNOPSIS +.B @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config +[\fIoptions\fR] +.SH DESCRIPTION +This is a shell script which simplifies configuring applications against +a particular set of ncurses libraries. +.SH OPTIONS +.TP +\fB\-\-prefix\fR +echos the package\-prefix of ncurses +.TP +\fB\-\-exec\-prefix\fR +echos the executable\-prefix of ncurses +.TP +\fB\-\-cflags\fR +echos the C compiler flags needed to compile with ncurses +.TP +\fB\-\-libs\fR +echos the libraries needed to link with ncurses +.TP +\fB\-\-version\fR +echos the release+patchdate version of ncurses +.TP +\fB\-\-abi\-version\fR +echos the ABI version of ncurses +.TP +\fB\-\-mouse\-version\fR +echos the mouse\-interface version of ncurses +.TP +\fB\-\-bindir\fR +echos the directory containing ncurses programs +.TP +\fB\-\-datadir\fR +echos the directory containing ncurses data +.TP +\fB\-\-includedir\fR +echos the directory containing ncurses header files +.TP +\fB\-\-libdir\fR +echos the directory containing ncurses libraries +.TP +\fB\-\-mandir\fR +echos the directory containing ncurses manpages +.TP +\fB\-\-terminfo\fR +echos the $TERMINFO terminfo database path, e.g., +.RS +@TERMINFO@ +.RE +.TP +\fB\-\-terminfo\-dirs\fR +echos the $TERMINFO_DIRS directory list, e.g., +.RS +@TERMINFO_DIRS@ +.RE +.TP +\fB\-\-termpath\fR +echos the $TERMPATH termcap list, if support for termcap is configured. +.TP +\fB\-\-help\fR +prints this message +.SH "SEE ALSO" +\fBcurses\fR(3X) +.PP +This describes \fBncurses\fR +version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). diff --git a/man/Makefile.in b/man/Makefile.in index c04f7c9e..bd998f37 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.41 2007/03/31 15:54:06 tom Exp $ +# $Id: Makefile.in,v 1.42 2010/03/06 20:59:25 tom Exp $ ############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # +# Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -77,4 +77,4 @@ clean: mostlyclean sh $(srcdir)/make_sed.sh @MANPAGE_RENAMES@ >../edit_man.sed distclean realclean: clean - rm -f Makefile ../edit_man.* ../man_alias.* + rm -f Makefile *-config.1 ../edit_man.* ../man_alias.* diff --git a/man/man_db.renames b/man/man_db.renames index e2388009..1ce816e0 100644 --- a/man/man_db.renames +++ b/man/man_db.renames @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # +# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: man_db.renames,v 0.43 2009/08/04 00:30:32 tom Exp $ +# $Id: man_db.renames,v 1.45 2010/03/06 22:21:42 tom Exp $ # Manual-page renamings for the man_db program # # Files: @@ -175,4 +175,15 @@ system.3 system.3 regcomp.3x regcomp.3 regexec.3x regexec.3 # +# Generated: +adacurses-config.1 adacurses-config.1 +# +ncurses5-config.1 ncurses5-config.1 +ncursesw5-config.1 ncursesw5-config.1 +# +ncurses6-config.1 ncurses6-config.1 +ncursesw6-config.1 ncursesw6-config.1 +ncursest6-config.1 ncursest6-config.1 +ncurseswt6-config.1 ncurseswt6-config.1 +# # vile:cfgmode diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c index 283b3291..2c82be9e 100644 --- a/ncurses/base/safe_sprintf.c +++ b/ncurses/base/safe_sprintf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -33,7 +33,7 @@ #include #include -MODULE_ID("$Id: safe_sprintf.c,v 1.22 2009/04/18 18:46:46 tom Exp $") +MODULE_ID("$Id: safe_sprintf.c,v 1.23 2010/03/06 20:26:10 tom Exp $") #if USE_SAFE_SPRINTF @@ -222,7 +222,12 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx if (fmt != 0) { #if USE_SAFE_SPRINTF - int len = _nc_printf_length(fmt, ap); + va_list ap2; + int len; + + begin_va_copy(ap2, ap); + len = _nc_printf_length(fmt, ap2); + end_va_copy(ap2); if ((int) my_length < len + 1) { my_length = 2 * (len + 1); diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 7d75ebae..0018291d 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -35,7 +35,7 @@ /* - * $Id: curses.priv.h,v 1.451 2010/02/06 19:15:52 tom Exp $ + * $Id: curses.priv.h,v 1.452 2010/03/06 19:15:50 tom Exp $ * * curses.priv.h * @@ -177,6 +177,20 @@ extern NCURSES_EXPORT(int) _nc_env_access (void); extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t); #endif +/* + * If we have va_copy(), use it for assigning va_list's. + */ +#if defined(HAVE___VA_COPY) +#define begin_va_copy(dst,src) __va_copy(dst, src) +#define end_va_copy(dst) va_end(dst) +#elif defined(va_copy) || defined(HAVE_VA_COPY) +#define begin_va_copy(dst,src) va_copy(dst, src) +#define end_va_copy(dst) va_end(dst) +#else +#define begin_va_copy(dst,src) (dst) = (src) +#define end_va_copy(dst) /* nothing */ +#endif + /* * Scroll hints are useless when hashmap is used */ diff --git a/test/demo_panels.c b/test/demo_panels.c index 55593c03..f9af6cc7 100644 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 2007-2008,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_panels.c,v 1.33 2008/08/04 13:33:48 tom Exp $ + * $Id: demo_panels.c,v 1.34 2010/03/06 18:14:04 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -494,6 +494,7 @@ show_panels(PANEL * px[MAX_PANELS + 1]) PANEL *pan; int j; + memset(table, 0, sizeof(table)); for (j = 1; j <= MAX_PANELS; ++j) { table[j].valid = (px[j] != 0); if (table[j].valid) { diff --git a/test/ncurses.c b/test/ncurses.c index eff12d4b..47125f7a 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -40,7 +40,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.355 2010/01/09 16:52:17 tom Exp $ +$Id: ncurses.c,v 1.356 2010/03/06 18:45:14 tom Exp $ ***************************************************************************/ @@ -4761,12 +4761,13 @@ panner_legend(int line) "Number repeats. Toggle legend:? filler:a timer:t scrollmark:s." }; int n = ((int) SIZEOF(legend) - (LINES - line)); - if (line < LINES && (n >= 0)) { - move(line, 0); - if (show_panner_legend) - printw("%s", legend[n]); - clrtoeol(); - return show_panner_legend; + if (n >= 0) { + if (move(line, 0) != ERR) { + if (show_panner_legend) + printw("%s", legend[n]); + clrtoeol(); + return show_panner_legend; + } } return FALSE; }