From 2b7c2fd2f9d58719770902ce4d0d0aeb87b284f7 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Sep 2020 23:50:45 +0000 Subject: [PATCH] ncurses 6.2 - patch 20200906 + merge/adapt in-progress work by Juergen Pfeifer for new version of win32-driver. + correct description of vt330/vt340 (Ross Combs). --- INSTALL | 5 +- NEWS | 7 +- README.MinGW | 137 ++- VERSION | 2 +- c++/Makefile.in | 6 +- configure | 1946 +++++++++++++++--------------- configure.in | 22 +- dist.mk | 4 +- include/MKterm.h.awk.in | 16 +- include/nc_win32.h | 20 +- include/ncurses_dll.h.in | 4 +- misc/terminfo.src | 15 +- ncurses/Makefile.in | 5 +- ncurses/base/lib_getch.c | 73 +- ncurses/base/lib_initscr.c | 9 +- ncurses/base/lib_newterm.c | 13 +- ncurses/curses.priv.h | 13 +- ncurses/tinfo/lib_baudrate.c | 20 +- ncurses/tinfo/lib_kernel.c | 10 +- ncurses/tinfo/lib_raw.c | 11 +- ncurses/tinfo/lib_setup.c | 20 +- ncurses/tinfo/lib_tputs.c | 3 +- ncurses/tinfo/lib_ttyflags.c | 6 +- ncurses/trace/lib_tracebits.c | 40 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- progs/progs.priv.h | 7 +- progs/reset_cmd.c | 21 +- progs/tset.c | 11 +- test/dots_termcap.c | 4 +- test/railroad.c | 6 +- 36 files changed, 1345 insertions(+), 1133 deletions(-) diff --git a/INSTALL b/INSTALL index a373d67d..95f5a393 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.225 2020/08/08 23:38:33 tom Exp $ +-- $Id: INSTALL,v 1.226 2020/09/06 23:41:16 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -582,6 +582,9 @@ CONFIGURE OPTIONS: For testing, generate functions for certain macros to make them visible as such to the debugger. See also the --disable-macros option. + --enable-exp-win32 + When configuring for MinGW, use the experimental Windows 10 driver. + --enable-ext-colors Extend the cchar_t structure to allow more than 16 colors to be encoded. This applies only to the wide-character (--enable-widec) diff --git a/NEWS b/NEWS index 18dec72b..b81abe73 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3552 2020/09/01 00:21:01 tom Exp $ +-- $Id: NEWS,v 1.3556 2020/09/06 20:05:44 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,11 @@ 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. +20200906 + + merge/adapt in-progress work by Juergen Pfeifer for new version of + win32-driver. + + correct description of vt330/vt340 (Ross Combs). + 20200831 + build-fix for awk-scripts modified for win32-driver (report by Werner Fink). diff --git a/README.MinGW b/README.MinGW index f23ef126..3add2e7d 100644 --- a/README.MinGW +++ b/README.MinGW @@ -26,112 +26,123 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README.MinGW,v 1.11 2020/07/11 13:31:30 juergen Exp $ +-- $Id: README.MinGW,v 1.14 2020/09/06 22:22:44 tom Exp $ -- Author: Juergen Pfeifer ------------------------------------------------------------------------------- -This is work in progress, but it's in an state where one can see it +This is work in progress, but it is in an state where one can see it works at least on the Windows Console. -You should install the MSYS package, so that you've a shell environment that -allows you to run the scripts, especially configure etc. You can get that -from http://www.mingw.org +You should install the MSYS2 package, so that you have a shell environment that +allows you to run scripts, especially configure, etc. You can get that +from + https://www.msys2.org/ -To build ncurses for native Windows, you need the MinGW toolchain. The -original MinGW toolchain from the above site is only for 32-Bit Windows. As -Windows Server - and also regular workstations - are moving to 64-Bit, it -seems to be reasonable to have a toolchain that supports both architectures. -I recommend to use the TDM gcc toolchain which you can find at -http://tdm-gcc.tdragon.net/download. Go to the download section and select -the bundle installer for tdm64 (MinGW-w64). This installs a multilib version -of the gcc toolchain that can compile for native 32- and 64-Bit Windows -versions. It also comes with a working pthread implementation. +or the individual packages from -The latest config and build scripts we use for MinGW have only been tested -for the gcc-4.6.1 compiler toolchain (or better). + https://sourceforge.net/projects/msys2/files/ -Using MinGW is a pragmatic decision, it's the easiest way to port this +You may also use a hosted MinGW cross-compile toolchain, e.g., on Ubuntu or +ArchLinux to build the libraries and tools. + +To build ncurses for native Windows with support for the new Windows 10 Virtual +Terminal and PseudoConsole support, you should install at least version 8.0 of +the mingw-w64-x86_64-headers package as it appears to have support for the +required Windows SDK level. Please note that some of the Linux distributions +are a bit behind with respect to the required MinGW header versions and you may +not be able to properly build the libraries for current Windows 10 using these +toolchains. Although it is a bit slow, MSYS2 on Windows 10 64-Bit is the +authoritative build environment for the MinGW version of ncurses. + +Using MinGW is a pragmatic decision, it is the easiest way to port this heavily UNIX based sourcebase to native Windows. The goal is of course to provide the includes, libraries and DLLs to be used with the more common traditional development environments on Windows, mainly with Microsoft Visual Studio. -The TERM environment variable must be set specially to active the Windows +The TERM environment variable must be set especially to activate the Windows console-driver. The driver checks if TERM is set to "#win32con" (explicit use) or if TERM is unset or empty (implicit). -Please also make sure that MSYS links to the correct directory containing -your MinGW toolchain. For TDM this is usually C:\MinGW64. In your Windows -CMD.EXE command shell go to the MSYS root directory (most probably -C:\MSYS or C:\MSYS\1.0) and verify, that there is a junction point mingw -that points to the MinGW toolchain directory. If not, delete the mingw -directory and use the mklink command (or the linkd.exe utility on older -Windows) to create the junction point. +Beginning with build 17763 (Fall 2018 update), Windows 10 supports ANSI escape +sequences (Virtual Terminal support). If ncurses detects this or a later +Windows 10 version, the interpretation of the implicit TERM setting (which +means: TERM is not set or empty) changes. In this case, TERM is to be assumed +to be "ms-terminal" and ncurses acts using the regular terminfo based driver, +thus acting like a regular Terminal we all know from UNIX like environments. + +This code requires WindowsNT 6.0 or better, which means on the client +Windows Vista or better, on the server Windows Server 2008 or better. -This code requires WindowsNT 5.1 or better, which means on the client -Windows XP or better, on the server Windows Server 2003 or better. +If running on Windows 10 Build 17763 or later is detected, any program +spawning a subprocess running a ncurses program should use the new +PseudoConsole support, which provides what we know as pty from the UNIX +world also for Windows. Using the CreatePseudoConsole API +(see https://docs.microsoft.com/en-us/windows/console/createpseudoconsole) +in the calling process, it is guaranteed that the called ncurses program has +a console that is required by its implementation, even if the calling program +is NOT a console program, e.g., MSYS2's own mintty Terminal emulator. -I recommend using libtool to build ncurses on MinGW, because libtool -knows exactly how to build dll's on Windows for use with MinGW. +In the current MSYS2/minGW setup, building MinGW shared libraries with +libtool for ncurses seems to be broken, so I recommend NOT to use libtool. To build a modern but still small footprint ncurses that provides hooks for interop, I recommend using these options: - --with-libtool - --disable-home-terminfo - --enable-database - --disable-termcap - --enable-sp-funcs - --enable-term-driver - --enable-interop + --without-libtool + --disable-home-terminfo + --enable-database + --disable-termcap + --enable-sp-funcs + --enable-term-driver + --enable-interop -This is the configuration commandline as I'm using it at the moment (assuming -environment variable MINGW_ROOT to hold the root directory name of your MinGW -build): +This is the configuration command line which I am using at the moment +(assuming environment variable MINGW_ROOT holds the root directory name of +your MinGW build): ./configure \ - --prefix=$MINGW_ROOT \ - --with-cxx \ + --prefix=/mingw64 \ + --without-cxx \ --without-ada \ --enable-warnings \ --enable-assertions \ + --enable-exp-win32 \ + --enable-ext-funcs \ --disable-home-terminfo \ + --disable-echo \ + --disable-getcap \ + --disable-hard-tabs \ + --disable-leaks \ + --disable-macros \ + --disable-overwrite \ + --enable-opaque-curses \ + --enable-opaque-panel \ + --enable-opaque-menu \ + --enable-opaque-form \ --enable-database \ --enable-sp-funcs \ --enable-term-driver \ --enable-interop \ --disable-termcap \ + --enable-database \ --with-progs \ - --with-libtool \ + --without-libtool \ --enable-pc-files \ - --mandir=$MINGW_ROOT/share/man + --with-shared \ + --with-normal \ + --without-debug \ + --with-fallbacks=ms-terminal \ + --without-manpages Please note that it is also necessary to set this environment variable: export PATH_SEPARATOR=";" in order to parse the terminfo paths correctly. Terminfo paths should -always be separated by a seeeemicolon,even when running under MSYS. +always be separated by a semicolon, even when running under MSYS2. All the options above are - like the whole Windows support - experimental. -A lot is still TODO, e.g.: - - - Wide Character support (display is workable, but input untested) - The Win32Con driver should actually only use Unicode in the - future. - - Thread support (locking). If using TDM toolchain this is done by - configuring pthreads. - - A GUI console driver - - Support for Terminals attached via a serial port (via terminfo) - - Support for networked Terminal connections (via terminfo) - - Workarounds for MinGW's filesystem access are necessary to make infocmp - work (though tic works). - -Recent Windows 10 releases have a new Console implementation that supports -ANSI-style terminal emulation. Also, there is a new "Windows Terminal" App -from Microsoft that hosts the new Console in a tabbed user interface. With -this, it is possble to try using terminfo, the TERM environment varianle -should be set to ms-terminal. - +-- vile:txtmode diff --git a/VERSION b/VERSION index 563782ac..074a9174 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20200831 +5:0:10 6.2 20200906 diff --git a/c++/Makefile.in b/c++/Makefile.in index e418d645..1efb2691 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.126 2020/08/29 18:35:49 tom Exp $ +# $Id: Makefile.in,v 1.127 2020/09/05 19:01:14 tom Exp $ ############################################################################## # Copyright 2018,2020 Thomas E. Dickey # # Copyright 1998-2015,2016 Free Software Foundation, Inc. # @@ -190,7 +190,7 @@ realclean :: distclean ############################################################################### -HEADER_DEPS = \ +HEADER_DEPS = @INTERNALS_HDR@ \ etip.h \ ../include/curses.h \ ../include/eti.h \ @@ -201,9 +201,7 @@ HEADER_DEPS = \ ../include/ncurses_dll.h \ ../include/panel.h \ ../include/unctrl.h \ - $(INCDIR)/nc_mingw.h \ $(INCDIR)/nc_string.h \ - $(INCDIR)/nc_win32.h \ $(srcdir)/cursesp.h \ $(srcdir)/cursesw.h \ $(srcdir)/cursslk.h \ diff --git a/configure b/configure index d8890f3d..a6bac7ca 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.721 . +# From configure.in Revision: 1.724 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20200802. # @@ -842,7 +842,7 @@ Experimental Code: --enable-safe-sprintf compile with experimental safe-sprintf code --disable-scroll-hints compile without scroll-hints code --enable-wgetch-events compile with wgetch-events code - --enable-exp-win32 compile with experimental-Windows + --enable-exp-win32 compile with experimental-Windows driver Testing/development Options: --disable-echo do not display "compiling" commands --disable-stripping do not strip (debug info) installed executables @@ -15971,11 +15971,23 @@ else fi; echo "$as_me:15972: result: $with_exp_win32" >&5 echo "${ECHO_T}$with_exp_win32" >&6 - test "x$with_exp_win32" = xyes && + if test "x$with_exp_win32" = xyes + then + cat >>confdefs.h <<\EOF #define EXP_WIN32_DRIVER 1 EOF + EXP_WIN32_DRIVER=1 + INTERNALS_HDR='$(INCDIR)/nc_win32.h' + else + INTERNALS_HDR='$(INCDIR)/nc_mingw.h' + EXP_WIN32_DRIVER=0 + fi + ;; +(*) + EXP_WIN32_DRIVER=0 + INTERNALS_HDR= ;; esac @@ -15983,7 +15995,7 @@ esac ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15986: checking if you want to see long compiling messages" >&5 +echo "$as_me:15998: 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. @@ -16017,7 +16029,7 @@ else ECHO_CC='' fi; -echo "$as_me:16020: result: $enableval" >&5 +echo "$as_me:16032: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -16030,7 +16042,7 @@ fi # --disable-stripping is used for debugging -echo "$as_me:16033: checking if you want to install stripped executables" >&5 +echo "$as_me:16045: 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. @@ -16047,7 +16059,7 @@ else with_stripping=yes fi; -echo "$as_me:16050: result: $with_stripping" >&5 +echo "$as_me:16062: result: $with_stripping" >&5 echo "${ECHO_T}$with_stripping" >&6 if test "$with_stripping" = yes @@ -16058,7 +16070,7 @@ else fi : ${INSTALL:=install} -echo "$as_me:16061: checking if install accepts -p option" >&5 +echo "$as_me:16073: 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 @@ -16089,10 +16101,10 @@ else rm -rf conftest* fi -echo "$as_me:16092: result: $cf_cv_install_p" >&5 +echo "$as_me:16104: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:16095: checking if install needs to be told about ownership" >&5 +echo "$as_me:16107: 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) @@ -16103,7 +16115,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:16106: result: $with_install_o" >&5 +echo "$as_me:16118: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -16137,7 +16149,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:16140: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16152: testing repairing CFLAGS: $CFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CFLAGS @@ -16160,11 +16172,11 @@ echo "${as_me:-configure}:16140: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:16163: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16175: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:16167: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16179: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -16176,7 +16188,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:16179: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CPPFLAGS @@ -16199,11 +16211,11 @@ echo "${as_me:-configure}:16179: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:16202: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16214: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16218: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -16215,7 +16227,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:16218: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:16230: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $LDFLAGS @@ -16238,17 +16250,17 @@ echo "${as_me:-configure}:16218: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:16241: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:16253: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:16245: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16257: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac fi -echo "$as_me:16251: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:16263: 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. @@ -16265,7 +16277,7 @@ else with_warnings=no fi; -echo "$as_me:16268: result: $with_warnings" >&5 +echo "$as_me:16280: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -16289,7 +16301,7 @@ do done cat >conftest.$ac_ext <<_ACEOF -#line 16292 "configure" +#line 16304 "configure" #include "confdefs.h" #include @@ -16304,26 +16316,26 @@ String foo = malloc(1); (void)foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16319: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16310: \$? = $ac_status" >&5 + echo "$as_me:16322: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16313: \"$ac_try\"") >&5 + { (eval echo "$as_me:16325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16316: \$? = $ac_status" >&5 + echo "$as_me:16328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -echo "$as_me:16319: checking for X11/Xt const-feature" >&5 +echo "$as_me:16331: 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 16326 "configure" +#line 16338 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -16340,16 +16352,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16343: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16355: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16346: \$? = $ac_status" >&5 + echo "$as_me:16358: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16349: \"$ac_try\"") >&5 + { (eval echo "$as_me:16361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16352: \$? = $ac_status" >&5 + echo "$as_me:16364: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_const_x_string=no @@ -16364,7 +16376,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16367: result: $cf_cv_const_x_string" >&5 +echo "$as_me:16379: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -16393,7 +16405,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi cat > conftest.$ac_ext <&5 + { echo "$as_me:16424: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -16425,12 +16437,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:16428: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16440: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16431: \$? = $ac_status" >&5 + echo "$as_me:16443: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16433: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16445: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -16438,7 +16450,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:16441: checking for $CC warning options..." >&5 + { echo "$as_me:16453: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -16461,12 +16473,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16476: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16467: \$? = $ac_status" >&5 + echo "$as_me:16479: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16469: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16481: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Winline) @@ -16474,7 +16486,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}:16477: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16489: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16484,7 +16496,7 @@ echo "${as_me:-configure}:16477: 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}:16487: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16499: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16517,10 +16529,10 @@ cat > conftest.i <&5 + { echo "$as_me:16532: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:16584: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16575: \$? = $ac_status" >&5 + echo "$as_me:16587: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16577: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:16589: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -16646,12 +16658,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:16649: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:16661: 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="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 16654 "configure" +#line 16666 "configure" #include "confdefs.h" int @@ -16668,16 +16680,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16671: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16674: \$? = $ac_status" >&5 + echo "$as_me:16686: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16677: \"$ac_try\"") >&5 + { (eval echo "$as_me:16689: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16680: \$? = $ac_status" >&5 + echo "$as_me:16692: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -16688,7 +16700,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:16691: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:16703: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -16697,12 +16709,12 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:16700: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:16712: 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="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 16705 "configure" +#line 16717 "configure" #include "confdefs.h" int @@ -16719,16 +16731,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16722: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16725: \$? = $ac_status" >&5 + echo "$as_me:16737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16728: \"$ac_try\"") >&5 + { (eval echo "$as_me:16740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16731: \$? = $ac_status" >&5 + echo "$as_me:16743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -16739,7 +16751,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:16742: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:16754: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -16758,7 +16770,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:16791: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -16793,12 +16805,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:16796: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16808: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16799: \$? = $ac_status" >&5 + echo "$as_me:16811: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16801: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16813: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -16807,7 +16819,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:16810: checking for $CXX warning options..." >&5 + { echo "$as_me:16822: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -16837,16 +16849,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:16840: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16852: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16843: \$? = $ac_status" >&5 + echo "$as_me:16855: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16845: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16857: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:16849: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16861: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -16864,7 +16876,7 @@ ac_main_return=return fi fi -echo "$as_me:16867: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:16879: 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. @@ -16874,7 +16886,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:16877: result: $with_string_hacks" >&5 +echo "$as_me:16889: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -16883,15 +16895,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:16886: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:16898: 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:16888: checking for strlcat" >&5 + echo "$as_me:16900: 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 16894 "configure" +#line 16906 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16922,16 +16934,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16925: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16928: \$? = $ac_status" >&5 + echo "$as_me:16940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16931: \"$ac_try\"") >&5 + { (eval echo "$as_me:16943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16934: \$? = $ac_status" >&5 + echo "$as_me:16946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -16941,7 +16953,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16944: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:16956: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -16951,7 +16963,7 @@ EOF else - echo "$as_me:16954: checking for strlcat in -lbsd" >&5 + echo "$as_me:16966: 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 @@ -16959,7 +16971,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16962 "configure" +#line 16974 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16978,16 +16990,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16981: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16993: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16984: \$? = $ac_status" >&5 + echo "$as_me:16996: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16987: \"$ac_try\"") >&5 + { (eval echo "$as_me:16999: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16990: \$? = $ac_status" >&5 + echo "$as_me:17002: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -16998,7 +17010,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17001: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:17013: 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 @@ -17021,23 +17033,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:17024: checking for $ac_header" >&5 +echo "$as_me:17036: 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 17030 "configure" +#line 17042 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17034: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17046: \"$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:17040: \$? = $ac_status" >&5 + echo "$as_me:17052: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17056,7 +17068,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17059: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17071: 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:17092: 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 17086 "configure" +#line 17098 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17114,16 +17126,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17117: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17129: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17120: \$? = $ac_status" >&5 + echo "$as_me:17132: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17123: \"$ac_try\"") >&5 + { (eval echo "$as_me:17135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17126: \$? = $ac_status" >&5 + echo "$as_me:17138: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17133,7 +17145,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17136: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17148: 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:17161: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -17156,7 +17168,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:17159: result: $with_assertions" >&5 +echo "$as_me:17171: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -17172,7 +17184,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:17175: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:17187: 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. @@ -17189,7 +17201,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:17192: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:17204: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -17303,23 +17315,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:17306: checking for dmalloc.h" >&5 + echo "$as_me:17318: 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 17312 "configure" +#line 17324 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17316: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17328: \"$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:17322: \$? = $ac_status" >&5 + echo "$as_me:17334: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17338,11 +17350,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17341: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:17353: 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:17345: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:17357: 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 @@ -17350,7 +17362,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17353 "configure" +#line 17365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17369,16 +17381,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17372: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17375: \$? = $ac_status" >&5 + echo "$as_me:17387: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17378: \"$ac_try\"") >&5 + { (eval echo "$as_me:17390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17381: \$? = $ac_status" >&5 + echo "$as_me:17393: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -17389,7 +17401,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17392: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:17404: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then cat >>confdefs.h <&5 +echo "$as_me:17419: 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. @@ -17421,7 +17433,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:17424: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:17436: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -17535,23 +17547,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:17538: checking for dbmalloc.h" >&5 + echo "$as_me:17550: 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 17544 "configure" +#line 17556 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17548: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17560: \"$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:17554: \$? = $ac_status" >&5 + echo "$as_me:17566: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17570,11 +17582,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17573: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:17585: 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:17577: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:17589: 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 @@ -17582,7 +17594,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17585 "configure" +#line 17597 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17601,16 +17613,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17604: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17616: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17607: \$? = $ac_status" >&5 + echo "$as_me:17619: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17610: \"$ac_try\"") >&5 + { (eval echo "$as_me:17622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17613: \$? = $ac_status" >&5 + echo "$as_me:17625: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -17621,7 +17633,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17624: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:17636: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then cat >>confdefs.h <&5 +echo "$as_me:17651: 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. @@ -17653,7 +17665,7 @@ EOF else with_valgrind= fi; -echo "$as_me:17656: result: ${with_valgrind:-no}" >&5 +echo "$as_me:17668: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -17766,7 +17778,7 @@ fi ;; esac -echo "$as_me:17769: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:17781: 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. @@ -17776,7 +17788,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:17779: result: $with_no_leaks" >&5 +echo "$as_me:17791: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -17828,7 +17840,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:17831: checking whether to add trace feature to all models" >&5 +echo "$as_me:17843: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -17838,7 +17850,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:17841: result: $cf_with_trace" >&5 +echo "$as_me:17853: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -17952,7 +17964,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:17955: checking if we want to use GNAT projects" >&5 +echo "$as_me:17967: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -17969,7 +17981,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:17972: result: $enable_gnat_projects" >&5 +echo "$as_me:17984: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -17983,13 +17995,13 @@ case $cf_cv_system_name in # Note: WINVER may be a problem with Windows 10 ;; (*) -echo "$as_me:17986: checking for gettimeofday" >&5 +echo "$as_me:17998: 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 17992 "configure" +#line 18004 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18020,16 +18032,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18026: \$? = $ac_status" >&5 + echo "$as_me:18038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18029: \"$ac_try\"") >&5 + { (eval echo "$as_me:18041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18032: \$? = $ac_status" >&5 + echo "$as_me:18044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -18039,7 +18051,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18042: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:18054: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -18049,7 +18061,7 @@ EOF else -echo "$as_me:18052: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:18064: 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 @@ -18057,7 +18069,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18060 "configure" +#line 18072 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18076,16 +18088,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18091: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18082: \$? = $ac_status" >&5 + echo "$as_me:18094: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18085: \"$ac_try\"") >&5 + { (eval echo "$as_me:18097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18088: \$? = $ac_status" >&5 + echo "$as_me:18100: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -18096,7 +18108,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18099: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:18111: 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 @@ -18126,14 +18138,14 @@ fi ;; esac -echo "$as_me:18129: checking if -lm needed for math functions" >&5 +echo "$as_me:18141: 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 18136 "configure" +#line 18148 "configure" #include "confdefs.h" #include @@ -18149,16 +18161,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:18152: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18164: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18155: \$? = $ac_status" >&5 + echo "$as_me:18167: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18158: \"$ac_try\"") >&5 + { (eval echo "$as_me:18170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18161: \$? = $ac_status" >&5 + echo "$as_me:18173: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -18168,7 +18180,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18171: result: $cf_cv_need_libm" >&5 +echo "$as_me:18183: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -18176,13 +18188,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:18179: checking for ANSI C header files" >&5 +echo "$as_me:18191: 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 18185 "configure" +#line 18197 "configure" #include "confdefs.h" #include #include @@ -18190,13 +18202,13 @@ else #include _ACEOF -if { (eval echo "$as_me:18193: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18205: \"$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:18199: \$? = $ac_status" >&5 + echo "$as_me:18211: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18218,7 +18230,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 18221 "configure" +#line 18233 "configure" #include "confdefs.h" #include @@ -18236,7 +18248,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 18239 "configure" +#line 18251 "configure" #include "confdefs.h" #include @@ -18257,7 +18269,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 18260 "configure" +#line 18272 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -18283,15 +18295,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18298: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18289: \$? = $ac_status" >&5 + echo "$as_me:18301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18291: \"$ac_try\"") >&5 + { (eval echo "$as_me:18303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18294: \$? = $ac_status" >&5 + echo "$as_me:18306: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -18304,7 +18316,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:18307: result: $ac_cv_header_stdc" >&5 +echo "$as_me:18319: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -18317,13 +18329,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:18320: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:18332: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $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 18326 "configure" +#line 18338 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -18338,16 +18350,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18353: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18344: \$? = $ac_status" >&5 + echo "$as_me:18356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18347: \"$ac_try\"") >&5 + { (eval echo "$as_me:18359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18350: \$? = $ac_status" >&5 + echo "$as_me:18362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -18357,7 +18369,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18360: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18372: 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:18385: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18378,7 +18390,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18381 "configure" +#line 18393 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18397,16 +18409,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18400: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18412: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18403: \$? = $ac_status" >&5 + echo "$as_me:18415: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18406: \"$ac_try\"") >&5 + { (eval echo "$as_me:18418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18409: \$? = $ac_status" >&5 + echo "$as_me:18421: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -18417,14 +18429,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18420: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:18432: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:18427: checking for opendir in -lx" >&5 + echo "$as_me:18439: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18432,7 +18444,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18435 "configure" +#line 18447 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18451,16 +18463,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18454: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18466: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18457: \$? = $ac_status" >&5 + echo "$as_me:18469: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18460: \"$ac_try\"") >&5 + { (eval echo "$as_me:18472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18463: \$? = $ac_status" >&5 + echo "$as_me:18475: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -18471,7 +18483,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18474: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:18486: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -18479,13 +18491,13 @@ fi fi -echo "$as_me:18482: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18494: 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 18488 "configure" +#line 18500 "configure" #include "confdefs.h" #include #include @@ -18501,16 +18513,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18504: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18516: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18507: \$? = $ac_status" >&5 + echo "$as_me:18519: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18510: \"$ac_try\"") >&5 + { (eval echo "$as_me:18522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18513: \$? = $ac_status" >&5 + echo "$as_me:18525: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -18520,7 +18532,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18523: result: $ac_cv_header_time" >&5 +echo "$as_me:18535: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -18539,13 +18551,13 @@ case $host_os in ;; esac -echo "$as_me:18542: checking for regcomp" >&5 +echo "$as_me:18554: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18548 "configure" +#line 18560 "configure" #include "confdefs.h" #define regcomp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18576,16 +18588,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18591: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18582: \$? = $ac_status" >&5 + echo "$as_me:18594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18585: \"$ac_try\"") >&5 + { (eval echo "$as_me:18597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18588: \$? = $ac_status" >&5 + echo "$as_me:18600: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -18595,7 +18607,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18598: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:18610: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test $ac_cv_func_regcomp = yes; then cf_regex_func=regcomp @@ -18604,7 +18616,7 @@ else for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:18607: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:18619: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18612,7 +18624,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18615 "configure" +#line 18627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18631,16 +18643,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18634: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18646: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18637: \$? = $ac_status" >&5 + echo "$as_me:18649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18640: \"$ac_try\"") >&5 + { (eval echo "$as_me:18652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18643: \$? = $ac_status" >&5 + echo "$as_me:18655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -18651,7 +18663,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18654: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:18666: 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 @@ -18680,13 +18692,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:18683: checking for compile" >&5 + echo "$as_me:18695: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18689 "configure" +#line 18701 "configure" #include "confdefs.h" #define compile autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18717,16 +18729,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:18732: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18723: \$? = $ac_status" >&5 + echo "$as_me:18735: \$? = $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:18738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18729: \$? = $ac_status" >&5 + echo "$as_me:18741: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -18736,13 +18748,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18739: result: $ac_cv_func_compile" >&5 +echo "$as_me:18751: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test $ac_cv_func_compile = yes; then cf_regex_func=compile else - echo "$as_me:18745: checking for compile in -lgen" >&5 + echo "$as_me:18757: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18750,7 +18762,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18753 "configure" +#line 18765 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18769,16 +18781,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18772: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18784: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18775: \$? = $ac_status" >&5 + echo "$as_me:18787: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18778: \"$ac_try\"") >&5 + { (eval echo "$as_me:18790: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18781: \$? = $ac_status" >&5 + echo "$as_me:18793: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -18789,7 +18801,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18792: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:18804: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test $ac_cv_lib_gen_compile = yes; then @@ -18817,11 +18829,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:18820: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:18832: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:18824: checking for regular-expression headers" >&5 +echo "$as_me:18836: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18833,7 +18845,7 @@ case $cf_regex_func in for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 18836 "configure" +#line 18848 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -18850,16 +18862,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18853: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18865: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18856: \$? = $ac_status" >&5 + echo "$as_me:18868: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18859: \"$ac_try\"") >&5 + { (eval echo "$as_me:18871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18862: \$? = $ac_status" >&5 + echo "$as_me:18874: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -18876,7 +18888,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 18879 "configure" +#line 18891 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -18896,16 +18908,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18899: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18902: \$? = $ac_status" >&5 + echo "$as_me:18914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18905: \"$ac_try\"") >&5 + { (eval echo "$as_me:18917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18908: \$? = $ac_status" >&5 + echo "$as_me:18920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -18921,11 +18933,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:18924: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:18936: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in - (no) { echo "$as_me:18928: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:18940: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -18963,23 +18975,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18966: checking for $ac_header" >&5 +echo "$as_me:18978: 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 18972 "configure" +#line 18984 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18976: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18988: \"$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:18982: \$? = $ac_status" >&5 + echo "$as_me:18994: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18998,7 +19010,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19001: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19013: 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:19026: 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 19020 "configure" +#line 19032 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19024: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19036: \"$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:19030: \$? = $ac_status" >&5 + echo "$as_me:19042: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19046,7 +19058,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19049: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19061: 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:19071: 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 @@ -19066,7 +19078,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 19069 "configure" +#line 19081 "configure" #include "confdefs.h" #include <$cf_header> @@ -19079,16 +19091,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19082: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19094: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19085: \$? = $ac_status" >&5 + echo "$as_me:19097: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19088: \"$ac_try\"") >&5 + { (eval echo "$as_me:19100: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19091: \$? = $ac_status" >&5 + echo "$as_me:19103: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -19100,7 +19112,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:19103: result: $cf_cv_getopt_header" >&5 +echo "$as_me:19115: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -19117,14 +19129,14 @@ EOF fi -echo "$as_me:19120: checking if external environ is declared" >&5 +echo "$as_me:19132: checking if external environ is declared" >&5 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19127 "configure" +#line 19139 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -19140,16 +19152,16 @@ int x = (int) environ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19146: \$? = $ac_status" >&5 + echo "$as_me:19158: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19149: \"$ac_try\"") >&5 + { (eval echo "$as_me:19161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19152: \$? = $ac_status" >&5 + echo "$as_me:19164: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_environ=yes else @@ -19160,7 +19172,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19163: result: $cf_cv_dcl_environ" >&5 +echo "$as_me:19175: result: $cf_cv_dcl_environ" >&5 echo "${ECHO_T}$cf_cv_dcl_environ" >&6 if test "$cf_cv_dcl_environ" = no ; then @@ -19175,14 +19187,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:19178: checking if external environ exists" >&5 +echo "$as_me:19190: checking if external environ exists" >&5 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 if test "${cf_cv_have_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19185 "configure" +#line 19197 "configure" #include "confdefs.h" #undef environ @@ -19197,16 +19209,16 @@ environ = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19200: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19212: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19203: \$? = $ac_status" >&5 + echo "$as_me:19215: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19206: \"$ac_try\"") >&5 + { (eval echo "$as_me:19218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19209: \$? = $ac_status" >&5 + echo "$as_me:19221: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_environ=yes else @@ -19217,7 +19229,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19220: result: $cf_cv_have_environ" >&5 +echo "$as_me:19232: result: $cf_cv_have_environ" >&5 echo "${ECHO_T}$cf_cv_have_environ" >&6 if test "$cf_cv_have_environ" = yes ; then @@ -19230,13 +19242,13 @@ EOF fi -echo "$as_me:19233: checking for getenv" >&5 +echo "$as_me:19245: checking for getenv" >&5 echo $ECHO_N "checking for getenv... $ECHO_C" >&6 if test "${ac_cv_func_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19239 "configure" +#line 19251 "configure" #include "confdefs.h" #define getenv autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19267,16 +19279,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19270: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19282: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19273: \$? = $ac_status" >&5 + echo "$as_me:19285: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19276: \"$ac_try\"") >&5 + { (eval echo "$as_me:19288: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19279: \$? = $ac_status" >&5 + echo "$as_me:19291: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getenv=yes else @@ -19286,19 +19298,19 @@ ac_cv_func_getenv=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19289: result: $ac_cv_func_getenv" >&5 +echo "$as_me:19301: result: $ac_cv_func_getenv" >&5 echo "${ECHO_T}$ac_cv_func_getenv" >&6 for ac_func in putenv setenv strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:19295: checking for $ac_func" >&5 +echo "$as_me:19307: 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 19301 "configure" +#line 19313 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19329,16 +19341,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19332: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19344: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19335: \$? = $ac_status" >&5 + echo "$as_me:19347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19338: \"$ac_try\"") >&5 + { (eval echo "$as_me:19350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19341: \$? = $ac_status" >&5 + echo "$as_me:19353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -19348,7 +19360,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19351: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19363: 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:19373: checking if getenv returns consistent values" >&5 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 if test "${cf_cv_consistent_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19368,7 +19380,7 @@ if test "$cross_compiling" = yes; then cf_cv_consistent_getenv=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19371 "configure" +#line 19383 "configure" #include "confdefs.h" #include @@ -19477,15 +19489,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19492: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19483: \$? = $ac_status" >&5 + echo "$as_me:19495: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19485: \"$ac_try\"") >&5 + { (eval echo "$as_me:19497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19488: \$? = $ac_status" >&5 + echo "$as_me:19500: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_consistent_getenv=yes else @@ -19498,7 +19510,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19501: result: $cf_cv_consistent_getenv" >&5 +echo "$as_me:19513: result: $cf_cv_consistent_getenv" >&5 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 if test "x$cf_cv_consistent_getenv" = xno @@ -19513,18 +19525,18 @@ fi if test "x$cf_cv_consistent_getenv" = xno && \ test "x$cf_with_trace" = xyes then - { echo "$as_me:19516: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + { echo "$as_me:19528: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} fi -echo "$as_me:19520: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:19532: 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 19527 "configure" +#line 19539 "configure" #include "confdefs.h" #include @@ -19544,16 +19556,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19547: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19559: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19550: \$? = $ac_status" >&5 + echo "$as_me:19562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19553: \"$ac_try\"") >&5 + { (eval echo "$as_me:19565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19556: \$? = $ac_status" >&5 + echo "$as_me:19568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -19565,7 +19577,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19568: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:19580: 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 @@ -19580,13 +19592,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:19583: checking for an ANSI C-conforming const" >&5 +echo "$as_me:19595: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19589 "configure" +#line 19601 "configure" #include "confdefs.h" int @@ -19644,16 +19656,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19647: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19650: \$? = $ac_status" >&5 + echo "$as_me:19662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19653: \"$ac_try\"") >&5 + { (eval echo "$as_me:19665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19656: \$? = $ac_status" >&5 + echo "$as_me:19668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -19663,7 +19675,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19666: result: $ac_cv_c_const" >&5 +echo "$as_me:19678: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -19673,7 +19685,7 @@ EOF fi -echo "$as_me:19676: checking for inline" >&5 +echo "$as_me:19688: 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 @@ -19681,7 +19693,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 19684 "configure" +#line 19696 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -19690,16 +19702,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19693: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19705: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19696: \$? = $ac_status" >&5 + echo "$as_me:19708: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19699: \"$ac_try\"") >&5 + { (eval echo "$as_me:19711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19702: \$? = $ac_status" >&5 + echo "$as_me:19714: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -19710,7 +19722,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:19713: result: $ac_cv_c_inline" >&5 +echo "$as_me:19725: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -19736,7 +19748,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:19739: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:19751: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19745,7 +19757,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 19748 "configure" +#line 19760 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -19757,16 +19769,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19760: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19772: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19763: \$? = $ac_status" >&5 + echo "$as_me:19775: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19766: \"$ac_try\"") >&5 + { (eval echo "$as_me:19778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19769: \$? = $ac_status" >&5 + echo "$as_me:19781: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -19778,7 +19790,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:19781: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:19793: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -19884,7 +19896,7 @@ fi fi fi -echo "$as_me:19887: checking for signal global datatype" >&5 +echo "$as_me:19899: 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 @@ -19896,7 +19908,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 19899 "configure" +#line 19911 "configure" #include "confdefs.h" #include @@ -19920,16 +19932,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19923: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19935: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19926: \$? = $ac_status" >&5 + echo "$as_me:19938: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19929: \"$ac_try\"") >&5 + { (eval echo "$as_me:19941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19932: \$? = $ac_status" >&5 + echo "$as_me:19944: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -19943,7 +19955,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19946: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:19958: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:19967: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19962,7 +19974,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 19965 "configure" +#line 19977 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -19997,15 +20009,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20000: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20003: \$? = $ac_status" >&5 + echo "$as_me:20015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20005: \"$ac_try\"") >&5 + { (eval echo "$as_me:20017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20008: \$? = $ac_status" >&5 + echo "$as_me:20020: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -20020,7 +20032,7 @@ fi fi -echo "$as_me:20023: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:20035: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:20047: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20042 "configure" +#line 20054 "configure" #include "confdefs.h" int @@ -20051,16 +20063,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20054: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20057: \$? = $ac_status" >&5 + echo "$as_me:20069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20060: \"$ac_try\"") >&5 + { (eval echo "$as_me:20072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20063: \$? = $ac_status" >&5 + echo "$as_me:20075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -20072,7 +20084,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20075: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:20087: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -20088,14 +20100,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:20091: checking if external errno is declared" >&5 +echo "$as_me:20103: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20098 "configure" +#line 20110 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -20113,16 +20125,16 @@ int x = (int) errno; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20116: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20119: \$? = $ac_status" >&5 + echo "$as_me:20131: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20122: \"$ac_try\"") >&5 + { (eval echo "$as_me:20134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20125: \$? = $ac_status" >&5 + echo "$as_me:20137: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -20133,7 +20145,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20136: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:20148: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -20148,14 +20160,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:20151: checking if external errno exists" >&5 +echo "$as_me:20163: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20158 "configure" +#line 20170 "configure" #include "confdefs.h" #undef errno @@ -20170,16 +20182,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20173: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20185: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20176: \$? = $ac_status" >&5 + echo "$as_me:20188: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20179: \"$ac_try\"") >&5 + { (eval echo "$as_me:20191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20182: \$? = $ac_status" >&5 + echo "$as_me:20194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -20190,7 +20202,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20193: result: $cf_cv_have_errno" >&5 +echo "$as_me:20205: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -20203,7 +20215,7 @@ EOF fi -echo "$as_me:20206: checking if data-only library module links" >&5 +echo "$as_me:20218: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20211,20 +20223,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:20229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20220: \$? = $ac_status" >&5 + echo "$as_me:20232: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:20252: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20243: \$? = $ac_status" >&5 + echo "$as_me:20255: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -20253,7 +20265,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 20256 "configure" +#line 20268 "configure" #include "confdefs.h" int main(void) @@ -20264,15 +20276,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20279: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20270: \$? = $ac_status" >&5 + echo "$as_me:20282: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20272: \"$ac_try\"") >&5 + { (eval echo "$as_me:20284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20275: \$? = $ac_status" >&5 + echo "$as_me:20287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -20287,7 +20299,7 @@ fi fi -echo "$as_me:20290: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:20302: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -20330,13 +20342,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20333: checking for $ac_func" >&5 +echo "$as_me:20345: 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 20339 "configure" +#line 20351 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20367,16 +20379,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20382: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20373: \$? = $ac_status" >&5 + echo "$as_me:20385: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20376: \"$ac_try\"") >&5 + { (eval echo "$as_me:20388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20379: \$? = $ac_status" >&5 + echo "$as_me:20391: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -20386,7 +20398,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20389: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:20401: 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:20413: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -20407,7 +20419,7 @@ if test "x$with_safe_sprintf" = xyes then if test "x$ac_cv_func_vsnprintf" = xyes then - { echo "$as_me:20410: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + { echo "$as_me:20422: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} else @@ -20420,14 +20432,14 @@ fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:20423: checking for terminal-capability database functions" >&5 +echo "$as_me:20435: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20430 "configure" +#line 20442 "configure" #include "confdefs.h" #include @@ -20447,16 +20459,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20450: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20462: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20453: \$? = $ac_status" >&5 + echo "$as_me:20465: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20456: \"$ac_try\"") >&5 + { (eval echo "$as_me:20468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20459: \$? = $ac_status" >&5 + echo "$as_me:20471: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -20467,7 +20479,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20470: result: $cf_cv_cgetent" >&5 +echo "$as_me:20482: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -20477,14 +20489,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:20480: checking if cgetent uses const parameter" >&5 +echo "$as_me:20492: checking if cgetent uses const parameter" >&5 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 if test "${cf_cv_cgetent_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20487 "configure" +#line 20499 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -20507,16 +20519,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20510: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20522: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20513: \$? = $ac_status" >&5 + echo "$as_me:20525: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20516: \"$ac_try\"") >&5 + { (eval echo "$as_me:20528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20519: \$? = $ac_status" >&5 + echo "$as_me:20531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -20527,7 +20539,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20530: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:20542: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -20541,14 +20553,14 @@ fi fi -echo "$as_me:20544: checking for isascii" >&5 +echo "$as_me:20556: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20551 "configure" +#line 20563 "configure" #include "confdefs.h" #include int @@ -20560,16 +20572,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20563: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20575: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20566: \$? = $ac_status" >&5 + echo "$as_me:20578: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20569: \"$ac_try\"") >&5 + { (eval echo "$as_me:20581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20572: \$? = $ac_status" >&5 + echo "$as_me:20584: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -20580,7 +20592,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20583: result: $cf_cv_have_isascii" >&5 +echo "$as_me:20595: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -20588,10 +20600,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:20591: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:20603: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 20594 "configure" +#line 20606 "configure" #include "confdefs.h" #include @@ -20605,16 +20617,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20608: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20620: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20611: \$? = $ac_status" >&5 + echo "$as_me:20623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20614: \"$ac_try\"") >&5 + { (eval echo "$as_me:20626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20617: \$? = $ac_status" >&5 + echo "$as_me:20629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -20622,7 +20634,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20625 "configure" +#line 20637 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20637,16 +20649,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20640: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20652: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20643: \$? = $ac_status" >&5 + echo "$as_me:20655: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20646: \"$ac_try\"") >&5 + { (eval echo "$as_me:20658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20649: \$? = $ac_status" >&5 + echo "$as_me:20661: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -20662,11 +20674,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:20665: result: $sigact_bad" >&5 +echo "$as_me:20677: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:20669: checking if nanosleep really works" >&5 +echo "$as_me:20681: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20676,7 +20688,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 20679 "configure" +#line 20691 "configure" #include "confdefs.h" #include @@ -20701,15 +20713,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20707: \$? = $ac_status" >&5 + echo "$as_me:20719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20709: \"$ac_try\"") >&5 + { (eval echo "$as_me:20721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20712: \$? = $ac_status" >&5 + echo "$as_me:20724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -20721,7 +20733,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:20724: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:20736: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -20738,23 +20750,23 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20741: checking for $ac_header" >&5 +echo "$as_me:20753: 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 20747 "configure" +#line 20759 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20751: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20763: \"$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:20757: \$? = $ac_status" >&5 + echo "$as_me:20769: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20773,7 +20785,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20776: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20788: 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:20805: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 20796 "configure" +#line 20808 "configure" #include "confdefs.h" #include int @@ -20805,16 +20817,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20808: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20820: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20811: \$? = $ac_status" >&5 + echo "$as_me:20823: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20814: \"$ac_try\"") >&5 + { (eval echo "$as_me:20826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20817: \$? = $ac_status" >&5 + echo "$as_me:20829: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -20822,7 +20834,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20825 "configure" +#line 20837 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20836,16 +20848,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20839: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20851: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20842: \$? = $ac_status" >&5 + echo "$as_me:20854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20845: \"$ac_try\"") >&5 + { (eval echo "$as_me:20857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20848: \$? = $ac_status" >&5 + echo "$as_me:20860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -20861,19 +20873,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:20864: result: $termios_bad" >&5 + echo "$as_me:20876: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:20869: checking for tcgetattr" >&5 +echo "$as_me:20881: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20876 "configure" +#line 20888 "configure" #include "confdefs.h" #include @@ -20901,16 +20913,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20904: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20907: \$? = $ac_status" >&5 + echo "$as_me:20919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20910: \"$ac_try\"") >&5 + { (eval echo "$as_me:20922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20913: \$? = $ac_status" >&5 + echo "$as_me:20925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -20920,21 +20932,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20923: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:20935: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:20930: checking for vsscanf function or workaround" >&5 +echo "$as_me:20942: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20937 "configure" +#line 20949 "configure" #include "confdefs.h" #include @@ -20950,16 +20962,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20953: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20956: \$? = $ac_status" >&5 + echo "$as_me:20968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20959: \"$ac_try\"") >&5 + { (eval echo "$as_me:20971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20962: \$? = $ac_status" >&5 + echo "$as_me:20974: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -20967,7 +20979,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20970 "configure" +#line 20982 "configure" #include "confdefs.h" #include @@ -20989,16 +21001,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20992: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21004: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20995: \$? = $ac_status" >&5 + echo "$as_me:21007: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20998: \"$ac_try\"") >&5 + { (eval echo "$as_me:21010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21001: \$? = $ac_status" >&5 + echo "$as_me:21013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -21006,7 +21018,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 21009 "configure" +#line 21021 "configure" #include "confdefs.h" #include @@ -21028,16 +21040,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21031: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21034: \$? = $ac_status" >&5 + echo "$as_me:21046: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21037: \"$ac_try\"") >&5 + { (eval echo "$as_me:21049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21040: \$? = $ac_status" >&5 + echo "$as_me:21052: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -21052,7 +21064,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21055: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:21067: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in @@ -21078,23 +21090,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:21081: checking for $ac_header" >&5 +echo "$as_me:21093: 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 21087 "configure" +#line 21099 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:21091: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21103: \"$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:21097: \$? = $ac_status" >&5 + echo "$as_me:21109: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -21113,7 +21125,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:21116: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:21128: 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:21138: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21134,7 +21146,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 21137 "configure" +#line 21149 "configure" #include "confdefs.h" #include @@ -21175,15 +21187,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21178: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21190: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21181: \$? = $ac_status" >&5 + echo "$as_me:21193: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21183: \"$ac_try\"") >&5 + { (eval echo "$as_me:21195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21186: \$? = $ac_status" >&5 + echo "$as_me:21198: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -21198,16 +21210,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:21201: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:21213: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:21204: checking for mkstemp" >&5 + echo "$as_me:21216: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21210 "configure" +#line 21222 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21238,16 +21250,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21253: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21244: \$? = $ac_status" >&5 + echo "$as_me:21256: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21247: \"$ac_try\"") >&5 + { (eval echo "$as_me:21259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21250: \$? = $ac_status" >&5 + echo "$as_me:21262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -21257,7 +21269,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21260: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:21272: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -21278,21 +21290,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:21281: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:21293: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:21284: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:21296: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:21290: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:21302: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 21295 "configure" +#line 21307 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -21309,15 +21321,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21312: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21315: \$? = $ac_status" >&5 + echo "$as_me:21327: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21317: \"$ac_try\"") >&5 + { (eval echo "$as_me:21329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21320: \$? = $ac_status" >&5 + echo "$as_me:21332: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -21330,7 +21342,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:21333: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:21345: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -21341,13 +21353,13 @@ EOF fi fi -echo "$as_me:21344: checking for intptr_t" >&5 +echo "$as_me:21356: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21350 "configure" +#line 21362 "configure" #include "confdefs.h" $ac_includes_default int @@ -21362,16 +21374,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21365: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21377: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21368: \$? = $ac_status" >&5 + echo "$as_me:21380: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21371: \"$ac_try\"") >&5 + { (eval echo "$as_me:21383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21374: \$? = $ac_status" >&5 + echo "$as_me:21386: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -21381,7 +21393,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21384: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:21396: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 if test $ac_cv_type_intptr_t = yes; then : @@ -21393,13 +21405,13 @@ EOF fi -echo "$as_me:21396: checking for ssize_t" >&5 +echo "$as_me:21408: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21402 "configure" +#line 21414 "configure" #include "confdefs.h" $ac_includes_default int @@ -21414,16 +21426,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21417: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21429: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21420: \$? = $ac_status" >&5 + echo "$as_me:21432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21423: \"$ac_try\"") >&5 + { (eval echo "$as_me:21435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21426: \$? = $ac_status" >&5 + echo "$as_me:21438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else @@ -21433,7 +21445,7 @@ ac_cv_type_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21436: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:21448: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 if test $ac_cv_type_ssize_t = yes; then : @@ -21445,14 +21457,14 @@ EOF fi -echo "$as_me:21448: checking for type sigaction_t" >&5 +echo "$as_me:21460: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21455 "configure" +#line 21467 "configure" #include "confdefs.h" #include @@ -21465,16 +21477,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21471: \$? = $ac_status" >&5 + echo "$as_me:21483: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21474: \"$ac_try\"") >&5 + { (eval echo "$as_me:21486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21477: \$? = $ac_status" >&5 + echo "$as_me:21489: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -21485,14 +21497,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21488: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:21500: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:21495: checking declaration of size-change" >&5 +echo "$as_me:21507: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21513,7 +21525,7 @@ do fi cat >conftest.$ac_ext <<_ACEOF -#line 21516 "configure" +#line 21528 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -21563,16 +21575,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21566: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21569: \$? = $ac_status" >&5 + echo "$as_me:21581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21572: \"$ac_try\"") >&5 + { (eval echo "$as_me:21584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21575: \$? = $ac_status" >&5 + echo "$as_me:21587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -21591,7 +21603,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:21594: result: $cf_cv_sizechange" >&5 +echo "$as_me:21606: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -21609,13 +21621,13 @@ EOF esac fi -echo "$as_me:21612: checking for memmove" >&5 +echo "$as_me:21624: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21618 "configure" +#line 21630 "configure" #include "confdefs.h" #define memmove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21646,16 +21658,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21649: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21652: \$? = $ac_status" >&5 + echo "$as_me:21664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21655: \"$ac_try\"") >&5 + { (eval echo "$as_me:21667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21658: \$? = $ac_status" >&5 + echo "$as_me:21670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -21665,19 +21677,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21668: result: $ac_cv_func_memmove" >&5 +echo "$as_me:21680: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test $ac_cv_func_memmove = yes; then : else -echo "$as_me:21674: checking for bcopy" >&5 +echo "$as_me:21686: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21680 "configure" +#line 21692 "configure" #include "confdefs.h" #define bcopy autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21708,16 +21720,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21711: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21723: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21714: \$? = $ac_status" >&5 + echo "$as_me:21726: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21717: \"$ac_try\"") >&5 + { (eval echo "$as_me:21729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21720: \$? = $ac_status" >&5 + echo "$as_me:21732: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -21727,11 +21739,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21730: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:21742: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test $ac_cv_func_bcopy = yes; then - echo "$as_me:21734: checking if bcopy does overlapping moves" >&5 + echo "$as_me:21746: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21741,7 +21753,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21744 "configure" +#line 21756 "configure" #include "confdefs.h" int main(void) { @@ -21755,15 +21767,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21758: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21770: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21761: \$? = $ac_status" >&5 + echo "$as_me:21773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21763: \"$ac_try\"") >&5 + { (eval echo "$as_me:21775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21766: \$? = $ac_status" >&5 + echo "$as_me:21778: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -21776,7 +21788,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:21779: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:21791: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -21803,13 +21815,13 @@ tty 2>&1 >/dev/null || { for ac_func in posix_openpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:21806: checking for $ac_func" >&5 +echo "$as_me:21818: 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 21812 "configure" +#line 21824 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21840,16 +21852,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21843: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21855: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21846: \$? = $ac_status" >&5 + echo "$as_me:21858: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21849: \"$ac_try\"") >&5 + { (eval echo "$as_me:21861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21852: \$? = $ac_status" >&5 + echo "$as_me:21864: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -21859,7 +21871,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21862: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:21874: 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:21884: checking if poll really works" >&5 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 if test "${cf_cv_working_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21879,7 +21891,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21882 "configure" +#line 21894 "configure" #include "confdefs.h" #include @@ -21931,15 +21943,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21946: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21937: \$? = $ac_status" >&5 + echo "$as_me:21949: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21939: \"$ac_try\"") >&5 + { (eval echo "$as_me:21951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21942: \$? = $ac_status" >&5 + echo "$as_me:21954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -21951,21 +21963,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:21954: result: $cf_cv_working_poll" >&5 +echo "$as_me:21966: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:21961: checking for va_copy" >&5 +echo "$as_me:21973: 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 21968 "configure" +#line 21980 "configure" #include "confdefs.h" #include @@ -21982,16 +21994,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21988: \$? = $ac_status" >&5 + echo "$as_me:22000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21991: \"$ac_try\"") >&5 + { (eval echo "$as_me:22003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21994: \$? = $ac_status" >&5 + echo "$as_me:22006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -22001,7 +22013,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22004: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:22016: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 if test "$cf_cv_have_va_copy" = yes; @@ -22013,14 +22025,14 @@ EOF else # !cf_cv_have_va_copy -echo "$as_me:22016: checking for __va_copy" >&5 +echo "$as_me:22028: 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 22023 "configure" +#line 22035 "configure" #include "confdefs.h" #include @@ -22037,16 +22049,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22040: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22052: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22043: \$? = $ac_status" >&5 + echo "$as_me:22055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22046: \"$ac_try\"") >&5 + { (eval echo "$as_me:22058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22049: \$? = $ac_status" >&5 + echo "$as_me:22061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -22056,7 +22068,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22059: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:22071: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 if test "$cf_cv_have___va_copy" = yes @@ -22068,14 +22080,14 @@ EOF else # !cf_cv_have___va_copy -echo "$as_me:22071: checking for __builtin_va_copy" >&5 +echo "$as_me:22083: checking for __builtin_va_copy" >&5 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22078 "configure" +#line 22090 "configure" #include "confdefs.h" #include @@ -22092,16 +22104,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22095: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22098: \$? = $ac_status" >&5 + echo "$as_me:22110: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22101: \"$ac_try\"") >&5 + { (eval echo "$as_me:22113: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22104: \$? = $ac_status" >&5 + echo "$as_me:22116: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___builtin_va_copy=yes else @@ -22111,7 +22123,7 @@ cf_cv_have___builtin_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22114: result: $cf_cv_have___builtin_va_copy" >&5 +echo "$as_me:22126: result: $cf_cv_have___builtin_va_copy" >&5 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 test "$cf_cv_have___builtin_va_copy" = yes && @@ -22129,14 +22141,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy ;; (*) - echo "$as_me:22132: checking if we can simply copy va_list" >&5 + echo "$as_me:22144: checking if we can simply copy va_list" >&5 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 if test "${cf_cv_pointer_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22139 "configure" +#line 22151 "configure" #include "confdefs.h" #include @@ -22153,16 +22165,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22156: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22168: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22159: \$? = $ac_status" >&5 + echo "$as_me:22171: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22162: \"$ac_try\"") >&5 + { (eval echo "$as_me:22174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22165: \$? = $ac_status" >&5 + echo "$as_me:22177: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_pointer_va_list=yes else @@ -22172,19 +22184,19 @@ cf_cv_pointer_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22175: result: $cf_cv_pointer_va_list" >&5 +echo "$as_me:22187: result: $cf_cv_pointer_va_list" >&5 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 if test "$cf_cv_pointer_va_list" = no then - echo "$as_me:22180: checking if we can copy va_list indirectly" >&5 + echo "$as_me:22192: checking if we can copy va_list indirectly" >&5 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22187 "configure" +#line 22199 "configure" #include "confdefs.h" #include @@ -22201,16 +22213,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22207: \$? = $ac_status" >&5 + echo "$as_me:22219: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22210: \"$ac_try\"") >&5 + { (eval echo "$as_me:22222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22213: \$? = $ac_status" >&5 + echo "$as_me:22225: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_array_va_list=yes else @@ -22220,7 +22232,7 @@ cf_cv_array_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22223: result: $cf_cv_array_va_list" >&5 +echo "$as_me:22235: result: $cf_cv_array_va_list" >&5 echo "${ECHO_T}$cf_cv_array_va_list" >&6 test "$cf_cv_array_va_list" = yes && cat >>confdefs.h <<\EOF @@ -22231,13 +22243,13 @@ EOF ;; esac -echo "$as_me:22234: checking for pid_t" >&5 +echo "$as_me:22246: 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 22240 "configure" +#line 22252 "configure" #include "confdefs.h" $ac_includes_default int @@ -22252,16 +22264,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22255: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22267: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22258: \$? = $ac_status" >&5 + echo "$as_me:22270: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22261: \"$ac_try\"") >&5 + { (eval echo "$as_me:22273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22264: \$? = $ac_status" >&5 + echo "$as_me:22276: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -22271,7 +22283,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:22274: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:22286: 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 : @@ -22286,23 +22298,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:22289: checking for $ac_header" >&5 +echo "$as_me:22301: 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 22295 "configure" +#line 22307 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22299: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:22311: \"$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:22305: \$? = $ac_status" >&5 + echo "$as_me:22317: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22321,7 +22333,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:22324: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:22336: 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:22349: 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 22343 "configure" +#line 22355 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22371,16 +22383,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22386: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22377: \$? = $ac_status" >&5 + echo "$as_me:22389: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22380: \"$ac_try\"") >&5 + { (eval echo "$as_me:22392: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22383: \$? = $ac_status" >&5 + echo "$as_me:22395: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -22390,7 +22402,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22393: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:22405: 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:22417: 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 @@ -22425,15 +22437,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22440: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22431: \$? = $ac_status" >&5 + echo "$as_me:22443: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22433: \"$ac_try\"") >&5 + { (eval echo "$as_me:22445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22436: \$? = $ac_status" >&5 + echo "$as_me:22448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -22445,7 +22457,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22448: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:22460: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -22459,12 +22471,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:22462: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:22474: 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:22467: checking for working vfork" >&5 + echo "$as_me:22479: 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 @@ -22473,7 +22485,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 22476 "configure" +#line 22488 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -22570,15 +22582,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22573: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22576: \$? = $ac_status" >&5 + echo "$as_me:22588: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22578: \"$ac_try\"") >&5 + { (eval echo "$as_me:22590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22581: \$? = $ac_status" >&5 + echo "$as_me:22593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -22590,13 +22602,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22593: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:22605: 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:22599: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:22611: 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 @@ -22621,7 +22633,7 @@ EOF fi -echo "$as_me:22624: checking if fopen accepts explicit binary mode" >&5 +echo "$as_me:22636: checking if fopen accepts explicit binary mode" >&5 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 if test "${cf_cv_fopen_bin_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22631,7 +22643,7 @@ else cf_cv_fopen_bin_r=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 22634 "configure" +#line 22646 "configure" #include "confdefs.h" #include @@ -22664,15 +22676,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22670: \$? = $ac_status" >&5 + echo "$as_me:22682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22672: \"$ac_try\"") >&5 + { (eval echo "$as_me:22684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22675: \$? = $ac_status" >&5 + echo "$as_me:22687: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fopen_bin_r=yes else @@ -22685,7 +22697,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22688: result: $cf_cv_fopen_bin_r" >&5 +echo "$as_me:22700: result: $cf_cv_fopen_bin_r" >&5 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF @@ -22694,7 +22706,7 @@ EOF # special check for test/ditto.c -echo "$as_me:22697: checking for openpty in -lutil" >&5 +echo "$as_me:22709: 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 @@ -22702,7 +22714,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22705 "configure" +#line 22717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22721,16 +22733,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22724: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22736: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22727: \$? = $ac_status" >&5 + echo "$as_me:22739: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22730: \"$ac_try\"") >&5 + { (eval echo "$as_me:22742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22733: \$? = $ac_status" >&5 + echo "$as_me:22745: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -22741,7 +22753,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22744: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:22756: 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 @@ -22749,7 +22761,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:22752: checking for openpty header" >&5 +echo "$as_me:22764: 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 @@ -22776,7 +22788,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 22779 "configure" +#line 22791 "configure" #include "confdefs.h" #include <$cf_header> @@ -22793,16 +22805,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22796: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22799: \$? = $ac_status" >&5 + echo "$as_me:22811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22802: \"$ac_try\"") >&5 + { (eval echo "$as_me:22814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22805: \$? = $ac_status" >&5 + echo "$as_me:22817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -22820,7 +22832,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:22823: result: $cf_cv_func_openpty" >&5 +echo "$as_me:22835: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -22893,7 +22905,7 @@ if test -n "$with_hashed_db/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 22896 "configure" +#line 22908 "configure" #include "confdefs.h" #include int @@ -22905,16 +22917,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22908: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22920: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22911: \$? = $ac_status" >&5 + echo "$as_me:22923: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22914: \"$ac_try\"") >&5 + { (eval echo "$as_me:22926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22917: \$? = $ac_status" >&5 + echo "$as_me:22929: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -22931,7 +22943,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}:22934: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:22946: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -22967,7 +22979,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}:22970: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:22982: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22978,7 +22990,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:22981: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:22993: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -23050,7 +23062,7 @@ if test -n "$cf_item" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 23053 "configure" +#line 23065 "configure" #include "confdefs.h" #include int @@ -23062,16 +23074,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23065: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23077: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23068: \$? = $ac_status" >&5 + echo "$as_me:23080: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23071: \"$ac_try\"") >&5 + { (eval echo "$as_me:23083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23074: \$? = $ac_status" >&5 + echo "$as_me:23086: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -23088,7 +23100,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}:23091: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23103: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -23168,7 +23180,7 @@ if test -n "$cf_item" ; 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}:23171: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:23183: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -23185,23 +23197,23 @@ fi fi esac -echo "$as_me:23188: checking for db.h" >&5 +echo "$as_me:23200: 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 23194 "configure" +#line 23206 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23198: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23210: \"$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:23204: \$? = $ac_status" >&5 + echo "$as_me:23216: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23220,11 +23232,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23223: result: $ac_cv_header_db_h" >&5 +echo "$as_me:23235: 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:23227: checking for version of db" >&5 +echo "$as_me:23239: 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 @@ -23235,10 +23247,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:23238: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:23250: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 23241 "configure" +#line 23253 "configure" #include "confdefs.h" $ac_includes_default @@ -23268,16 +23280,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23271: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23274: \$? = $ac_status" >&5 + echo "$as_me:23286: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23277: \"$ac_try\"") >&5 + { (eval echo "$as_me:23289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23280: \$? = $ac_status" >&5 + echo "$as_me:23292: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -23291,16 +23303,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:23294: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:23306: 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:23298: error: Cannot determine version of db" >&5 + { { echo "$as_me:23310: 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:23303: checking for db libraries" >&5 +echo "$as_me:23315: 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 @@ -23330,10 +23342,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:23333: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:23345: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 23336 "configure" +#line 23348 "configure" #include "confdefs.h" $ac_includes_default @@ -23388,16 +23400,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23391: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23394: \$? = $ac_status" >&5 + echo "$as_me:23406: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23397: \"$ac_try\"") >&5 + { (eval echo "$as_me:23409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23400: \$? = $ac_status" >&5 + echo "$as_me:23412: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -23417,11 +23429,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:23420: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:23432: 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:23424: error: Cannot determine library for db" >&5 + { { echo "$as_me:23436: 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 @@ -23447,7 +23459,7 @@ fi else - { { echo "$as_me:23450: error: Cannot find db.h" >&5 + { { echo "$as_me:23462: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -23462,7 +23474,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:23465: checking if we should include stdbool.h" >&5 +echo "$as_me:23477: 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 @@ -23470,7 +23482,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 23473 "configure" +#line 23485 "configure" #include "confdefs.h" int @@ -23482,23 +23494,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23485: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23497: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23488: \$? = $ac_status" >&5 + echo "$as_me:23500: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23491: \"$ac_try\"") >&5 + { (eval echo "$as_me:23503: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23494: \$? = $ac_status" >&5 + echo "$as_me:23506: \$? = $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 23501 "configure" +#line 23513 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -23514,16 +23526,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23517: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23520: \$? = $ac_status" >&5 + echo "$as_me:23532: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23523: \"$ac_try\"") >&5 + { (eval echo "$as_me:23535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23526: \$? = $ac_status" >&5 + echo "$as_me:23538: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -23537,13 +23549,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:23540: result: yes" >&5 +then echo "$as_me:23552: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23542: result: no" >&5 +else echo "$as_me:23554: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:23546: checking for builtin bool type" >&5 +echo "$as_me:23558: 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 @@ -23551,7 +23563,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 23554 "configure" +#line 23566 "configure" #include "confdefs.h" #include @@ -23566,16 +23578,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23581: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23572: \$? = $ac_status" >&5 + echo "$as_me:23584: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23575: \"$ac_try\"") >&5 + { (eval echo "$as_me:23587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23578: \$? = $ac_status" >&5 + echo "$as_me:23590: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -23588,9 +23600,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:23591: result: yes" >&5 +then echo "$as_me:23603: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23593: result: no" >&5 +else echo "$as_me:23605: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23607,10 +23619,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:23610: checking if we already have C++ library" >&5 + echo "$as_me:23622: checking if we already have C++ library" >&5 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 23613 "configure" +#line 23625 "configure" #include "confdefs.h" #include @@ -23624,16 +23636,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23630: \$? = $ac_status" >&5 + echo "$as_me:23642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23633: \"$ac_try\"") >&5 + { (eval echo "$as_me:23645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23636: \$? = $ac_status" >&5 + echo "$as_me:23648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_libstdcpp=yes else @@ -23642,7 +23654,7 @@ cat conftest.$ac_ext >&5 cf_have_libstdcpp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:23645: result: $cf_have_libstdcpp" >&5 + echo "$as_me:23657: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -23661,7 +23673,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:23664: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:23676: 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 @@ -23687,7 +23699,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 23690 "configure" +#line 23702 "configure" #include "confdefs.h" #include @@ -23701,16 +23713,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23707: \$? = $ac_status" >&5 + echo "$as_me:23719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23710: \"$ac_try\"") >&5 + { (eval echo "$as_me:23722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23713: \$? = $ac_status" >&5 + echo "$as_me:23725: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -23722,7 +23734,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:23725: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:23737: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="$CXXLIBS" @@ -23744,7 +23756,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:23747: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:23759: 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 @@ -23759,15 +23771,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:23762: \"$ac_try\"") >&5 +if { (eval echo "$as_me:23774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23765: \$? = $ac_status" >&5 + echo "$as_me:23777: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:23767: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:23779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23770: \$? = $ac_status" >&5 + echo "$as_me:23782: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -23778,10 +23790,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:23781: result: yes" >&5 + echo "$as_me:23793: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:23784: result: no" >&5 + echo "$as_me:23796: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23801,7 +23813,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:23804: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:23816: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -23822,7 +23834,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 23825 "configure" +#line 23837 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -23836,16 +23848,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23839: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23842: \$? = $ac_status" >&5 + echo "$as_me:23854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23845: \"$ac_try\"") >&5 + { (eval echo "$as_me:23857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23848: \$? = $ac_status" >&5 + echo "$as_me:23860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -23882,7 +23894,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 23885 "configure" +#line 23897 "configure" #include "confdefs.h" #include @@ -23896,16 +23908,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23899: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23902: \$? = $ac_status" >&5 + echo "$as_me:23914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23905: \"$ac_try\"") >&5 + { (eval echo "$as_me:23917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23908: \$? = $ac_status" >&5 + echo "$as_me:23920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -23938,7 +23950,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:23941: result: $cf_cxx_library" >&5 + echo "$as_me:23953: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -23954,7 +23966,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:23957: checking how to run the C++ preprocessor" >&5 +echo "$as_me:23969: 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 @@ -23971,18 +23983,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 23974 "configure" +#line 23986 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:23979: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23991: \"$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:23985: \$? = $ac_status" >&5 + echo "$as_me:23997: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24005,17 +24017,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 24008 "configure" +#line 24020 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:24012: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:24024: \"$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:24018: \$? = $ac_status" >&5 + echo "$as_me:24030: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24052,7 +24064,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:24055: result: $CXXCPP" >&5 +echo "$as_me:24067: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -24062,18 +24074,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 24065 "configure" +#line 24077 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:24070: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:24082: \"$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:24076: \$? = $ac_status" >&5 + echo "$as_me:24088: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24096,17 +24108,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 24099 "configure" +#line 24111 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:24103: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:24115: \"$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:24109: \$? = $ac_status" >&5 + echo "$as_me:24121: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24134,7 +24146,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:24137: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:24149: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -24149,23 +24161,23 @@ ac_main_return=return for ac_header in typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:24152: checking for $ac_header" >&5 +echo "$as_me:24164: 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 24158 "configure" +#line 24170 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:24162: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:24174: \"$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:24168: \$? = $ac_status" >&5 + echo "$as_me:24180: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24184,7 +24196,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:24187: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:24199: 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:24212: 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 24206 "configure" +#line 24218 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:24210: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:24222: \"$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:24216: \$? = $ac_status" >&5 + echo "$as_me:24228: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24232,7 +24244,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:24235: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:24247: 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:24258: 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 24249 "configure" +#line 24261 "configure" #include "confdefs.h" #include @@ -24263,16 +24275,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24278: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24269: \$? = $ac_status" >&5 + echo "$as_me:24281: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24272: \"$ac_try\"") >&5 + { (eval echo "$as_me:24284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24275: \$? = $ac_status" >&5 + echo "$as_me:24287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -24281,7 +24293,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:24284: result: $cf_iostream_namespace" >&5 + echo "$as_me:24296: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -24292,7 +24304,7 @@ EOF fi fi -echo "$as_me:24295: checking if we should include stdbool.h" >&5 +echo "$as_me:24307: 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 @@ -24300,7 +24312,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 24303 "configure" +#line 24315 "configure" #include "confdefs.h" int @@ -24312,23 +24324,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24315: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24327: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24318: \$? = $ac_status" >&5 + echo "$as_me:24330: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24321: \"$ac_try\"") >&5 + { (eval echo "$as_me:24333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24324: \$? = $ac_status" >&5 + echo "$as_me:24336: \$? = $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 24331 "configure" +#line 24343 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -24344,16 +24356,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24347: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24359: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24350: \$? = $ac_status" >&5 + echo "$as_me:24362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24353: \"$ac_try\"") >&5 + { (eval echo "$as_me:24365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24356: \$? = $ac_status" >&5 + echo "$as_me:24368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -24367,13 +24379,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:24370: result: yes" >&5 +then echo "$as_me:24382: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:24372: result: no" >&5 +else echo "$as_me:24384: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:24376: checking for builtin bool type" >&5 +echo "$as_me:24388: 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 @@ -24381,7 +24393,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 24384 "configure" +#line 24396 "configure" #include "confdefs.h" #include @@ -24396,16 +24408,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24399: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24402: \$? = $ac_status" >&5 + echo "$as_me:24414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24405: \"$ac_try\"") >&5 + { (eval echo "$as_me:24417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24408: \$? = $ac_status" >&5 + echo "$as_me:24420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -24418,13 +24430,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:24421: result: yes" >&5 +then echo "$as_me:24433: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:24423: result: no" >&5 +else echo "$as_me:24435: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:24427: checking for size of bool" >&5 +echo "$as_me:24439: 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 @@ -24435,7 +24447,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24438 "configure" +#line 24450 "configure" #include "confdefs.h" #include @@ -24477,15 +24489,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24492: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24483: \$? = $ac_status" >&5 + echo "$as_me:24495: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24485: \"$ac_try\"") >&5 + { (eval echo "$as_me:24497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24488: \$? = $ac_status" >&5 + echo "$as_me:24500: \$? = $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 @@ -24503,18 +24515,18 @@ fi fi rm -f cf_test.out -echo "$as_me:24506: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:24518: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:24512: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:24524: 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:24517: checking for special defines needed for etip.h" >&5 +echo "$as_me:24529: 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" @@ -24532,7 +24544,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 24535 "configure" +#line 24547 "configure" #include "confdefs.h" #include @@ -24546,16 +24558,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24549: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24561: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24552: \$? = $ac_status" >&5 + echo "$as_me:24564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24555: \"$ac_try\"") >&5 + { (eval echo "$as_me:24567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24558: \$? = $ac_status" >&5 + echo "$as_me:24570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:24591: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:24584: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:24596: 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 @@ -24598,7 +24610,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24601 "configure" +#line 24613 "configure" #include "confdefs.h" class TEST { @@ -24617,15 +24629,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24620: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24632: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24623: \$? = $ac_status" >&5 + echo "$as_me:24635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24625: \"$ac_try\"") >&5 + { (eval echo "$as_me:24637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24628: \$? = $ac_status" >&5 + echo "$as_me:24640: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -24644,7 +24656,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:24647: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:24659: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -24654,7 +24666,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:24657: checking if $CXX accepts static_cast" >&5 +echo "$as_me:24669: 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 @@ -24668,7 +24680,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 24671 "configure" +#line 24683 "configure" #include "confdefs.h" class NCursesPanel @@ -24712,16 +24724,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24727: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24718: \$? = $ac_status" >&5 + echo "$as_me:24730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24721: \"$ac_try\"") >&5 + { (eval echo "$as_me:24733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24724: \$? = $ac_status" >&5 + echo "$as_me:24736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -24739,7 +24751,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:24742: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:24754: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -24788,7 +24800,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:24791: checking for size of bool" >&5 +echo "$as_me:24803: 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 @@ -24799,7 +24811,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24802 "configure" +#line 24814 "configure" #include "confdefs.h" #include @@ -24841,15 +24853,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24847: \$? = $ac_status" >&5 + echo "$as_me:24859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24849: \"$ac_try\"") >&5 + { (eval echo "$as_me:24861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24852: \$? = $ac_status" >&5 + echo "$as_me:24864: \$? = $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 @@ -24867,25 +24879,25 @@ fi fi rm -f cf_test.out -echo "$as_me:24870: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:24882: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:24876: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:24888: 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:24882: checking for fallback type of bool" >&5 + echo "$as_me:24894: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in (i?86) cf_cv_type_of_bool=char ;; (*) cf_cv_type_of_bool=int ;; esac - echo "$as_me:24888: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:24900: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -24914,7 +24926,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:24917: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:24929: 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 @@ -24931,7 +24943,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:24934: checking for $ac_word" >&5 +echo "$as_me:24946: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24948,7 +24960,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:24951: found $ac_dir/$ac_word" >&5 + echo "$as_me:24963: found $ac_dir/$ac_word" >&5 break fi done @@ -24960,10 +24972,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:24963: result: $cf_TEMP_gnat" >&5 + echo "$as_me:24975: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:24966: result: no" >&5 + echo "$as_me:24978: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24973,7 +24985,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:24976: checking for $cf_prog_gnat version" >&5 +echo "$as_me:24988: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24984,7 +24996,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:24987: result: $cf_cv_gnat_version" >&5 +echo "$as_me:24999: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -25013,7 +25025,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:25016: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:25028: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test $cf_gprconfig = C then @@ -25032,10 +25044,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value - echo "$as_me:25035: result: $cf_gprconfig_value" >&5 + echo "$as_me:25047: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:25038: result: missing" >&5 + echo "$as_me:25050: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -25048,7 +25060,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:25051: checking for gnat version" >&5 +echo "$as_me:25063: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25059,7 +25071,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:25062: result: $cf_cv_gnat_version" >&5 +echo "$as_me:25074: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -25068,7 +25080,7 @@ case $cf_cv_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:25071: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:25083: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -25076,7 +25088,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:25079: checking for $ac_word" >&5 +echo "$as_me:25091: 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 @@ -25091,7 +25103,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:25094: found $ac_dir/$ac_word" >&5 +echo "$as_me:25106: found $ac_dir/$ac_word" >&5 break done @@ -25100,20 +25112,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:25103: result: $M4_exists" >&5 + echo "$as_me:25115: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:25106: result: no" >&5 + echo "$as_me:25118: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:25112: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:25124: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:25116: checking if GNAT works" >&5 + echo "$as_me:25128: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -25141,7 +25153,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:25144: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:25156: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -25153,7 +25165,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:25156: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:25168: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -25170,10 +25182,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:25173: result: $ADAFLAGS" >&5 + echo "$as_me:25185: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:25176: checking if GNATPREP supports -T option" >&5 +echo "$as_me:25188: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25183,11 +25195,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:25186: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:25198: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:25190: checking if GNAT supports generics" >&5 +echo "$as_me:25202: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_cv_gnat_version in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -25197,7 +25209,7 @@ case $cf_cv_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:25200: result: $cf_gnat_generics" >&5 +echo "$as_me:25212: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -25209,7 +25221,7 @@ else cf_generic_objects= fi -echo "$as_me:25212: checking if GNAT supports SIGINT" >&5 +echo "$as_me:25224: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25257,7 +25269,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:25260: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:25272: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -25270,7 +25282,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:25273: checking if GNAT supports project files" >&5 +echo "$as_me:25285: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_cv_gnat_version in (3.[0-9]*) @@ -25333,15 +25345,15 @@ CF_EOF esac ;; esac -echo "$as_me:25336: result: $cf_gnat_projects" >&5 +echo "$as_me:25348: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test $cf_gnat_projects = yes then - echo "$as_me:25342: checking if GNAT supports libraries" >&5 + echo "$as_me:25354: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:25344: result: $cf_gnat_libraries" >&5 + echo "$as_me:25356: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -25361,7 +25373,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:25364: checking for ada-compiler" >&5 +echo "$as_me:25376: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -25372,12 +25384,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:25375: result: $cf_ada_compiler" >&5 +echo "$as_me:25387: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:25380: checking for ada-include" >&5 +echo "$as_me:25392: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -25413,7 +25425,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25416: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:25428: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25422,10 +25434,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:25425: result: $ADA_INCLUDE" >&5 +echo "$as_me:25437: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:25428: checking for ada-objects" >&5 +echo "$as_me:25440: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -25461,7 +25473,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25464: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:25476: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25470,10 +25482,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:25473: result: $ADA_OBJECTS" >&5 +echo "$as_me:25485: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:25476: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:25488: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -25483,14 +25495,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:25486: result: $with_ada_sharedlib" >&5 +echo "$as_me:25498: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:25493: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:25505: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -25510,7 +25522,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:25513: checking for ada-libname" >&5 +echo "$as_me:25525: checking for ada-libname" >&5 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -25526,7 +25538,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:25529: result: $ADA_LIBNAME" >&5 +echo "$as_me:25541: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -25537,13 +25549,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:25540: checking for wchar_t" >&5 + echo "$as_me:25552: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 25546 "configure" +#line 25558 "configure" #include "confdefs.h" $ac_includes_default int @@ -25558,16 +25570,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25561: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25564: \$? = $ac_status" >&5 + echo "$as_me:25576: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25567: \"$ac_try\"") >&5 + { (eval echo "$as_me:25579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25570: \$? = $ac_status" >&5 + echo "$as_me:25582: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -25577,10 +25589,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:25580: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:25592: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:25583: checking size of wchar_t" >&5 +echo "$as_me:25595: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25589,7 +25601,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 25592 "configure" +#line 25604 "configure" #include "confdefs.h" $ac_includes_default int @@ -25601,21 +25613,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25616: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25607: \$? = $ac_status" >&5 + echo "$as_me:25619: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25610: \"$ac_try\"") >&5 + { (eval echo "$as_me:25622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25613: \$? = $ac_status" >&5 + echo "$as_me:25625: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 25618 "configure" +#line 25630 "configure" #include "confdefs.h" $ac_includes_default int @@ -25627,16 +25639,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25642: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25633: \$? = $ac_status" >&5 + echo "$as_me:25645: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25636: \"$ac_try\"") >&5 + { (eval echo "$as_me:25648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25639: \$? = $ac_status" >&5 + echo "$as_me:25651: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -25652,7 +25664,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 25655 "configure" +#line 25667 "configure" #include "confdefs.h" $ac_includes_default int @@ -25664,16 +25676,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25679: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25670: \$? = $ac_status" >&5 + echo "$as_me:25682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25673: \"$ac_try\"") >&5 + { (eval echo "$as_me:25685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25676: \$? = $ac_status" >&5 + echo "$as_me:25688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -25689,7 +25701,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 25692 "configure" +#line 25704 "configure" #include "confdefs.h" $ac_includes_default int @@ -25701,16 +25713,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25704: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25707: \$? = $ac_status" >&5 + echo "$as_me:25719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25710: \"$ac_try\"") >&5 + { (eval echo "$as_me:25722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25713: \$? = $ac_status" >&5 + echo "$as_me:25725: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -25723,12 +25735,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:25726: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:25738: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 25731 "configure" +#line 25743 "configure" #include "confdefs.h" $ac_includes_default int @@ -25744,15 +25756,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:25747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25750: \$? = $ac_status" >&5 + echo "$as_me:25762: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:25752: \"$ac_try\"") >&5 + { (eval echo "$as_me:25764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25755: \$? = $ac_status" >&5 + echo "$as_me:25767: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -25768,7 +25780,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:25771: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:25783: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:25784: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:25796: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -25799,7 +25811,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:25802: checking for library subsets" >&5 +echo "$as_me:25814: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -25853,7 +25865,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:25856: result: $LIB_SUBSETS" >&5 +echo "$as_me:25868: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -25884,7 +25896,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:25887: checking default library suffix" >&5 +echo "$as_me:25899: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -25895,10 +25907,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:25898: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:25910: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:25901: checking default library-dependency suffix" >&5 +echo "$as_me:25913: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -25981,10 +25993,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:25984: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:25996: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:25987: checking default object directory" >&5 +echo "$as_me:25999: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -26000,11 +26012,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:26003: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:26015: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:26007: checking c++ library-dependency suffix" >&5 +echo "$as_me:26019: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -26097,7 +26109,7 @@ else fi fi -echo "$as_me:26100: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:26112: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -26273,19 +26285,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:26276: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:26288: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:26285: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:26297: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26288: \$? = $ac_status" >&5 + echo "$as_me:26300: \$? = $ac_status" >&5 (exit $ac_status); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null @@ -26296,10 +26308,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 26299 "configure" +#line 26311 "configure" #include "confdefs.h" -#line 26302 "configure" +#line 26314 "configure" #include int cf_ldflags_static(FILE *fp); @@ -26314,16 +26326,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26329: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26320: \$? = $ac_status" >&5 + echo "$as_me:26332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26323: \"$ac_try\"") >&5 + { (eval echo "$as_me:26335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26326: \$? = $ac_status" >&5 + echo "$as_me:26338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -26346,7 +26358,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:26349: result: $cf_ldflags_static" >&5 + echo "$as_me:26361: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -26362,7 +26374,7 @@ fi ;; esac -echo "$as_me:26365: checking where we will install curses.h" >&5 +echo "$as_me:26377: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -26372,7 +26384,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:26375: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:26387: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -26380,7 +26392,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:26383: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:26395: 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 @@ -26408,7 +26420,7 @@ EOF # pkgsrc uses these -echo "$as_me:26411: checking for desired basename for form library" >&5 +echo "$as_me:26423: 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. @@ -26428,10 +26440,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:26431: result: $FORM_NAME" >&5 +echo "$as_me:26443: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:26434: checking for desired basename for menu library" >&5 +echo "$as_me:26446: 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. @@ -26451,10 +26463,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:26454: result: $MENU_NAME" >&5 +echo "$as_me:26466: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:26457: checking for desired basename for panel library" >&5 +echo "$as_me:26469: 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. @@ -26474,10 +26486,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:26477: result: $PANEL_NAME" >&5 +echo "$as_me:26489: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:26480: checking for desired basename for cxx library" >&5 +echo "$as_me:26492: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -26497,13 +26509,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:26500: result: $CXX_NAME" >&5 +echo "$as_me:26512: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:26506: checking for src modules" >&5 +echo "$as_me:26518: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -26572,7 +26584,7 @@ eval TEST_ROOT=\$${cf_map_lib_basename}_NAME fi fi done -echo "$as_me:26575: result: $cf_cv_src_modules" >&5 +echo "$as_me:26587: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -26733,7 +26745,7 @@ case $cf_cv_system_name in (*-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:26736: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:26748: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -26744,7 +26756,7 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -echo "$as_me:26747: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:26759: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN @@ -26760,7 +26772,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:26763: result: $PKG_CFLAGS" >&5 +echo "$as_me:26775: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -26821,7 +26833,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 -echo "${as_me:-configure}:26824: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:26836: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -26848,7 +26860,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:26851: checking for linker search path" >&5 +echo "$as_me:26863: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26912,7 +26924,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:26915: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:26927: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` @@ -27002,7 +27014,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:27005: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:27017: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -27180,7 +27192,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:27183: error: ambiguous option: $1 + { { echo "$as_me:27195: 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;} @@ -27199,7 +27211,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:27202: error: unrecognized option: $1 + -*) { { echo "$as_me:27214: 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;} @@ -27322,7 +27334,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:27325: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:27337: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -27588,6 +27600,8 @@ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t s,@NCURSES_IMPEXP@,$NCURSES_IMPEXP,;t t s,@NCURSES_CXX_IMPEXP@,$NCURSES_CXX_IMPEXP,;t t s,@NCURSES_INTEROP_FUNCS@,$NCURSES_INTEROP_FUNCS,;t t +s,@EXP_WIN32_DRIVER@,$EXP_WIN32_DRIVER,;t t +s,@INTERNALS_HDR@,$INTERNALS_HDR,;t t s,@ECHO_LT@,$ECHO_LT,;t t s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t @@ -27823,7 +27837,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:27826: creating $ac_file" >&5 + { echo "$as_me:27840: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -27841,7 +27855,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:27844: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:27858: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -27854,7 +27868,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:27857: error: cannot find input file: $f" >&5 + { { echo "$as_me:27871: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -27870,7 +27884,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:27873: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:27887: 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;} @@ -27879,7 +27893,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:27882: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:27896: 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;} @@ -27916,7 +27930,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:27919: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:27933: 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;} @@ -27927,7 +27941,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:27930: WARNING: Some variables may not be substituted: + { echo "$as_me:27944: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -27976,7 +27990,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:27979: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:27993: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -27987,7 +28001,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:27990: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:28004: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -28000,7 +28014,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:28003: error: cannot find input file: $f" >&5 + { { echo "$as_me:28017: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -28058,7 +28072,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:28061: $ac_file is unchanged" >&5 + { echo "$as_me:28075: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -28445,7 +28459,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:28448: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:28462: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 0f04299a..f46474e7 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.721 2020/08/29 22:40:49 tom Exp $ +dnl $Id: configure.in,v 1.724 2020/09/06 22:23:32 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20200111) -AC_REVISION($Revision: 1.721 $) +AC_REVISION($Revision: 1.724 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1553,13 +1553,27 @@ case $cf_cv_system_name in (*mingw32*|*mingw64*|*-msvc*) AC_MSG_CHECKING(if you want experimental-Windows driver) AC_ARG_ENABLE(exp-win32, - [ --enable-exp-win32 compile with experimental-Windows], + [ --enable-exp-win32 compile with experimental-Windows driver], [with_exp_win32=$enableval], [with_exp_win32=no]) AC_MSG_RESULT($with_exp_win32) - test "x$with_exp_win32" = xyes && AC_DEFINE(EXP_WIN32_DRIVER,1,[Define to 1 to compile with experimental win32 driver]) + if test "x$with_exp_win32" = xyes + then + AC_DEFINE(EXP_WIN32_DRIVER,1,[Define to 1 to compile with experimental win32 driver]) + EXP_WIN32_DRIVER=1 + INTERNALS_HDR='[$](INCDIR)/nc_win32.h' + else + INTERNALS_HDR='[$](INCDIR)/nc_mingw.h' + EXP_WIN32_DRIVER=0 + fi + ;; +(*) + EXP_WIN32_DRIVER=0 + INTERNALS_HDR= ;; esac +AC_SUBST(EXP_WIN32_DRIVER) +AC_SUBST(INTERNALS_HDR) ############################################################################### CF_HELP_MESSAGE(Testing/development Options:) diff --git a/dist.mk b/dist.mk index 1a26f01d..382761aa 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1371 2020/08/31 19:51:51 tom Exp $ +# $Id: dist.mk,v 1.1373 2020/09/06 20:05:44 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 2 -NCURSES_PATCH = 20200831 +NCURSES_PATCH = 20200906 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in index 3c7eb72c..a3f97c47 100644 --- a/include/MKterm.h.awk.in +++ b/include/MKterm.h.awk.in @@ -60,7 +60,7 @@ BEGIN { print "/* and: Thomas E. Dickey 1995-on */" print "/****************************************************************************/" print "" - print "/* $Id: MKterm.h.awk.in,v 1.76 2020/05/30 19:24:03 tom Exp $ */" + print "/* $Id: MKterm.h.awk.in,v 1.77 2020/09/05 23:08:27 tom Exp $ */" print "" print "/*" print "** term.h -- Definition of struct term" @@ -127,9 +127,14 @@ BEGIN { print "" print "#else /* !HAVE_TERMIO_H */" print "" - print "#if _WIN32" - print "# include " - print "# define TTY struct termios" + print "#if (defined(_WIN32) || defined(_WIN64))" + print "#if @EXP_WIN32_DRIVER@" + print "#include " + print "#define TTY struct winconmode" + print "#else" + print "#include " + print "#define TTY struct termios" + print "#endif" print "#else" print "#undef TERMIOS" print "#include " @@ -143,6 +148,9 @@ BEGIN { print "#ifdef TERMIOS" print "#define GET_TTY(fd, buf) tcgetattr(fd, buf)" print "#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)" + print "#elif @EXP_WIN32_DRIVER@ && (defined(_WIN32) || defined(_WIN64))" + print "#define GET_TTY(fd, buf) _nc_console_getmode(_nc_console_fd2handle(fd),buf)" + print "#define SET_TTY(fd, buf) _nc_console_setmode(_nc_console_fd2handle(fd),buf)" print "#else" print "#define GET_TTY(fd, buf) gtty(fd, buf)" print "#define SET_TTY(fd, buf) stty(fd, buf)" diff --git a/include/nc_win32.h b/include/nc_win32.h index d7a23038..8fa39869 100644 --- a/include/nc_win32.h +++ b/include/nc_win32.h @@ -31,7 +31,7 @@ * Author: Thomas Dickey, 2008-on * ****************************************************************************/ -/* $Id: nc_win32.h,v 1.3 2020/08/29 20:56:43 tom Exp $ */ +/* $Id: nc_win32.h,v 1.7 2020/09/06 20:53:55 tom Exp $ */ #ifndef NC_WIN32_H #define NC_WIN32_H 1 @@ -82,7 +82,7 @@ extern "C" { #undef HAVE_GETTIMEOFDAY #define HAVE_GETTIMEOFDAY 1 extern NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *); - + #undef wcwidth #define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs)) extern NCURSES_EXPORT(int) _nc_wcwidth(wchar_t); @@ -102,16 +102,20 @@ extern NCURSES_EXPORT(int) _nc_console_keyok(int keycode,int flag); extern NCURSES_EXPORT(bool) _nc_console_keyExist(int keycode); extern NCURSES_EXPORT(bool) _nc_console_checkinit(bool initFlag, bool assumeTermInfo); extern NCURSES_EXPORT(int) _nc_console_vt_supported(void); + #ifdef _NC_CHECK_MINTTY extern NCURSES_EXPORT(int) _nc_console_checkmintty(int fd, LPHANDLE pMinTTY); #endif #undef CHECK_TERM_ENV #define MS_TERMINAL "ms-terminal" -#define CHECK_TERM_ENV(env,isNull,NOTERM) (isNull = ((env==0)||(*env==0)), \ - (env = (isNull ? \ - _nc_console_vt_supported() ? MS_TERMINAL: NOTERM : env) , \ - (isNull = ((env==0)||(*env==0))))) +#define CHECK_TERM_ENV(term_env, no_terminal) \ + (term_env = (NonEmpty(term_env) \ + ? term_env \ + : (_nc_console_vt_supported() \ + ? MS_TERMINAL \ + : no_terminal)), \ + !NonEmpty(term_env)) /* * Various Console mode definitions @@ -129,7 +133,7 @@ extern NCURSES_EXPORT(int) _nc_console_checkmintty(int fd, LPHANDLE pMinTTY); #define CONMODE_NORAW (ENABLE_PROCESSED_INPUT|ENABLE_LINE_INPUT) #define CONMODE_NOCBREAK (ENABLE_LINE_INPUT) - + #if defined(USE_TERM_DRIVER) && defined(USE_WIN32CON_DRIVER) extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER; #endif @@ -161,7 +165,7 @@ typedef struct { TTY originalMode; } ConsoleInfo; -extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE; +extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE; #define WINCONSOLE _nc_CONSOLE #define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count)) diff --git a/include/ncurses_dll.h.in b/include/ncurses_dll.h.in index ac351e7c..437c54de 100644 --- a/include/ncurses_dll.h.in +++ b/include/ncurses_dll.h.in @@ -26,7 +26,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ****************************************************************************/ -/* $Id: ncurses_dll.h.in,v 1.16 2020/07/04 23:07:54 tom Exp $ */ +/* $Id: ncurses_dll.h.in,v 1.17 2020/09/05 17:58:47 juergen Exp $ */ #ifndef NCURSES_DLL_H_incl #define NCURSES_DLL_H_incl 1 @@ -81,7 +81,7 @@ /* * These symbols hide dllimport/dllexport, for compilers which care about it. */ -#if defined(__CYGWIN__) || defined(_WIN32) +#if defined(__CYGWIN__) || (defined(_WIN32) || defined(_WIN64)) # if defined(NCURSES_STATIC) /* "static" here only implies "not-a-DLL" */ # define NCURSES_EXPORT_GENERAL_IMPORT # define NCURSES_EXPORT_GENERAL_EXPORT diff --git a/misc/terminfo.src b/misc/terminfo.src index 2cbcf67c..997da1e5 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.811 $ -# $Date: 2020/08/24 22:30:17 $ +# $Revision: 1.812 $ +# $Date: 2020/09/05 17:45:56 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -2732,8 +2732,8 @@ vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am, # host writable status line, yet another different DRCS matrix size, # and such, but they add the DEC Technical character set, Multiple text # pages, selectable length pages, and the like. The difference between -# the vt330 and vt340 is that the latter has only 2 planes and a monochrome -# monitor, the former has 4 planes and a color monitor. These terminals +# the vt330 and vt340 is that the former has only 2 planes and a monochrome +# monitor, the latter has 4 planes and a color monitor. These terminals # support VT131 and ANSI block mode, but as with much of these things, # termcap/terminfo doesn't deal with these features. # @@ -2790,7 +2790,7 @@ vt420+lrmm|VT420 left/right margins, # macros, and other features too numerous to remember right now. TERMCAP # can only take advantage of a few of these added features. # -# Note that this entry is are set up in what was the standard way for GNU +# Note that this entry is set up in what was the standard way for GNU # Emacs v18 terminal modes to deal with the cursor keys in that the arrow # keys were switched into application mode at the same time the numeric pad # is switched into application mode. This changes the definitions of the @@ -2967,7 +2967,7 @@ dec-vt220|DOS tnvt200 terminal emulator, # Zstem340 is an (IMHO) excellent VT emulator for PC's. I recommend it to # anyone who needs PC VT340 emulation. (or anything below that level, for # that matter -- DEC's ALL-in-1 seems happy with it, as does INFOPLUS's -# RDBM systems, it includes ReGIS and SiXel support! I'm impressed... +# RDBM systems, it includes ReGIS and Sixel support! I'm impressed... # I can send the address if requested. # (z340: changed garbled \E[5?l to \E[?5l, DEC smooth scroll off -- esr) # From: Adam Thompson Sept 10 1995 @@ -26623,4 +26623,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + correct ti916 cup (report by Florian Weimer). # + improve ndr9500 (report by Florian Weimer). # +# 2020-09-05 +# + correct description of vt330/vt340 (Ross Combs). +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in index 5eea8ad1..cfe1a4ac 100644 --- a/ncurses/Makefile.in +++ b/ncurses/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.175 2020/08/29 18:43:21 juergen Exp $ +# $Id: Makefile.in,v 1.176 2020/09/05 18:58:52 tom Exp $ ############################################################################## # Copyright 2018-2019,2020 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # @@ -178,7 +178,7 @@ AUTO_SRC = \ init_keytry.h \ keys.list -HEADER_DEPS = \ +HEADER_DEPS = @INTERNALS_HDR@ \ ../include/ncurses_cfg.h \ ../include/ncurses_def.h \ ../include/ncurses_dll.h \ @@ -186,7 +186,6 @@ HEADER_DEPS = \ ../include/term.h \ ../include/unctrl.h \ $(INCDIR)/nc_alloc.h \ - $(INCDIR)/nc_mingw.h \ $(INCDIR)/nc_panel.h \ $(INCDIR)/nc_string.h \ $(INCDIR)/nc_termios.h \ diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c index 2b0abfce..38537591 100644 --- a/ncurses/base/lib_getch.c +++ b/ncurses/base/lib_getch.c @@ -44,7 +44,7 @@ #define NEED_KEY_EVENT #include -MODULE_ID("$Id: lib_getch.c,v 1.140 2020/07/18 20:02:24 tom Exp $") +MODULE_ID("$Id: lib_getch.c,v 1.141 2020/09/05 22:50:47 tom Exp $") #include @@ -135,7 +135,7 @@ _nc_use_meta(WINDOW *win) } #ifdef USE_TERM_DRIVER -# ifdef _WIN32 +# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER) static HANDLE _nc_get_handle(int fd) { @@ -156,7 +156,14 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) #ifdef USE_TERM_DRIVER TERMINAL_CONTROL_BLOCK *TCB = TCBOf(sp); rc = TCBOf(sp)->drv->td_testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl)); -# ifdef _WIN32 +# if defined(EXP_WIN32_DRIVER) + /* if we emulate terminfo on console, we have to use the console routine */ + if (IsTermInfoOnConsole(sp)) { + rc = _nc_console_testmouse(sp, + _nc_console_handle(sp->_ifd), + delay EVENTLIST_2nd(evl)); + } else +# elif defined(_NC_WINDOWS) /* if we emulate terminfo on console, we have to use the console routine */ if (IsTermInfoOnConsole(sp)) { HANDLE fd = _nc_get_handle(sp->_ifd); @@ -164,29 +171,36 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) } else # endif rc = TCB->drv->td_testmouse(TCB, delay EVENTLIST_2nd(evl)); -#else -#if USE_SYSMOUSE +#else /* !USE_TERM_DRIVER */ +# if USE_SYSMOUSE if ((sp->_mouse_type == M_SYSMOUSE) && (sp->_sysmouse_head < sp->_sysmouse_tail)) { rc = TW_MOUSE; } else -#endif +# endif { +# if defined(EXP_WIN32_DRIVER) + rc = _nc_console_testmouse(sp, + _nc_console_handle(sp->_ifd), + delay + EVENTLIST_2nd(evl)); +# else rc = _nc_timed_wait(sp, TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl)); -#if USE_SYSMOUSE +# endif +# if USE_SYSMOUSE if ((sp->_mouse_type == M_SYSMOUSE) && (sp->_sysmouse_head < sp->_sysmouse_tail) && (rc == 0) && (errno == EINTR)) { rc |= TW_MOUSE; } -#endif +# endif } -#endif +#endif /* USE_TERM_DRIVER */ return rc; } @@ -291,31 +305,54 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) } else #endif { /* Can block... */ -#ifdef USE_TERM_DRIVER +#if defined(USE_TERM_DRIVER) int buf; -#ifdef _WIN32 +# if defined(EXP_WIN32_DRIVER) + if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) { +# if USE_PTHREADS_EINTR + if ((pthread_self) && (pthread_kill) && (pthread_equal)) + _nc_globals.read_thread = pthread_self(); +# endif + n = _nc_console_read(sp, + _nc_console_handle(sp->_ifd), + &buf); +# if USE_PTHREADS_EINTR + _nc_globals.read_thread = 0; +# endif + } else +# elif defined(_NC_WINDOWS) if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) n = _nc_mingw_console_read(sp, _nc_get_handle(sp->_ifd), &buf); else -#endif +# endif /* EXP_WIN32_DRIVER */ n = CallDriver_1(sp, td_read, &buf); ch = buf; -#else +#else /* !USE_TERM_DRIVER */ +#if defined(EXP_WIN32_DRIVER) + int buf; +#endif unsigned char c2 = 0; -# if USE_PTHREADS_EINTR -# if USE_WEAK_SYMBOLS +#if USE_PTHREADS_EINTR +#if USE_WEAK_SYMBOLS if ((pthread_self) && (pthread_kill) && (pthread_equal)) -# endif +#endif _nc_globals.read_thread = pthread_self(); -# endif +#endif +#if defined(EXP_WIN32_DRIVER) + n = _nc_console_read(sp, + _nc_console_handle(sp->_ifd), + &buf); + c2 = buf; +#else n = (int) read(sp->_ifd, &c2, (size_t) 1); +#endif #if USE_PTHREADS_EINTR _nc_globals.read_thread = 0; #endif ch = c2; -#endif +#endif /* USE_TERM_DRIVER */ } if ((n == -1) || (n == 0)) { diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c index 2ace0924..f663819d 100644 --- a/ncurses/base/lib_initscr.c +++ b/ncurses/base/lib_initscr.c @@ -46,7 +46,7 @@ #include /* needed for ISC */ #endif -MODULE_ID("$Id: lib_initscr.c,v 1.45 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_initscr.c,v 1.47 2020/09/06 20:48:55 tom Exp $") NCURSES_EXPORT(WINDOW *) initscr(void) @@ -66,10 +66,9 @@ initscr(void) _nc_globals.init_screen = TRUE; - if ((env = getenv("TERM")) == 0 - || *env == '\0') { - env = "unknown"; - } + env = getenv("TERM"); + (void) CHECK_TERM_ENV(env, "unknown"); + if ((name = strdup(env)) == NULL) { fprintf(stderr, "Error opening allocating $TERM.\n"); ExitProgram(EXIT_FAILURE); diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c index ac897906..bba97ba1 100644 --- a/ncurses/base/lib_newterm.c +++ b/ncurses/base/lib_newterm.c @@ -49,7 +49,7 @@ #include -MODULE_ID("$Id: lib_newterm.c,v 1.102 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_newterm.c,v 1.103 2020/09/05 21:34:04 tom Exp $") #ifdef USE_TERM_DRIVER #define NumLabels InfoOf(SP_PARM).numlabels @@ -88,6 +88,12 @@ _nc_initscr(NCURSES_SP_DCL0) buf.c_oflag &= (unsigned) ~(ONLCR); #elif HAVE_SGTTY_H buf.sg_flags &= ~(ECHO | CRMOD); +#elif defined(EXP_WIN32_DRIVER) + buf.dwFlagIn = CONMODE_IN_DEFAULT; + buf.dwFlagOut = CONMODE_OUT_DEFAULT | VT_FLAG_OUT; + if (WINCONSOLE.isTermInfoConsole) { + buf.dwFlagIn |= VT_FLAG_IN; + } #else memset(&buf, 0, sizeof(buf)); #endif @@ -195,6 +201,11 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx current = CURRENT_SCREEN; its_term = (current ? current->_term : 0); +#if defined(EXP_WIN32_DRIVER) + _setmode(fileno(_ifp), _O_BINARY); + _setmode(fileno(_ofp), _O_BINARY); +#endif + INIT_TERM_DRIVER(); /* this loads the capability entry, then sets LINES and COLS */ if ( diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index e85828e6..1390221e 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -35,7 +35,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.634 2020/08/29 20:11:24 tom Exp $ + * $Id: curses.priv.h,v 1.636 2020/09/06 20:53:41 tom Exp $ * * curses.priv.h * @@ -297,12 +297,11 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t); #define NO_TERMINAL 0 #endif -#define CHECK_TERM_ENV(env, isNull, NOTERM) \ - (isNull = ((env == 0) || (*env == 0)), \ - (env = (isNull \ - ? NOTERM \ - : env), \ - (isNull = ((env == 0) || (*env == 0))))) +#define CHECK_TERM_ENV(term_env, no_terminal) \ + (term_env = (NonEmpty(term_env) \ + ? term_env \ + : no_terminal), \ + !NonEmpty(term_env)) /* * Note: ht/cbt expansion flakes out randomly under Linux 1.1.47, but only diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c index 4f72de50..311c41ac 100644 --- a/ncurses/tinfo/lib_baudrate.c +++ b/ncurses/tinfo/lib_baudrate.c @@ -84,7 +84,7 @@ #undef USE_OLD_TTY #endif /* USE_OLD_TTY */ -MODULE_ID("$Id: lib_baudrate.c,v 1.44 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_baudrate.c,v 1.45 2020/09/05 21:15:32 tom Exp $") /* * int @@ -99,6 +99,7 @@ struct speed { int actual_speed; /* the actual speed */ }; +#if !defined(EXP_WIN32_DRIVER) #define DATA(number) { B##number, number } static struct speed const speeds[] = @@ -188,10 +189,16 @@ static struct speed const speeds[] = #endif #endif }; +#endif /* !EXP_WIN32_DRIVER */ NCURSES_EXPORT(int) _nc_baudrate(int OSpeed) { +#if defined(EXP_WIN32_DRIVER) + /* On Windows this is a noop */ + (void) OSpeed; + return (OK); +#else #if !USE_REENTRANT static int last_OSpeed; static int last_baudrate; @@ -230,13 +237,16 @@ _nc_baudrate(int OSpeed) #endif } return (result); +#endif /* !EXP_WIN32_DRIVER */ } NCURSES_EXPORT(int) _nc_ospeed(int BaudRate) { int result = 1; - +#if defined(EXP_WIN32_DRIVER) + (void) BaudRate; +#else if (BaudRate >= 0) { unsigned i; @@ -247,6 +257,7 @@ _nc_ospeed(int BaudRate) } } } +#endif return (result); } @@ -257,6 +268,9 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) T((T_CALLED("baudrate(%p)"), (void *) SP_PARM)); +#if defined(EXP_WIN32_DRIVER) + result = OK; +#else /* * In debugging, allow the environment symbol to override when we're * redirecting to a file, so we can construct repeatable test-cases @@ -290,7 +304,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) } else { result = ERR; } - +#endif /* !EXP_WIN32_DRIVER */ returnCode(result); } diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c index 482657ad..84ec299f 100644 --- a/ncurses/tinfo/lib_kernel.c +++ b/ncurses/tinfo/lib_kernel.c @@ -49,7 +49,7 @@ #include -MODULE_ID("$Id: lib_kernel.c,v 1.32 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_kernel.c,v 1.33 2020/09/05 21:37:57 tom Exp $") static int _nc_vdisable(void) @@ -92,6 +92,8 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0) result = termp->Ottyb.c_cc[VERASE]; if (result == _nc_vdisable()) result = ERR; +#elif defined(EXP_WIN32_DRIVER) + result = ERR; #else result = termp->Ottyb.sg_erase; #endif @@ -127,6 +129,8 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0) result = termp->Ottyb.c_cc[VKILL]; if (result == _nc_vdisable()) result = ERR; +#elif defined(EXP_WIN32_DRIVER) + result = ERR; #else result = termp->Ottyb.sg_kill; #endif @@ -162,7 +166,11 @@ NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0) #else errno = 0; do { +#if defined(EXP_WIN32_DRIVER) + _nc_console_flush(_nc_console_fd2handle(termp->Filedes)); +#else ioctl(termp->Filedes, TIOCFLUSH, 0); +#endif } while (errno == EINTR); #endif diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c index a691a266..91003ae4 100644 --- a/ncurses/tinfo/lib_raw.c +++ b/ncurses/tinfo/lib_raw.c @@ -50,7 +50,7 @@ #include -MODULE_ID("$Id: lib_raw.c,v 1.24 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_raw.c,v 1.25 2020/09/05 21:29:10 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -97,6 +97,8 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) buf.c_iflag &= (unsigned) ~(COOKED_INPUT); buf.c_cc[VMIN] = 1; buf.c_cc[VTIME] = 0; +#elif defined(EXP_WIN32_DRIVER) + buf.dwFlagIn &= ~CONMODE_NORAW; #else buf.sg_flags |= RAW; #endif @@ -152,6 +154,9 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) buf.c_lflag |= ISIG; buf.c_cc[VMIN] = 1; buf.c_cc[VTIME] = 0; +#elif defined(EXP_WIN32_DRIVER) + buf.dwFlagIn |= CONMODE_NORAW; + buf.dwFlagIn &= ~CONMODE_NOCBREAK; #else buf.sg_flags |= CBREAK; #endif @@ -231,6 +236,8 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) buf.c_lflag |= ISIG | ICANON | (termp->Ottyb.c_lflag & IEXTEN); buf.c_iflag |= COOKED_INPUT; +#elif defined(EXP_WIN32_DRIVER) + buf.dwFlagIn |= CONMODE_NORAW; #else buf.sg_flags &= ~(RAW | CBREAK); #endif @@ -283,6 +290,8 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) #ifdef TERMIOS buf.c_lflag |= ICANON; buf.c_iflag |= ICRNL; +#elif defined(EXP_WIN32_DRIVER) + buf.dwFlagIn |= (CONMODE_NOCBREAK | CONMODE_NORAW); #else buf.sg_flags &= ~CBREAK; #endif diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c index a6527bfd..73e5a323 100644 --- a/ncurses/tinfo/lib_setup.c +++ b/ncurses/tinfo/lib_setup.c @@ -49,7 +49,7 @@ #include #endif -MODULE_ID("$Id: lib_setup.c,v 1.207 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_setup.c,v 1.210 2020/09/06 21:03:33 tom Exp $") /**************************************************************************** * @@ -305,11 +305,19 @@ _nc_get_screensize(SCREEN *sp, bool useEnv = _nc_prescreen.use_env; bool useTioctl = _nc_prescreen.use_tioctl; +#ifdef EXP_WIN32_DRIVER + /* If we are here, then Windows console is used in terminfo mode. + We need to figure out the size using the console API + */ + _nc_console_size(linep, colp); + T(("screen size: winconsole lines = %d columns = %d", *linep, *colp)); +#else /* figure out the size of the screen */ T(("screen size: terminfo lines = %d columns = %d", lines, columns)); *linep = (int) lines; *colp = (int) columns; +#endif #if NCURSES_SP_FUNCS if (sp) { @@ -566,7 +574,7 @@ NCURSES_EXPORT(int) _nc_unicode_locale(void) { int result = 0; -#if defined(_WIN32) && USE_WIDEC_SUPPORT +#if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT result = 1; #elif HAVE_LANGINFO_CODESET char *env = nl_langinfo(CODESET); @@ -655,13 +663,15 @@ TINFO_SETUP_TERM(TERMINAL **tp, if (tname == 0) { tname = getenv("TERM"); - if (tname == 0 || *tname == '\0') { -#ifdef USE_TERM_DRIVER +#if defined(USE_TERM_DRIVER) && !defined(EXP_WIN32_DRIVER) + if (!NonEmpty(tname)) tname = "unknown"; #else + if (!CHECK_TERM_ENV(tname, NO_TERMINAL)) { + T(("Failure with TERM=%s", tname)); ret_error0(TGETENT_ERR, "TERM environment variable not set.\n"); -#endif } +#endif } myname = strdup(tname); diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c index bfde26ef..30944d35 100644 --- a/ncurses/tinfo/lib_tputs.c +++ b/ncurses/tinfo/lib_tputs.c @@ -52,7 +52,7 @@ #include /* ospeed */ #include -MODULE_ID("$Id: lib_tputs.c,v 1.103 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tputs.c,v 1.104 2020/09/05 18:08:11 tom Exp $") NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ @@ -129,7 +129,6 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) TR(TRACE_CHARPUT, ("flushing %ld bytes", (unsigned long) amount)); while (amount) { ssize_t res = write(SP_PARM->_ofd, buf, amount); - if (res > 0) { /* if the write was incomplete, try again */ amount -= (size_t) res; diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c index bfcd64af..6363a805 100644 --- a/ncurses/tinfo/lib_ttyflags.c +++ b/ncurses/tinfo/lib_ttyflags.c @@ -42,7 +42,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_ttyflags.c,v 1.34 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_ttyflags.c,v 1.36 2020/09/05 22:54:47 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) @@ -156,6 +156,8 @@ NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0) #ifdef TERMIOS if (termp->Ottyb.c_oflag & OFLAGS_TABS) tab = back_tab = NULL; +#elif defined(EXP_WIN32_DRIVER) + /* noop */ #else if (termp->Ottyb.sg_flags & XTABS) tab = back_tab = NULL; @@ -193,6 +195,8 @@ NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0) if (_nc_get_tty_mode(&termp->Nttyb) == OK) { #ifdef TERMIOS termp->Nttyb.c_oflag &= (unsigned) (~OFLAGS_TABS); +#elif defined(EXP_WIN32_DRIVER) + /* noop */ #else termp->Nttyb.sg_flags &= (unsigned) (~XTABS); #endif diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index 14e5d90b..a760d135 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -35,7 +35,7 @@ #include -MODULE_ID("$Id: lib_tracebits.c,v 1.28 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.30 2020/09/05 22:54:47 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -72,9 +72,15 @@ MODULE_ID("$Id: lib_tracebits.c,v 1.28 2020/02/02 23:34:34 tom Exp $") #ifdef TRACE +#if defined(EXP_WIN32_DRIVER) +#define BITNAMELEN 36 +#else +#define BITNAMELEN 8 +#endif + typedef struct { unsigned int val; - const char name[8]; + const char name[BITNAMELEN]; } BITNAMES; #define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) @@ -212,6 +218,36 @@ _nc_trace_ttymode(TTY * tty) if (tty->c_lflag & ALLLOCAL) lookup_bits(buf, lflags, "lflags", tty->c_lflag); } +#elif defined(EXP_WIN32_DRIVER) +#define DATA(name) { name, { #name } } + static const BITNAMES dwFlagsOut[] = + { + DATA(ENABLE_PROCESSED_OUTPUT), + DATA(ENABLE_WRAP_AT_EOL_OUTPUT), + DATA(ENABLE_VIRTUAL_TERMINAL_PROCESSING), + DATA(DISABLE_NEWLINE_AUTO_RETURN), + DATA(ENABLE_LVB_GRID_WORLDWIDE) + }; + static const BITNAMES dwFlagsIn[] = + { + DATA(ENABLE_PROCESSED_INPUT), + DATA(ENABLE_LINE_INPUT), + DATA(ENABLE_ECHO_INPUT), + DATA(ENABLE_MOUSE_INPUT), + DATA(ENABLE_INSERT_MODE), + DATA(ENABLE_QUICK_EDIT_MODE), + DATA(ENABLE_EXTENDED_FLAGS), + DATA(ENABLE_AUTO_POSITION), + DATA(ENABLE_VIRTUAL_TERMINAL_INPUT) + }; + + buf = _nc_trace_buf(0, + 8 + sizeof(dwFlagsOut) + + 8 + sizeof(dwFlagsIn)); + if (buf != 0) { + lookup_bits(buf, dwFlagsIn, "dwIn", tty->dwFlagIn); + lookup_bits(buf, dwFlagsOut, "dwOut", tty->dwFlagOut); + } #else /* reference: ttcompat(4M) on SunOS 4.1 */ #ifndef EVENP diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index fa26472a..81f939be 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200831) unstable; urgency=low +ncurses6 (6.2+20200906) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 + -- Thomas E. Dickey Sun, 06 Sep 2020 16:05:44 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index fa26472a..81f939be 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200831) unstable; urgency=low +ncurses6 (6.2+20200906) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 + -- Thomas E. Dickey Sun, 06 Sep 2020 16:05:44 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 936003ed..fbfc23d0 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200831) unstable; urgency=low +ncurses6 (6.2+20200906) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Mon, 31 Aug 2020 15:51:51 -0400 + -- Thomas E. Dickey Sun, 06 Sep 2020 16:05:44 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 17561615..fcc75b5e 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.415 2020/08/31 19:51:51 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.417 2020/09/06 20:05:44 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "2" !define VERSION_YYYY "2020" -!define VERSION_MMDD "0831" +!define VERSION_MMDD "0906" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index a5c08994..fa77f55d 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.2 -Release: 20200831 +Release: 20200906 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index e99aefa2..a665987e 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20200831 +Release: 20200906 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 49c36532..37aae7aa 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20200831 +Release: 20200906 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 6b84762d..3dc177d0 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -31,7 +31,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.51 2020/08/01 21:07:50 tom Exp $ + * $Id: progs.priv.h,v 1.52 2020/09/05 19:35:06 tom Exp $ * * progs.priv.h * @@ -115,6 +115,11 @@ extern char *optarg; extern int optind; #endif /* HAVE_GETOPT_H */ +#undef _NC_WINDOWS +#if (defined(_WIN32) || defined(_WIN64)) +#define _NC_WINDOWS 1 +#endif + #define NCURSES_INTERNALS 1 #define NCURSES_OPAQUE 0 diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c index 2e118ae5..dbe8f679 100644 --- a/progs/reset_cmd.c +++ b/progs/reset_cmd.c @@ -53,7 +53,7 @@ #include #endif -MODULE_ID("$Id: reset_cmd.c,v 1.21 2020/05/27 23:46:20 tom Exp $") +MODULE_ID("$Id: reset_cmd.c,v 1.23 2020/09/05 22:54:47 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -363,6 +363,9 @@ default_erase(void) void set_control_chars(TTY * tty_settings, int my_erase, int my_intr, int my_kill) { +#if defined(EXP_WIN32_DRIVER) + /* noop */ +#else if (DISABLED(tty_settings->c_cc[VERASE]) || my_erase >= 0) { tty_settings->c_cc[VERASE] = UChar((my_erase >= 0) ? my_erase @@ -380,6 +383,7 @@ set_control_chars(TTY * tty_settings, int my_erase, int my_intr, int my_kill) ? my_kill : CKILL); } +#endif } /* @@ -389,6 +393,9 @@ set_control_chars(TTY * tty_settings, int my_erase, int my_intr, int my_kill) void set_conversions(TTY * tty_settings) { +#if defined(EXP_WIN32_DRIVER) + /* FIXME */ +#else #ifdef ONLCR tty_settings->c_oflag |= ONLCR; #endif @@ -412,6 +419,7 @@ set_conversions(TTY * tty_settings) tty_settings->c_oflag &= ~OXTABS; #endif /* OXTABS */ tty_settings->c_lflag |= (ECHOE | ECHOK); +#endif } static bool @@ -551,15 +559,18 @@ show_tty_change(TTY * old_settings, int which, unsigned def) { - unsigned older, newer; + unsigned older = 0, newer = 0; char *p; +#if defined(EXP_WIN32_DRIVER) + /* noop */ +#else newer = new_settings->c_cc[which]; older = old_settings->c_cc[which]; if (older == newer && older == def) return; - +#endif (void) fprintf(stderr, "%s %s ", name, older == newer ? "is" : "set to"); if (DISABLED(newer)) { @@ -603,9 +614,13 @@ reset_flush(void) void print_tty_chars(TTY * old_settings, TTY * new_settings) { +#if defined(EXP_WIN32_DRIVER) + /* noop */ +#else show_tty_change(old_settings, new_settings, "Erase", VERASE, CERASE); show_tty_change(old_settings, new_settings, "Kill", VKILL, CKILL); show_tty_change(old_settings, new_settings, "Interrupt", VINTR, CINTR); +#endif } #if HAVE_SIZECHANGE diff --git a/progs/tset.c b/progs/tset.c index c46977c9..4d33ca87 100644 --- a/progs/tset.c +++ b/progs/tset.c @@ -98,7 +98,7 @@ char *ttyname(int fd); #endif -MODULE_ID("$Id: tset.c,v 1.123 2020/08/29 23:32:18 tom Exp $") +MODULE_ID("$Id: tset.c,v 1.125 2020/09/05 22:54:47 tom Exp $") #ifndef environ extern char **environ; @@ -231,8 +231,11 @@ typedef struct speeds { int speed; } SPEEDS; -#if (defined(_WIN32) || defined(_WIN64)) -static const SPEEDS speeds[] = { { "0", 0 } }; +#if defined(EXP_WIN32_DRIVER) +static const SPEEDS speeds[] = +{ + {"0", 0} +}; #else static const SPEEDS speeds[] = { @@ -843,7 +846,7 @@ main(int argc, char **argv) oldmode = mode; #ifdef TERMIOS ospeed = (NCURSES_OSPEED) cfgetospeed(&mode); -#elif (defined(_WIN32) || defined(_WIN64)) +#elif defined(EXP_WIN32_DRIVER) ospeed = 0; #else ospeed = (NCURSES_OSPEED) mode.sg_ospeed; diff --git a/test/dots_termcap.c b/test/dots_termcap.c index 27ee5dc5..5e4c17d1 100644 --- a/test/dots_termcap.c +++ b/test/dots_termcap.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_termcap.c,v 1.25 2020/08/29 16:22:03 juergen Exp $ + * $Id: dots_termcap.c,v 1.26 2020/09/05 17:58:47 juergen Exp $ * * A simple demo of the termcap interface. */ @@ -155,7 +155,7 @@ my_napms(int ms) { if (ms > 0) { #if defined(_NC_WINDOWS) || !HAVE_GETTIMEOFDAY - Sleep((DWORD) ms); + Sleep((unsigned int) ms); #else struct timeval data; data.tv_sec = 0; diff --git a/test/railroad.c b/test/railroad.c index e3558b0d..3336f565 100644 --- a/test/railroad.c +++ b/test/railroad.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2000 * - * $Id: railroad.c,v 1.24 2020/02/02 23:34:34 tom Exp $ + * $Id: railroad.c,v 1.25 2020/09/05 21:43:37 tom Exp $ * * A simple demo of the termcap interface. */ @@ -191,7 +191,11 @@ railroad(char **args) int z; if (name == 0) +#ifdef EXP_WIN32_DRIVER + name = "ms-terminal"; +#else name = "dumb"; +#endif InitAndCatch(z = tgetent(buffer, name), onsig); if (z >= 0) { -- 2.44.0