From 8d3ea9021573747ecd129228ba7782a03243f62c Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 26 Nov 2017 00:35:16 +0000 Subject: [PATCH] ncurses 6.0 - patch 20171125 + modify MKlib_gen.sh to avoid tracing result from getstr/getnstr before initialized. + add "-a" aspect-ratio option to picsmap. + add configure check for default path of rgb.txt, used in picsmap. + modify _nc_write_entry() to truncate too-long filename (report by Hosein Askari, Debian #882620). + build-fix for ncurses-examples with NetBSD curses: + it lacks the use_env() function. + it lacks libpanel; a recent change used the wrong ifdef symbol. + add a macro for is_linetouched() and adjust the function's return value to make it possible for most applications to check for an error-return (report by Midolikawa H). + additional manpage cleanup. + update config.guess, config.sub from http://git.savannah.gnu.org/cgit/config.git --- NEWS | 19 +- VERSION | 2 +- aclocal.m4 | 88 +- c++/cursesw.h | 10 +- config.guess | 77 +- config.sub | 46 +- configure | 4210 ++++++++++---------- configure.in | 6 +- dist.mk | 4 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_addch.3x.html | 4 +- doc/html/man/curs_color.3x.html | 2 +- doc/html/man/curs_get_wstr.3x.html | 6 +- doc/html/man/curs_getch.3x.html | 8 +- doc/html/man/curs_getstr.3x.html | 6 +- doc/html/man/curs_in_wch.3x.html | 10 +- doc/html/man/curs_in_wchstr.3x.html | 6 +- doc/html/man/curs_inopts.3x.html | 6 +- doc/html/man/curs_ins_wch.3x.html | 6 +- doc/html/man/curs_ins_wstr.3x.html | 8 +- doc/html/man/curs_insch.3x.html | 6 +- doc/html/man/curs_insstr.3x.html | 6 +- doc/html/man/curs_legacy.3x.html | 4 +- doc/html/man/curs_move.3x.html | 4 +- doc/html/man/curs_pad.3x.html | 8 +- doc/html/man/curs_print.3x.html | 2 +- doc/html/man/curs_scanw.3x.html | 6 +- doc/html/man/curs_slk.3x.html | 4 +- doc/html/man/curs_terminfo.3x.html | 4 +- doc/html/man/curs_touch.3x.html | 30 +- doc/html/man/define_key.3x.html | 8 +- doc/html/man/form.3x.html | 20 +- doc/html/man/form_field_validation.3x.html | 4 +- doc/html/man/form_variables.3x.html | 4 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/keyok.3x.html | 10 +- doc/html/man/menu.3x.html | 19 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 19 +- doc/html/man/scr_dump.5.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 4 +- doc/html/man/tset.1.html | 4 +- doc/html/man/user_caps.5.html | 2 +- include/curses.h.in | 8 +- man/curs_addch.3x | 4 +- man/curs_color.3x | 10 +- man/curs_get_wstr.3x | 8 +- man/curs_getch.3x | 8 +- man/curs_getstr.3x | 6 +- man/curs_in_wch.3x | 10 +- man/curs_in_wchstr.3x | 6 +- man/curs_inopts.3x | 11 +- man/curs_ins_wch.3x | 8 +- man/curs_ins_wstr.3x | 8 +- man/curs_insch.3x | 11 +- man/curs_insstr.3x | 11 +- man/curs_legacy.3x | 4 +- man/curs_move.3x | 4 +- man/curs_pad.3x | 6 +- man/curs_print.3x | 4 +- man/curs_scanw.3x | 8 +- man/curs_slk.3x | 4 +- man/curs_terminfo.3x | 4 +- man/curs_touch.3x | 30 +- man/define_key.3x | 10 +- man/form.3x | 20 +- man/form_field_validation.3x | 6 +- man/form_variables.3x | 5 +- man/keyok.3x | 10 +- man/menu.3x | 17 +- man/panel.3x | 17 +- man/scr_dump.5 | 4 +- man/tput.1 | 12 +- man/tset.1 | 8 +- man/user_caps.5 | 3 +- ncurses/base/MKlib_gen.sh | 15 +- ncurses/base/lib_touch.c | 13 +- ncurses/tinfo/write_entry.c | 13 +- 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 +- test/aclocal.m4 | 88 +- test/configure | 3208 +++++++-------- test/configure.in | 4 +- test/demo_menus.c | 6 +- test/demo_terminfo.c | 4 +- test/dots.c | 6 +- test/dots_curses.c | 4 +- test/dots_mvcur.c | 6 +- test/dots_xcurses.c | 6 +- test/ncurses.c | 8 +- test/picsmap.c | 26 +- 103 files changed, 4480 insertions(+), 3948 deletions(-) diff --git a/NEWS b/NEWS index 683354ab..fff49e18 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3004 2017/11/19 01:32:47 tom Exp $ +-- $Id: NEWS,v 1.3014 2017/11/25 23:04:42 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,23 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20171125 + + modify MKlib_gen.sh to avoid tracing result from getstr/getnstr + before initialized. + + add "-a" aspect-ratio option to picsmap. + + add configure check for default path of rgb.txt, used in picsmap. + + modify _nc_write_entry() to truncate too-long filename (report by + Hosein Askari, Debian #882620). + + build-fix for ncurses-examples with NetBSD curses: + + it lacks the use_env() function. + + it lacks libpanel; a recent change used the wrong ifdef symbol. + + add a macro for is_linetouched() and adjust the function's return + value to make it possible for most applications to check for an + error-return (report by Midolikawa H). + + additional manpage cleanup. + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git + 20171118 + add a note to curs_addch.3x on portability. + add a note to curs_pad.3x on the origin and portability of pads. diff --git a/VERSION b/VERSION index 29ad3b14..21acfd69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20171118 +5:0:9 6.0 20171125 diff --git a/aclocal.m4 b/aclocal.m4 index 770e5b28..9a0697f6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.812 2017/09/30 19:44:51 tom Exp $ +dnl $Id: aclocal.m4,v 1.816 2017/11/25 22:33:41 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -7900,6 +7900,92 @@ AC_SUBST(VERSIONED_SYMS) AC_SUBST(WILDCARD_SYMS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_X11_RGB version: 1 updated: 2017/11/25 17:32:16 +dnl --------------- +dnl Handle configure option "--with-x11-rgb", setting these shell +dnl variables: +dnl +dnl $RGB_PATH is the option value, used for finding the X11 rgb file. +dnl $no_x11_rgb is a "#" (comment) if "--without-x11-rgb" is given. +dnl +dnl Most Linux's use this: +dnl /usr/share/X11/rgb.txt +dnl Debian uses this: +dnl /etc/X11/rgb.txt +dnl DragonFlyBSD ports uses this: +dnl /usr/pkg/lib/X11/rgb.txt +dnl FreeBSD ports use these: +dnl /usr/local/lib/X11/rgb.txt +dnl /usr/local/share/X11/rgb.txt +dnl Mandriva has these: +dnl /usr/lib/X11/rgb.txt +dnl /usr/lib64/X11/rgb.txt +dnl NetBSD has these +dnl /usr/X11R7/lib/X11/rgb.txt +dnl OpenSolaris uses +dnl 32-bit: +dnl /usr/X11/etc/X11/rgb.txt +dnl /usr/X11/share/X11/rgb.txt +dnl /usr/X11/lib/X11/rgb.txt +dnl OSX uses +dnl /opt/local/share/X11/rgb.txt (MacPorts) +dnl /opt/X11/share/X11/rgb.txt (non-ports) +dnl 64-bit: +dnl /usr/X11/etc/X11/rgb.txt +dnl /usr/X11/share/X11/rgb.txt (perhaps) +dnl /usr/X11/lib/amd64/X11/rgb.txt +dnl Solaris10 uses (in this order): +dnl /usr/openwin/lib/X11/rgb.txt +dnl /usr/X11/lib/X11/rgb.txt +AC_DEFUN([CF_WITH_X11_RGB],[ +AC_MSG_CHECKING(for X11 rgb file) +AC_ARG_WITH(x11-rgb, + [ --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)], + [RGB_PATH=$withval], + [RGB_PATH=auto]) + +if test "x[$]RGB_PATH" = xauto +then + RGB_PATH='${exec_prefix}/lib/X11/rgb.txt' + for cf_path in \ + /opt/local/share/X11/rgb.txt \ + /opt/X11/share/X11/rgb.txt \ + /usr/share/X11/rgb.txt \ + /usr/X11/share/X11/rgb.txt \ + /usr/X11/lib/X11/rgb.txt \ + /usr/lib/X11/rgb.txt \ + /etc/X11/rgb.txt \ + /usr/pkg/lib/X11/rgb.txt \ + /usr/X11R7/lib/X11/rgb.txt \ + /usr/X11R6/lib/X11/rgb.txt \ + /usr/X11R5/lib/X11/rgb.txt \ + /usr/X11R4/lib/X11/rgb.txt \ + /usr/local/lib/X11/rgb.txt \ + /usr/local/share/X11/rgb.txt \ + /usr/lib64/X11/rgb.txt + do + if test -f "$cf_path" ; then + RGB_PATH="$cf_path" + break + fi + done +else + cf_path=$RGB_PATH + CF_PATH_SYNTAX(cf_path) +fi + +AC_MSG_RESULT($RGB_PATH) +AC_SUBST(RGB_PATH) +AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path") + +no_x11_rgb= +if test "$RGB_PATH" = no +then + no_x11_rgb="#" +fi +AC_SUBST(no_x11_rgb) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, diff --git a/c++/cursesw.h b/c++/cursesw.h index d22b5507..40b28f57 100644 --- a/c++/cursesw.h +++ b/c++/cursesw.h @@ -31,7 +31,7 @@ #ifndef NCURSES_CURSESW_H_incl #define NCURSES_CURSESW_H_incl 1 -// $Id: cursesw.h,v 1.51 2017/06/24 22:05:30 tom Exp $ +// $Id: cursesw.h,v 1.53 2017/11/21 00:37:23 tom Exp $ extern "C" { # include @@ -324,6 +324,12 @@ inline void UNDEF(intrflush)(WINDOW *win, bool bf) { intrflush(); } #define intrflush UNDEF(intrflush) #endif +#ifdef is_linetouched +inline int UNDEF(is_linetouched)(WINDOW *w, int l) { return is_linetouched(w,l); } +#undef is_linetouched +#define is_linetouched UNDEF(is_linetouched) +#endif + #ifdef leaveok inline int UNDEF(leaveok)(WINDOW* win, bool bf) { return leaveok(win, bf); } #undef leaveok @@ -1241,7 +1247,7 @@ public: // on the value of the changed flag. bool is_linetouched(int line) const { - return (::is_linetouched(w, line) ? TRUE:FALSE); } + return (::is_linetouched(w, line) == TRUE ? TRUE:FALSE); } // Return TRUE if line is marked as changed, FALSE otherwise bool is_wintouched() const { diff --git a/config.guess b/config.guess index a7448442..31e01efe 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2017-08-08' +timestamp='2017-11-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2017-08-08' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2017-08-08' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -244,6 +244,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} exit ;; + *:MidnightBSD:*:*) + echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -318,15 +321,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -488,13 +482,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); @@ -617,7 +611,7 @@ EOF *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and @@ -638,8 +632,8 @@ EOF 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` @@ -752,7 +746,7 @@ EOF { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -761,7 +755,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -858,10 +852,6 @@ EOF *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; @@ -877,27 +867,12 @@ EOF echo ia64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -1100,7 +1075,7 @@ EOF i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + i*86:*:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} @@ -1428,16 +1403,28 @@ EOF exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 <. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ timestamp='2017-04-02' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -229,9 +229,6 @@ case $os in -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; -psos*) os=-psos ;; @@ -316,7 +313,6 @@ case $basic_machine in | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ | wasm32 \ - | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -643,7 +639,7 @@ case $basic_machine in basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -905,7 +901,7 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -1259,6 +1255,9 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1366,8 +1365,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1387,9 +1386,9 @@ case $os in -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1492,7 +1491,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1547,6 +1546,19 @@ case $os in -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) @@ -1694,7 +1706,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1829,7 +1841,7 @@ echo $basic_machine$os exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index b1bc6111..2805fd5a 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.646 . +# From configure.in Revision: 1.647 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20170501. # @@ -775,6 +775,7 @@ Fine-Tuning Your Configuration: --disable-tparm-varargs compile tparm() without varargs interface --disable-tic-depends link tic library without explicit dependency on ncurses library --disable-wattr-macros suppress wattr* macros to help with ncurses5/ncurses6 transition + --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) --with-bool=TYPE override fallback type of bool variable --with-caps=alt compile with alternate Caps file --with-chtype=TYPE override type of chtype @@ -1037,7 +1038,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1040: loading site script $ac_site_file" >&5 + { echo "$as_me:1041: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1048,7 +1049,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1051: loading cache $cache_file" >&5 + { echo "$as_me:1052: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1056,7 +1057,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1059: creating cache $cache_file" >&5 + { echo "$as_me:1060: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1072,21 +1073,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1075: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1076: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1079: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1080: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1085: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1086: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1087: former value: $ac_old_val" >&5 + { echo "$as_me:1088: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1089: current value: $ac_new_val" >&5 + { echo "$as_me:1090: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1105,9 +1106,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1108: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1109: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1110: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1111: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1128,10 +1129,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1131: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1132: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1134: \$? = $ac_status" >&5 + echo "$as_me:1135: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1144,7 +1145,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1147: checking for egrep" >&5 +echo "$as_me:1148: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1154,11 +1155,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:1157: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:1158: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:1161: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:1162: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -1168,11 +1169,11 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed - cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:1171: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1172: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 if test -f $srcdir/VERSION ; then - echo "$as_me:1175: checking for package version" >&5 + echo "$as_me:1176: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... @@ -1184,39 +1185,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6 VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:1187: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:1188: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:1192: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:1193: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:1196: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:1197: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:1199: checking for package patch date" >&5 + echo "$as_me:1200: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in (.) - { { echo "$as_me:1204: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1205: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; (*) - { { echo "$as_me:1211: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1212: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:1216: result: $VERSION_PATCH" >&5 + echo "$as_me:1217: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:1219: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:1220: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -1224,19 +1225,19 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:1227: testing ABI VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:1228: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:1231: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:1232: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:1235: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:1236: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:1239: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:1240: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=NCURSES PACKAGE=ncurses @@ -1260,7 +1261,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 # Check whether --with-rel-version or --without-rel-version was given. if test "${with_rel_version+set}" = set; then withval="$with_rel_version" - { echo "$as_me:1263: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:1264: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} cf_cv_rel_version=$withval fi; @@ -1273,13 +1274,13 @@ if test -n "$NCURSES_MAJOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1276: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + { { echo "$as_me:1277: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1282: error: Release major-version value is empty" >&5 + { { echo "$as_me:1283: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1289,13 +1290,13 @@ if test -n "$NCURSES_MINOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1292: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + { { echo "$as_me:1293: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1298: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1299: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1308,7 +1309,7 @@ if test "${with_abi_version+set}" = set; then if test "x$cf_cv_abi_version" != "x$withval" then - { echo "$as_me:1311: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1312: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} case $cf_cv_rel_version in (5.*) @@ -1327,13 +1328,13 @@ if test -n "$cf_cv_abi_version" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1330: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:1331: error: ABI version is not a number: $cf_cv_abi_version" >&5 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1336: error: ABI version value is empty" >&5 + { { echo "$as_me:1337: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1364,7 +1365,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1367: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1368: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1374,11 +1375,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1377: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1378: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1381: checking build system type" >&5 +echo "$as_me:1382: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1387,23 +1388,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1390: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1391: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1394: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1395: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1399: result: $ac_cv_build" >&5 +echo "$as_me:1400: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1406: checking host system type" >&5 +echo "$as_me:1407: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1412,12 +1413,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1415: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1416: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1420: result: $ac_cv_host" >&5 +echo "$as_me:1421: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1425,7 +1426,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1428: checking target system type" >&5 + echo "$as_me:1429: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1434,12 +1435,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1437: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1438: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1442: result: $ac_cv_target" >&5 +echo "$as_me:1443: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1471,13 +1472,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1474: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1475: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1478: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1479: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1480: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1481: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1485,7 +1486,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1488: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1489: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1497,7 +1498,7 @@ cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1500: checking for prefix" >&5 +echo "$as_me:1501: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1509,11 +1510,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1512: result: $prefix" >&5 +echo "$as_me:1513: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1516: checking for default include-directory" >&5 +echo "$as_me:1517: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1536,7 +1537,7 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1539: result: $includedir" >&5 +echo "$as_me:1540: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi @@ -1598,7 +1599,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1601: checking for $ac_word" >&5 +echo "$as_me:1602: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1613,7 +1614,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1616: found $ac_dir/$ac_word" >&5 +echo "$as_me:1617: found $ac_dir/$ac_word" >&5 break done @@ -1621,10 +1622,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1624: result: $CC" >&5 + echo "$as_me:1625: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1627: result: no" >&5 + echo "$as_me:1628: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1637,7 +1638,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1640: checking for $ac_word" >&5 +echo "$as_me:1641: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1652,7 +1653,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1655: found $ac_dir/$ac_word" >&5 +echo "$as_me:1656: found $ac_dir/$ac_word" >&5 break done @@ -1660,10 +1661,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1663: result: $ac_ct_CC" >&5 + echo "$as_me:1664: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1666: result: no" >&5 + echo "$as_me:1667: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1673,32 +1674,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1676: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1677: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1681:" \ +echo "$as_me:1682:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1684: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1685: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1687: \$? = $ac_status" >&5 + echo "$as_me:1688: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1689: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1690: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1692: \$? = $ac_status" >&5 + echo "$as_me:1693: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1694: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1695: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1697: \$? = $ac_status" >&5 + echo "$as_me:1698: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1701 "configure" +#line 1702 "configure" #include "confdefs.h" int @@ -1714,13 +1715,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1717: checking for C compiler default output" >&5 +echo "$as_me:1718: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1720: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1721: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1723: \$? = $ac_status" >&5 + echo "$as_me:1724: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1743,34 +1744,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1746: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1747: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1752: result: $ac_file" >&5 +echo "$as_me:1753: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1757: checking whether the C compiler works" >&5 +echo "$as_me:1758: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1763: \"$ac_try\"") >&5 + { (eval echo "$as_me:1764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1766: \$? = $ac_status" >&5 + echo "$as_me:1767: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1773: error: cannot run C compiled programs. + { { echo "$as_me:1774: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1778,24 +1779,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1781: result: yes" >&5 +echo "$as_me:1782: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1788: checking whether we are cross compiling" >&5 +echo "$as_me:1789: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1790: result: $cross_compiling" >&5 +echo "$as_me:1791: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1793: checking for executable suffix" >&5 +echo "$as_me:1794: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1795: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1796: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1798: \$? = $ac_status" >&5 + echo "$as_me:1799: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1811,25 +1812,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1814: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1815: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1820: result: $ac_cv_exeext" >&5 +echo "$as_me:1821: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1826: checking for object suffix" >&5 +echo "$as_me:1827: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1832 "configure" +#line 1833 "configure" #include "confdefs.h" int @@ -1841,10 +1842,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1844: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1847: \$? = $ac_status" >&5 + echo "$as_me:1848: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1856,24 +1857,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1859: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1860: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1866: result: $ac_cv_objext" >&5 +echo "$as_me:1867: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1870: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1871: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1876 "configure" +#line 1877 "configure" #include "confdefs.h" int @@ -1888,16 +1889,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1892: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1894: \$? = $ac_status" >&5 + echo "$as_me:1895: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1897: \"$ac_try\"") >&5 + { (eval echo "$as_me:1898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1900: \$? = $ac_status" >&5 + echo "$as_me:1901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1909,19 +1910,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1912: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1913: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1918: checking whether $CC accepts -g" >&5 +echo "$as_me:1919: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1924 "configure" +#line 1925 "configure" #include "confdefs.h" int @@ -1933,16 +1934,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1936: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1939: \$? = $ac_status" >&5 + echo "$as_me:1940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1942: \"$ac_try\"") >&5 + { (eval echo "$as_me:1943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1945: \$? = $ac_status" >&5 + echo "$as_me:1946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1952,7 +1953,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1955: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1956: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1979,16 +1980,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1983: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1985: \$? = $ac_status" >&5 + echo "$as_me:1986: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1988: \"$ac_try\"") >&5 + { (eval echo "$as_me:1989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1991: \$? = $ac_status" >&5 + echo "$as_me:1992: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2000,7 +2001,7 @@ if { (eval echo "$as_me:1982: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2003 "configure" +#line 2004 "configure" #include "confdefs.h" #include $ac_declaration @@ -2013,16 +2014,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2017: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2019: \$? = $ac_status" >&5 + echo "$as_me:2020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2022: \"$ac_try\"") >&5 + { (eval echo "$as_me:2023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2025: \$? = $ac_status" >&5 + echo "$as_me:2026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2032,7 +2033,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2035 "configure" +#line 2036 "configure" #include "confdefs.h" $ac_declaration int @@ -2044,16 +2045,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2047: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2050: \$? = $ac_status" >&5 + echo "$as_me:2051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2053: \"$ac_try\"") >&5 + { (eval echo "$as_me:2054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2056: \$? = $ac_status" >&5 + echo "$as_me:2057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2083,15 +2084,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2086: checking version of $CC" >&5 + echo "$as_me:2087: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2090: result: $GCC_VERSION" >&5 + echo "$as_me:2091: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:2094: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2095: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2099,7 +2100,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2102 "configure" +#line 2103 "configure" #include "confdefs.h" #include #include @@ -2148,16 +2149,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2151: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2152: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2154: \$? = $ac_status" >&5 + echo "$as_me:2155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2157: \"$ac_try\"") >&5 + { (eval echo "$as_me:2158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2160: \$? = $ac_status" >&5 + echo "$as_me:2161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2174,10 +2175,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2177: result: none needed" >&5 + echo "$as_me:2178: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2180: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2181: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2185,13 +2186,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2188: checking \$CC variable" >&5 +echo "$as_me:2189: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2192: result: broken" >&5 + echo "$as_me:2193: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2194: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2195: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2308,19 +2309,19 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2312: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2316: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2320: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2323: result: ok" >&5 + echo "$as_me:2324: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2331,7 +2332,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:2334: checking how to run the C preprocessor" >&5 +echo "$as_me:2335: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2352,18 +2353,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 2355 "configure" +#line 2356 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2360: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2361: \"$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:2366: \$? = $ac_status" >&5 + echo "$as_me:2367: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2386,17 +2387,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 2389 "configure" +#line 2390 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2393: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2394: \"$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:2399: \$? = $ac_status" >&5 + echo "$as_me:2400: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2433,7 +2434,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2436: result: $CPP" >&5 +echo "$as_me:2437: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2443,18 +2444,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 2446 "configure" +#line 2447 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2451: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2452: \"$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:2457: \$? = $ac_status" >&5 + echo "$as_me:2458: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2477,17 +2478,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 2480 "configure" +#line 2481 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2484: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2485: \"$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:2490: \$? = $ac_status" >&5 + echo "$as_me:2491: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2515,7 +2516,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2518: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2519: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2528,14 +2529,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2531: checking whether $CC needs -traditional" >&5 + echo "$as_me:2532: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 2538 "configure" +#line 2539 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2550,7 +2551,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2553 "configure" +#line 2554 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2563,14 +2564,14 @@ rm -rf conftest* fi fi -echo "$as_me:2566: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2567: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2573: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:2574: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2585,15 +2586,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='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2588: \"$ac_try\"") >&5 +if { (eval echo "$as_me:2589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2591: \$? = $ac_status" >&5 + echo "$as_me:2592: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2593: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2596: \$? = $ac_status" >&5 + echo "$as_me:2597: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CC_c_o=yes @@ -2604,10 +2605,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2607: result: yes" >&5 + echo "$as_me:2608: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2610: result: no" >&5 + echo "$as_me:2611: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2621,7 +2622,7 @@ else (*) LDPATH=$PATH:/sbin:/usr/sbin # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 -echo "$as_me:2624: checking for $ac_word" >&5 +echo "$as_me:2625: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LDCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2638,7 +2639,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_LDCONFIG="$ac_dir/$ac_word" - echo "$as_me:2641: found $ac_dir/$ac_word" >&5 + echo "$as_me:2642: found $ac_dir/$ac_word" >&5 break fi done @@ -2649,10 +2650,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2652: result: $LDCONFIG" >&5 + echo "$as_me:2653: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2655: result: no" >&5 + echo "$as_me:2656: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2660,7 +2661,7 @@ fi esac fi -echo "$as_me:2663: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2664: checking if you want to ensure bool is consistent with C++" >&5 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 # Check whether --with-cxx or --without-cxx was given. @@ -2670,7 +2671,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2673: result: $cf_with_cxx" >&5 +echo "$as_me:2674: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2688,7 +2689,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:2691: checking for $ac_word" >&5 +echo "$as_me:2692: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2703,7 +2704,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_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:2706: found $ac_dir/$ac_word" >&5 +echo "$as_me:2707: found $ac_dir/$ac_word" >&5 break done @@ -2711,10 +2712,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2714: result: $CXX" >&5 + echo "$as_me:2715: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2717: result: no" >&5 + echo "$as_me:2718: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2727,7 +2728,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2730: checking for $ac_word" >&5 +echo "$as_me:2731: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2742,7 +2743,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:2745: found $ac_dir/$ac_word" >&5 +echo "$as_me:2746: found $ac_dir/$ac_word" >&5 break done @@ -2750,10 +2751,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2753: result: $ac_ct_CXX" >&5 + echo "$as_me:2754: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2756: result: no" >&5 + echo "$as_me:2757: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2765,32 +2766,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2768:" \ +echo "$as_me:2769:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2771: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2772: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2774: \$? = $ac_status" >&5 + echo "$as_me:2775: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2776: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2777: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2779: \$? = $ac_status" >&5 + echo "$as_me:2780: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2781: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2782: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2784: \$? = $ac_status" >&5 + echo "$as_me:2785: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2787: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2788: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2793 "configure" +#line 2794 "configure" #include "confdefs.h" int @@ -2805,16 +2806,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2808: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2811: \$? = $ac_status" >&5 + echo "$as_me:2812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2814: \"$ac_try\"") >&5 + { (eval echo "$as_me:2815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2817: \$? = $ac_status" >&5 + echo "$as_me:2818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -2826,19 +2827,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2829: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:2830: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:2835: checking whether $CXX accepts -g" >&5 +echo "$as_me:2836: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2841 "configure" +#line 2842 "configure" #include "confdefs.h" int @@ -2850,16 +2851,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2853: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2854: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2856: \$? = $ac_status" >&5 + echo "$as_me:2857: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2859: \"$ac_try\"") >&5 + { (eval echo "$as_me:2860: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2862: \$? = $ac_status" >&5 + echo "$as_me:2863: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -2869,7 +2870,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2872: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:2873: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -2896,7 +2897,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2899 "configure" +#line 2900 "configure" #include "confdefs.h" #include $ac_declaration @@ -2909,16 +2910,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2912: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2913: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2915: \$? = $ac_status" >&5 + echo "$as_me:2916: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2918: \"$ac_try\"") >&5 + { (eval echo "$as_me:2919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2921: \$? = $ac_status" >&5 + echo "$as_me:2922: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2928,7 +2929,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2931 "configure" +#line 2932 "configure" #include "confdefs.h" $ac_declaration int @@ -2940,16 +2941,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2944: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2946: \$? = $ac_status" >&5 + echo "$as_me:2947: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2949: \"$ac_try\"") >&5 + { (eval echo "$as_me:2950: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2952: \$? = $ac_status" >&5 + echo "$as_me:2953: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2983,7 +2984,7 @@ ac_main_return=return then # Several of the C++ configurations do not work, particularly when # cross-compiling (20140913 -TD) - echo "$as_me:2986: checking if $CXX works" >&5 + echo "$as_me:2987: checking if $CXX works" >&5 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 save_CPPFLAGS="$CPPFLAGS" @@ -2991,7 +2992,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 CPPFLAGS="$CPPFLAGS -I${cf_includedir}" cat >conftest.$ac_ext <<_ACEOF -#line 2994 "configure" +#line 2995 "configure" #include "confdefs.h" #include @@ -3008,16 +3009,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3014: \$? = $ac_status" >&5 + echo "$as_me:3015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3017: \"$ac_try\"") >&5 + { (eval echo "$as_me:3018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3020: \$? = $ac_status" >&5 + echo "$as_me:3021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_works=yes else @@ -3028,11 +3029,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" - echo "$as_me:3031: result: $cf_cxx_works" >&5 + echo "$as_me:3032: result: $cf_cxx_works" >&5 echo "${ECHO_T}$cf_cxx_works" >&6 if test "x$cf_cxx_works" = xno then - { echo "$as_me:3035: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 + { echo "$as_me:3036: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi @@ -3048,7 +3049,7 @@ ac_main_return=return if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:3051: checking for $ac_word" >&5 +echo "$as_me:3052: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3065,7 +3066,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_CXX="$ac_dir/$ac_word" - echo "$as_me:3068: found $ac_dir/$ac_word" >&5 + echo "$as_me:3069: found $ac_dir/$ac_word" >&5 break fi done @@ -3076,17 +3077,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3079: result: $CXX" >&5 + echo "$as_me:3080: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3082: result: no" >&5 + echo "$as_me:3083: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi case "x$CXX" in (x|xg++) - { echo "$as_me:3089: WARNING: You don't have any C++ compiler, too bad" >&5 + { echo "$as_me:3090: WARNING: You don't have any C++ compiler, too bad" >&5 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;} cf_with_cxx=no; CXX=""; GXX=""; ;; @@ -3095,7 +3096,7 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3098: checking version of ${CXX:-g++}" >&5 + echo "$as_me:3099: checking version of ${CXX:-g++}" >&5 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" if test -z "$GXX_VERSION" @@ -3103,7 +3104,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION=unknown GXX=no fi - echo "$as_me:3106: result: $GXX_VERSION" >&5 + echo "$as_me:3107: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi @@ -3111,12 +3112,12 @@ case $GXX_VERSION in (1*|2.[0-6]*) # GXX=""; CXX=""; ac_cv_prog_gxx=no # cf_cxx_library=no - { echo "$as_me:3114: WARNING: templates do not work" >&5 + { echo "$as_me:3115: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3119: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3120: checking if you want to build C++ binding and demo" >&5 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 # Check whether --with-cxx-binding or --without-cxx-binding was given. @@ -3126,15 +3127,15 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3129: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3130: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3132: checking if you want to build with Ada95" >&5 +echo "$as_me:3133: checking if you want to build with Ada95" >&5 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 -echo "$as_me:3134: result: $cf_with_ada" >&5 +echo "$as_me:3135: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3137: checking if you want to install terminal database" >&5 +echo "$as_me:3138: checking if you want to install terminal database" >&5 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6 # Check whether --enable-db-install or --disable-db-install was given. @@ -3144,10 +3145,10 @@ if test "${enable_db_install+set}" = set; then else cf_with_db_install=yes fi; -echo "$as_me:3147: result: $cf_with_db_install" >&5 +echo "$as_me:3148: result: $cf_with_db_install" >&5 echo "${ECHO_T}$cf_with_db_install" >&6 -echo "$as_me:3150: checking if you want to install manpages" >&5 +echo "$as_me:3151: checking if you want to install manpages" >&5 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 # Check whether --with-manpages or --without-manpages was given. @@ -3157,10 +3158,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3160: result: $cf_with_manpages" >&5 +echo "$as_me:3161: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3163: checking if you want to build programs such as tic" >&5 +echo "$as_me:3164: checking if you want to build programs such as tic" >&5 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 # Check whether --with-progs or --without-progs was given. @@ -3170,18 +3171,18 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3173: result: $cf_with_progs" >&5 +echo "$as_me:3174: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 if test -f $srcdir/tack/tack.h; then if test "x$cross_compiling" = xyes ; then test -n "$verbose" && echo " ignoring tack because we are cross-compiling" 1>&6 -echo "${as_me:-configure}:3180: testing ignoring tack because we are cross-compiling ..." 1>&5 +echo "${as_me:-configure}:3181: testing ignoring tack because we are cross-compiling ..." 1>&5 cf_with_tack=no else - echo "$as_me:3184: checking if you want to build the tack program" >&5 + echo "$as_me:3185: checking if you want to build the tack program" >&5 echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6 # Check whether --with-tack or --without-tack was given. @@ -3191,14 +3192,14 @@ if test "${with_tack+set}" = set; then else cf_with_tack=$cf_with_progs fi; - echo "$as_me:3194: result: $cf_with_tack" >&5 + echo "$as_me:3195: result: $cf_with_tack" >&5 echo "${ECHO_T}$cf_with_tack" >&6 fi else cf_with_tack=no fi -echo "$as_me:3201: checking if you want to build test-programs" >&5 +echo "$as_me:3202: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3208,10 +3209,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3211: result: $cf_with_tests" >&5 +echo "$as_me:3212: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3214: checking if you wish to install curses.h" >&5 +echo "$as_me:3215: checking if you wish to install curses.h" >&5 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 # Check whether --with-curses-h or --without-curses-h was given. @@ -3221,7 +3222,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3224: result: $with_curses_h" >&5 +echo "$as_me:3225: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3246,7 +3247,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3249: checking for $ac_word" >&5 +echo "$as_me:3250: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3261,7 +3262,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:3264: found $ac_dir/$ac_word" >&5 +echo "$as_me:3265: found $ac_dir/$ac_word" >&5 break done @@ -3269,21 +3270,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3272: result: $AWK" >&5 + echo "$as_me:3273: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3275: result: no" >&5 + echo "$as_me:3276: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3282: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3283: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3286: checking for egrep" >&5 +echo "$as_me:3287: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3293,11 +3294,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:3296: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3297: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:3300: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3301: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3313,7 +3314,7 @@ echo "$as_me: error: No egrep program found" >&2;} # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3316: checking for a BSD compatible install" >&5 +echo "$as_me:3317: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -3362,7 +3363,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3365: result: $INSTALL" >&5 +echo "$as_me:3366: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3387,7 +3388,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3390: checking for $ac_word" >&5 +echo "$as_me:3391: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3402,7 +3403,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3405: found $ac_dir/$ac_word" >&5 +echo "$as_me:3406: found $ac_dir/$ac_word" >&5 break done @@ -3410,28 +3411,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3413: result: $LINT" >&5 + echo "$as_me:3414: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3416: result: no" >&5 + echo "$as_me:3417: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3423: checking whether ln -s works" >&5 +echo "$as_me:3424: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3427: result: yes" >&5 + echo "$as_me:3428: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3430: result: no, using $LN_S" >&5 + echo "$as_me:3431: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3434: checking if $LN_S -f options work" >&5 +echo "$as_me:3435: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -3443,12 +3444,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3446: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3447: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" -echo "$as_me:3451: checking for long file names" >&5 +echo "$as_me:3452: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3487,7 +3488,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:3490: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3491: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test $ac_cv_sys_long_file_names = yes; then @@ -3499,7 +3500,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3502: checking if you want to use pkg-config" >&5 +echo "$as_me:3503: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -3509,7 +3510,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3512: result: $cf_pkg_config" >&5 +echo "$as_me:3513: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in @@ -3521,7 +3522,7 @@ case $cf_pkg_config in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:3524: checking for $ac_word" >&5 +echo "$as_me:3525: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3538,7 +3539,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3541: found $ac_dir/$ac_word" >&5 + echo "$as_me:3542: found $ac_dir/$ac_word" >&5 break fi done @@ -3549,10 +3550,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3552: result: $PKG_CONFIG" >&5 + echo "$as_me:3553: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3555: result: no" >&5 + echo "$as_me:3556: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3561,7 +3562,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:3564: checking for $ac_word" >&5 +echo "$as_me:3565: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3578,7 +3579,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3581: found $ac_dir/$ac_word" >&5 + echo "$as_me:3582: found $ac_dir/$ac_word" >&5 break fi done @@ -3590,10 +3591,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3593: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3594: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3596: result: no" >&5 + echo "$as_me:3597: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3636,24 +3637,24 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3639: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3640: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:3646: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:3647: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi case $PKG_CONFIG in (no|none|yes) - echo "$as_me:3652: checking for pkg-config library directory" >&5 + echo "$as_me:3653: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:3656: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3657: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac @@ -3708,18 +3709,18 @@ case x$PKG_CONFIG_LIBDIR in test -n "$verbose" && echo " list..." 1>&6 -echo "${as_me:-configure}:3711: testing list... ..." 1>&5 +echo "${as_me:-configure}:3712: testing list... ..." 1>&5 for cf_config in $cf_search_path do test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 -echo "${as_me:-configure}:3717: testing checking $cf_config/pkgconfig ..." 1>&5 +echo "${as_me:-configure}:3718: testing checking $cf_config/pkgconfig ..." 1>&5 if test -d $cf_config/pkgconfig then PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3722: checking done" >&5 + echo "$as_me:3723: checking done" >&5 echo $ECHO_N "checking done... $ECHO_C" >&6 break fi @@ -3730,16 +3731,16 @@ echo $ECHO_N "checking done... $ECHO_C" >&6 esac if test "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:3733: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3734: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi if test "x$PKG_CONFIG" != xnone then - echo "$as_me:3739: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:3740: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 else - echo "$as_me:3742: checking if we should install .pc files" >&5 + echo "$as_me:3743: checking if we should install .pc files" >&5 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 fi @@ -3750,7 +3751,7 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; -echo "$as_me:3753: result: $enable_pc_files" >&5 +echo "$as_me:3754: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 if test "x$enable_pc_files" != xno @@ -3758,7 +3759,7 @@ then MAKE_PC_FILES= case "x$PKG_CONFIG_LIBDIR" in (xno|xyes) - { echo "$as_me:3761: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + { echo "$as_me:3762: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} ;; (*) @@ -3788,7 +3789,7 @@ case ".$PKG_CONFIG_LIBDIR" in PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3791: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 + { { echo "$as_me:3792: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3802,7 +3803,7 @@ fi if test -z "$MAKE_PC_FILES" then - echo "$as_me:3805: checking for suffix to add to pc-files" >&5 + echo "$as_me:3806: checking for suffix to add to pc-files" >&5 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 # Check whether --with-pc-suffix or --without-pc-suffix was given. @@ -3817,13 +3818,13 @@ if test "${with_pc_suffix+set}" = set; then esac fi; test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none - echo "$as_me:3820: result: $PC_MODULE_SUFFIX" >&5 + echo "$as_me:3821: result: $PC_MODULE_SUFFIX" >&5 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= fi -echo "$as_me:3826: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3827: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3833,11 +3834,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3836: result: $enable_mixedcase" >&5 +echo "$as_me:3837: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3840: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3841: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3864,7 +3865,7 @@ else fi fi -echo "$as_me:3867: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3868: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3883,7 +3884,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3886: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3887: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -3903,11 +3904,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3906: result: yes" >&5 + echo "$as_me:3907: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3910: result: no" >&5 + echo "$as_me:3911: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3916,7 +3917,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3919: checking for $ac_word" >&5 +echo "$as_me:3920: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3931,7 +3932,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3934: found $ac_dir/$ac_word" >&5 +echo "$as_me:3935: found $ac_dir/$ac_word" >&5 break done @@ -3939,10 +3940,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3942: result: $CTAGS" >&5 + echo "$as_me:3943: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3945: result: no" >&5 + echo "$as_me:3946: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3953,7 +3954,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3956: checking for $ac_word" >&5 +echo "$as_me:3957: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3968,7 +3969,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3971: found $ac_dir/$ac_word" >&5 +echo "$as_me:3972: found $ac_dir/$ac_word" >&5 break done @@ -3976,10 +3977,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3979: result: $ETAGS" >&5 + echo "$as_me:3980: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3982: result: no" >&5 + echo "$as_me:3983: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3988,7 +3989,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3991: checking for $ac_word" >&5 +echo "$as_me:3992: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4003,7 +4004,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:4006: found $ac_dir/$ac_word" >&5 +echo "$as_me:4007: found $ac_dir/$ac_word" >&5 break done @@ -4012,17 +4013,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:4015: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4016: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:4018: result: no" >&5 + echo "$as_me:4019: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:4025: checking for $ac_word" >&5 +echo "$as_me:4026: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4037,7 +4038,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:4040: found $ac_dir/$ac_word" >&5 +echo "$as_me:4041: found $ac_dir/$ac_word" >&5 break done @@ -4046,10 +4047,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:4049: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4050: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:4052: result: no" >&5 + echo "$as_me:4053: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4069,7 +4070,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:4072: checking for makeflags variable" >&5 +echo "$as_me:4073: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4103,13 +4104,13 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:4106: result: $cf_cv_makeflags" >&5 +echo "$as_me:4107: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4112: checking for $ac_word" >&5 +echo "$as_me:4113: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4124,7 +4125,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_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4127: found $ac_dir/$ac_word" >&5 +echo "$as_me:4128: found $ac_dir/$ac_word" >&5 break done @@ -4132,10 +4133,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4135: result: $RANLIB" >&5 + echo "$as_me:4136: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4138: result: no" >&5 + echo "$as_me:4139: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4144,7 +4145,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4147: checking for $ac_word" >&5 +echo "$as_me:4148: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4159,7 +4160,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4162: found $ac_dir/$ac_word" >&5 +echo "$as_me:4163: found $ac_dir/$ac_word" >&5 break done @@ -4168,10 +4169,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4171: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4172: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4174: result: no" >&5 + echo "$as_me:4175: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4183,7 +4184,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:4186: checking for $ac_word" >&5 +echo "$as_me:4187: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4198,7 +4199,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_LD="${ac_tool_prefix}ld" -echo "$as_me:4201: found $ac_dir/$ac_word" >&5 +echo "$as_me:4202: found $ac_dir/$ac_word" >&5 break done @@ -4206,10 +4207,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4209: result: $LD" >&5 + echo "$as_me:4210: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4212: result: no" >&5 + echo "$as_me:4213: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4218,7 +4219,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:4221: checking for $ac_word" >&5 +echo "$as_me:4222: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4233,7 +4234,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:4236: found $ac_dir/$ac_word" >&5 +echo "$as_me:4237: found $ac_dir/$ac_word" >&5 break done @@ -4242,10 +4243,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4245: result: $ac_ct_LD" >&5 + echo "$as_me:4246: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4248: result: no" >&5 + echo "$as_me:4249: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4257,7 +4258,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4260: checking for $ac_word" >&5 +echo "$as_me:4261: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4272,7 +4273,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_AR="${ac_tool_prefix}ar" -echo "$as_me:4275: found $ac_dir/$ac_word" >&5 +echo "$as_me:4276: found $ac_dir/$ac_word" >&5 break done @@ -4280,10 +4281,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4283: result: $AR" >&5 + echo "$as_me:4284: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4286: result: no" >&5 + echo "$as_me:4287: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4292,7 +4293,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4295: checking for $ac_word" >&5 +echo "$as_me:4296: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4307,7 +4308,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4310: found $ac_dir/$ac_word" >&5 +echo "$as_me:4311: found $ac_dir/$ac_word" >&5 break done @@ -4316,10 +4317,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4319: result: $ac_ct_AR" >&5 + echo "$as_me:4320: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4322: result: no" >&5 + echo "$as_me:4323: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4331,7 +4332,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 -echo "$as_me:4334: checking for $ac_word" >&5 +echo "$as_me:4335: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4346,7 +4347,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_NM="${ac_tool_prefix}nm" -echo "$as_me:4349: found $ac_dir/$ac_word" >&5 +echo "$as_me:4350: found $ac_dir/$ac_word" >&5 break done @@ -4354,10 +4355,10 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$as_me:4357: result: $NM" >&5 + echo "$as_me:4358: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 else - echo "$as_me:4360: result: no" >&5 + echo "$as_me:4361: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4366,7 +4367,7 @@ if test -z "$ac_cv_prog_NM"; then ac_ct_NM=$NM # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -echo "$as_me:4369: checking for $ac_word" >&5 +echo "$as_me:4370: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4381,7 +4382,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NM="nm" -echo "$as_me:4384: found $ac_dir/$ac_word" >&5 +echo "$as_me:4385: found $ac_dir/$ac_word" >&5 break done @@ -4390,10 +4391,10 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - echo "$as_me:4393: result: $ac_ct_NM" >&5 + echo "$as_me:4394: result: $ac_ct_NM" >&5 echo "${ECHO_T}$ac_ct_NM" >&6 else - echo "$as_me:4396: result: no" >&5 + echo "$as_me:4397: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4405,7 +4406,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4408: checking for $ac_word" >&5 +echo "$as_me:4409: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4420,7 +4421,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_AR="${ac_tool_prefix}ar" -echo "$as_me:4423: found $ac_dir/$ac_word" >&5 +echo "$as_me:4424: found $ac_dir/$ac_word" >&5 break done @@ -4428,10 +4429,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4431: result: $AR" >&5 + echo "$as_me:4432: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4434: result: no" >&5 + echo "$as_me:4435: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4440,7 +4441,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4443: checking for $ac_word" >&5 +echo "$as_me:4444: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4455,7 +4456,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4458: found $ac_dir/$ac_word" >&5 +echo "$as_me:4459: found $ac_dir/$ac_word" >&5 break done @@ -4464,10 +4465,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4467: result: $ac_ct_AR" >&5 + echo "$as_me:4468: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4470: result: no" >&5 + echo "$as_me:4471: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4476,7 +4477,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4479: checking for options to update archives" >&5 +echo "$as_me:4480: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4499,13 +4500,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4506: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4508: \$? = $ac_status" >&5 + echo "$as_me:4509: \$? = $ac_status" >&5 (exit $ac_status); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null @@ -4516,7 +4517,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4519: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4520: testing cannot compile test-program ..." 1>&5 break fi @@ -4524,7 +4525,7 @@ echo "${as_me:-configure}:4519: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4527: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4528: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4535,7 +4536,7 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4538: checking if you have specified an install-prefix" >&5 +echo "$as_me:4539: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4548,7 +4549,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4551: result: $DESTDIR" >&5 +echo "$as_me:4552: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4576,7 +4577,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4579: checking for $ac_word" >&5 +echo "$as_me:4580: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4591,7 +4592,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_BUILD_CC="$ac_prog" -echo "$as_me:4594: found $ac_dir/$ac_word" >&5 +echo "$as_me:4595: found $ac_dir/$ac_word" >&5 break done @@ -4599,10 +4600,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4602: result: $BUILD_CC" >&5 + echo "$as_me:4603: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4605: result: no" >&5 + echo "$as_me:4606: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4610,12 +4611,12 @@ fi done fi; - echo "$as_me:4613: checking for native build C compiler" >&5 + echo "$as_me:4614: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4615: result: $BUILD_CC" >&5 + echo "$as_me:4616: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4618: checking for native build C preprocessor" >&5 + echo "$as_me:4619: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4625,10 +4626,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4628: result: $BUILD_CPP" >&5 + echo "$as_me:4629: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4631: checking for native build C flags" >&5 + echo "$as_me:4632: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4636,10 +4637,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4639: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4640: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4642: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4643: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4647,10 +4648,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4650: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4651: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4653: checking for native build linker-flags" >&5 + echo "$as_me:4654: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4658,10 +4659,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4661: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4662: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4664: checking for native build linker-libraries" >&5 + echo "$as_me:4665: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4669,7 +4670,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4672: result: $BUILD_LIBS" >&5 + echo "$as_me:4673: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4679,7 +4680,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4682: error: Cross-build requires two compilers. + { { echo "$as_me:4683: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4704,7 +4705,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4707: checking if libtool -version-number should be used" >&5 +echo "$as_me:4708: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -4721,7 +4722,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:4724: result: $cf_libtool_version" >&5 +echo "$as_me:4725: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -4730,25 +4731,25 @@ else LIBTOOL_VERSION="-version-info" case "x$VERSION" in (x) - { echo "$as_me:4733: WARNING: VERSION was not set" >&5 + { echo "$as_me:4734: WARNING: VERSION was not set" >&5 echo "$as_me: WARNING: VERSION was not set" >&2;} ;; (x*.*.*) ABI_VERSION="$VERSION" test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:4740: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:4741: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (x*:*:*) ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:4747: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:4748: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (*) - { echo "$as_me:4751: WARNING: unexpected VERSION value: $VERSION" >&5 + { echo "$as_me:4752: WARNING: unexpected VERSION value: $VERSION" >&5 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} ;; esac @@ -4770,7 +4771,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4773: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4774: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -4780,7 +4781,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4783: result: $with_libtool" >&5 +echo "$as_me:4784: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -4811,7 +4812,7 @@ case ".$with_libtool" in with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4814: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:4815: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4824,7 +4825,7 @@ esac do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:4827: checking for $ac_word" >&5 +echo "$as_me:4828: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4839,7 +4840,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_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:4842: found $ac_dir/$ac_word" >&5 +echo "$as_me:4843: found $ac_dir/$ac_word" >&5 break done @@ -4847,10 +4848,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4850: result: $LIBTOOL" >&5 + echo "$as_me:4851: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4853: result: no" >&5 + echo "$as_me:4854: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4863,7 +4864,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4866: checking for $ac_word" >&5 +echo "$as_me:4867: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4878,7 +4879,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:4881: found $ac_dir/$ac_word" >&5 +echo "$as_me:4882: found $ac_dir/$ac_word" >&5 break done @@ -4886,10 +4887,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4889: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:4890: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4892: result: no" >&5 + echo "$as_me:4893: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4920,7 +4921,7 @@ unset LIBTOOL do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:4923: checking for $ac_word" >&5 +echo "$as_me:4924: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4935,7 +4936,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_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:4938: found $ac_dir/$ac_word" >&5 +echo "$as_me:4939: found $ac_dir/$ac_word" >&5 break done @@ -4943,10 +4944,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4946: result: $LIBTOOL" >&5 + echo "$as_me:4947: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4949: result: no" >&5 + echo "$as_me:4950: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4959,7 +4960,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4962: checking for $ac_word" >&5 +echo "$as_me:4963: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4974,7 +4975,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:4977: found $ac_dir/$ac_word" >&5 +echo "$as_me:4978: found $ac_dir/$ac_word" >&5 break done @@ -4982,10 +4983,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4985: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:4986: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4988: result: no" >&5 + echo "$as_me:4989: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5007,7 +5008,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:5010: error: Cannot find libtool" >&5 + { { echo "$as_me:5011: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -5023,7 +5024,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:5026: checking version of $LIBTOOL" >&5 + echo "$as_me:5027: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -5034,15 +5035,15 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:5037: result: $cf_cv_libtool_version" >&5 + echo "$as_me:5038: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:5040: error: This is not GNU libtool" >&5 + { { echo "$as_me:5041: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:5045: error: GNU libtool has not been found" >&5 + { { echo "$as_me:5046: error: GNU libtool has not been found" >&5 echo "$as_me: error: GNU libtool has not been found" >&2;} { (exit 1); exit 1; }; } fi @@ -5078,7 +5079,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:5081: checking if you want to build shared libraries" >&5 +echo "$as_me:5082: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -5088,11 +5089,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:5091: result: $with_shared" >&5 +echo "$as_me:5092: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" -echo "$as_me:5095: checking if you want to build static libraries" >&5 +echo "$as_me:5096: checking if you want to build static libraries" >&5 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 # Check whether --with-normal or --without-normal was given. @@ -5102,11 +5103,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:5105: result: $with_normal" >&5 +echo "$as_me:5106: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" -echo "$as_me:5109: checking if you want to build debug libraries" >&5 +echo "$as_me:5110: checking if you want to build debug libraries" >&5 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 # Check whether --with-debug or --without-debug was given. @@ -5116,11 +5117,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:5119: result: $with_debug" >&5 +echo "$as_me:5120: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" -echo "$as_me:5123: checking if you want to build profiling libraries" >&5 +echo "$as_me:5124: checking if you want to build profiling libraries" >&5 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 # Check whether --with-profile or --without-profile was given. @@ -5130,7 +5131,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:5133: result: $with_profile" >&5 +echo "$as_me:5134: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" @@ -5138,7 +5139,7 @@ fi if test "X$cf_with_cxx_binding" != Xno; then if test "x$with_shared" = "xyes"; then -echo "$as_me:5141: checking if you want to build C++ shared libraries" >&5 +echo "$as_me:5142: checking if you want to build C++ shared libraries" >&5 echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 # Check whether --with-cxx-shared or --without-cxx-shared was given. @@ -5148,26 +5149,26 @@ if test "${with_cxx_shared+set}" = set; then else with_shared_cxx=no fi; -echo "$as_me:5151: result: $with_shared_cxx" >&5 +echo "$as_me:5152: result: $with_shared_cxx" >&5 echo "${ECHO_T}$with_shared_cxx" >&6 fi fi ############################################################################### -echo "$as_me:5158: checking for specified models" >&5 +echo "$as_me:5159: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal test "$with_libtool" != "no" && cf_list_models=libtool -echo "$as_me:5162: result: $cf_list_models" >&5 +echo "$as_me:5163: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:5167: checking for default model" >&5 +echo "$as_me:5168: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:5170: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:5171: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -5181,7 +5182,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:5184: checking if you want to have a library-prefix" >&5 +echo "$as_me:5185: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -5191,7 +5192,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:5194: result: $with_lib_prefix" >&5 +echo "$as_me:5195: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test $with_lib_prefix = auto @@ -5219,19 +5220,19 @@ fi LIB_SUFFIX= - echo "$as_me:5222: checking for PATH separator" >&5 + echo "$as_me:5223: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case $cf_cv_system_name in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:5229: result: $PATH_SEPARATOR" >&5 + echo "$as_me:5230: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 ############################################################################### -echo "$as_me:5234: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:5235: checking if you want to build a separate terminfo library" >&5 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 # Check whether --with-termlib or --without-termlib was given. @@ -5241,10 +5242,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:5244: result: $with_termlib" >&5 +echo "$as_me:5245: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:5247: checking if you want to build a separate tic library" >&5 +echo "$as_me:5248: checking if you want to build a separate tic library" >&5 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 # Check whether --with-ticlib or --without-ticlib was given. @@ -5254,13 +5255,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:5257: result: $with_ticlib" >&5 +echo "$as_me:5258: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:5263: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:5264: checking if you want to link with the GPM mouse library" >&5 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 # Check whether --with-gpm or --without-gpm was given. @@ -5270,27 +5271,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:5273: result: $with_gpm" >&5 +echo "$as_me:5274: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:5277: checking for gpm.h" >&5 + echo "$as_me:5278: checking for gpm.h" >&5 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 if test "${ac_cv_header_gpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5283 "configure" +#line 5284 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:5287: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5288: \"$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:5293: \$? = $ac_status" >&5 + echo "$as_me:5294: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5309,7 +5310,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5312: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:5313: result: $ac_cv_header_gpm_h" >&5 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 if test $ac_cv_header_gpm_h = yes; then @@ -5320,7 +5321,7 @@ EOF if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 -echo "${as_me:-configure}:5323: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:5324: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 @@ -5328,7 +5329,7 @@ EOF with_gpm=yes else - echo "$as_me:5331: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:5332: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5336,7 +5337,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5339 "configure" +#line 5340 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5355,16 +5356,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5358: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5359: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5361: \$? = $ac_status" >&5 + echo "$as_me:5362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5364: \"$ac_try\"") >&5 + { (eval echo "$as_me:5365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5367: \$? = $ac_status" >&5 + echo "$as_me:5368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5375,18 +5376,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5378: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:5379: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then with_gpm=yes else if test "$with_gpm" = maybe; then - { echo "$as_me:5385: WARNING: Cannot link with GPM library" >&5 + { echo "$as_me:5386: WARNING: Cannot link with GPM library" >&5 echo "$as_me: WARNING: Cannot link with GPM library" >&2;} with_gpm=no else - { { echo "$as_me:5389: error: Cannot link with GPM library" >&5 + { { echo "$as_me:5390: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -5397,7 +5398,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:5400: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:5401: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -5406,7 +5407,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:5409: checking if you want to load GPM dynamically" >&5 + echo "$as_me:5410: checking if you want to load GPM dynamically" >&5 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 # Check whether --with-dlsym or --without-dlsym was given. @@ -5416,18 +5417,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:5419: result: $with_dlsym" >&5 + echo "$as_me:5420: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:5424: checking for dlsym" >&5 +echo "$as_me:5425: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5430 "configure" +#line 5431 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -5458,16 +5459,16 @@ f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5461: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5462: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5464: \$? = $ac_status" >&5 + echo "$as_me:5465: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5467: \"$ac_try\"") >&5 + { (eval echo "$as_me:5468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5470: \$? = $ac_status" >&5 + echo "$as_me:5471: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -5477,14 +5478,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5480: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:5481: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test $ac_cv_func_dlsym = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:5487: checking for dlsym in -ldl" >&5 +echo "$as_me:5488: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5492,7 +5493,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5495 "configure" +#line 5496 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5511,16 +5512,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5514: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5515: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5517: \$? = $ac_status" >&5 + echo "$as_me:5518: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5520: \"$ac_try\"") >&5 + { (eval echo "$as_me:5521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5523: \$? = $ac_status" >&5 + echo "$as_me:5524: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -5531,7 +5532,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5534: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:5535: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 if test $ac_cv_lib_dl_dlsym = yes; then @@ -5560,10 +5561,10 @@ done LIBS="$cf_add_libs" } - echo "$as_me:5563: checking whether able to link to dl*() functions" >&5 + echo "$as_me:5564: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5566 "configure" +#line 5567 "configure" #include "confdefs.h" #include int @@ -5581,16 +5582,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5584: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5587: \$? = $ac_status" >&5 + echo "$as_me:5588: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5590: \"$ac_try\"") >&5 + { (eval echo "$as_me:5591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5593: \$? = $ac_status" >&5 + echo "$as_me:5594: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -5601,15 +5602,15 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:5604: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:5605: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:5609: result: ok" >&5 + echo "$as_me:5610: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:5612: error: Cannot find dlsym function" >&5 + { { echo "$as_me:5613: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -5617,12 +5618,12 @@ fi if test "x$with_gpm" != xyes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:5620: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:5621: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:5625: checking for soname of gpm library" >&5 +echo "$as_me:5626: checking for soname of gpm library" >&5 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 if test "${cf_cv_gpm_soname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5656,15 +5657,15 @@ do done LIBS="$cf_add_libs" - if { (eval echo "$as_me:5659: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5662: \$? = $ac_status" >&5 + echo "$as_me:5663: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5664: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5667: \$? = $ac_status" >&5 + echo "$as_me:5668: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown @@ -5675,7 +5676,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:5678: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:5679: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -5710,7 +5711,7 @@ cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:5713: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:5714: checking for Gpm_Wgetch in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5718,7 +5719,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5721 "configure" +#line 5722 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5737,16 +5738,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5740: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5741: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5743: \$? = $ac_status" >&5 + echo "$as_me:5744: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5746: \"$ac_try\"") >&5 + { (eval echo "$as_me:5747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5749: \$? = $ac_status" >&5 + echo "$as_me:5750: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -5757,11 +5758,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5760: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5761: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then -echo "$as_me:5764: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5765: checking if GPM is weakly bound to curses library" >&5 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 if test "${cf_cv_check_gpm_wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5785,15 +5786,15 @@ CF_EOF # to rely on the static library, noting that some packagers may not # include it. LIBS="-static -lgpm -dynamic $LIBS" - if { (eval echo "$as_me:5788: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5789: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5791: \$? = $ac_status" >&5 + echo "$as_me:5792: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5793: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5796: \$? = $ac_status" >&5 + echo "$as_me:5797: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes @@ -5805,11 +5806,11 @@ CF_EOF fi fi -echo "$as_me:5808: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5809: result: $cf_cv_check_gpm_wgetch" >&5 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 if test "$cf_cv_check_gpm_wgetch" != yes ; then - { echo "$as_me:5812: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5813: WARNING: GPM library is already linked with curses - read the FAQ" >&5 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} fi @@ -5819,7 +5820,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5822: checking if you want to use sysmouse" >&5 +echo "$as_me:5823: checking if you want to use sysmouse" >&5 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 # Check whether --with-sysmouse or --without-sysmouse was given. @@ -5831,7 +5832,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5834 "configure" +#line 5835 "configure" #include "confdefs.h" #include @@ -5854,16 +5855,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5857: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5858: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5860: \$? = $ac_status" >&5 + echo "$as_me:5861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5863: \"$ac_try\"") >&5 + { (eval echo "$as_me:5864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5866: \$? = $ac_status" >&5 + echo "$as_me:5867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5873,7 +5874,7 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5876: result: $cf_with_sysmouse" >&5 +echo "$as_me:5877: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF @@ -5892,7 +5893,7 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' fi -echo "$as_me:5895: checking for default loader flags" >&5 +echo "$as_me:5896: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (libtool) LD_MODEL='' ;; @@ -5901,13 +5902,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:5904: result: $LD_MODEL" >&5 +echo "$as_me:5905: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in (shared) -echo "$as_me:5910: checking if rpath option should be used" >&5 +echo "$as_me:5911: checking if rpath option should be used" >&5 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 # Check whether --enable-rpath or --disable-rpath was given. @@ -5917,10 +5918,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5920: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5921: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5923: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5924: checking if shared libraries should be relinked during install" >&5 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 # Check whether --enable-relink or --disable-relink was given. @@ -5930,7 +5931,7 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5933: result: $cf_cv_do_relink" >&5 +echo "$as_me:5934: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac @@ -5939,7 +5940,7 @@ esac rel_builddir=.. LD_RPATH_OPT= -echo "$as_me:5942: checking for an rpath option" >&5 +echo "$as_me:5943: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -5970,12 +5971,12 @@ case $cf_cv_system_name in (*) ;; esac -echo "$as_me:5973: result: $LD_RPATH_OPT" >&5 +echo "$as_me:5974: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:5978: checking if we need a space after rpath option" >&5 + echo "$as_me:5979: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -5996,7 +5997,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 5999 "configure" +#line 6000 "configure" #include "confdefs.h" int @@ -6008,16 +6009,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6014: \$? = $ac_status" >&5 + echo "$as_me:6015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6017: \"$ac_try\"") >&5 + { (eval echo "$as_me:6018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6020: \$? = $ac_status" >&5 + echo "$as_me:6021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -6027,7 +6028,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:6030: result: $cf_rpath_space" >&5 + echo "$as_me:6031: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -6048,7 +6049,7 @@ esac cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:6051: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:6052: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -6063,9 +6064,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:6066: result: $withval" >&5 + echo "$as_me:6067: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:6068: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:6069: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -6074,7 +6075,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:6077: result: $cf_cv_shlib_version" >&5 + echo "$as_me:6078: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -6097,14 +6098,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:6100: checking which $CC option to use" >&5 + echo "$as_me:6101: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >conftest.$ac_ext <<_ACEOF -#line 6107 "configure" +#line 6108 "configure" #include "confdefs.h" #include int @@ -6116,16 +6117,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6122: \$? = $ac_status" >&5 + echo "$as_me:6123: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6125: \"$ac_try\"") >&5 + { (eval echo "$as_me:6126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6128: \$? = $ac_status" >&5 + echo "$as_me:6129: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -6134,7 +6135,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:6137: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:6138: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -6205,7 +6206,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:6208: checking if ld -search_paths_first works" >&5 + echo "$as_me:6209: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6214,7 +6215,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 6217 "configure" +#line 6218 "configure" #include "confdefs.h" int @@ -6226,16 +6227,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6232: \$? = $ac_status" >&5 + echo "$as_me:6233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6235: \"$ac_try\"") >&5 + { (eval echo "$as_me:6236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6238: \$? = $ac_status" >&5 + echo "$as_me:6239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -6246,7 +6247,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:6249: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:6250: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test $cf_cv_ldflags_search_paths_first = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -6471,7 +6472,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 6474 "configure" +#line 6475 "configure" #include "confdefs.h" #include int @@ -6483,16 +6484,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6489: \$? = $ac_status" >&5 + echo "$as_me:6490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6492: \"$ac_try\"") >&5 + { (eval echo "$as_me:6493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6495: \$? = $ac_status" >&5 + echo "$as_me:6496: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -6529,7 +6530,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:6532: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:6533: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -6539,7 +6540,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { @@ -6551,18 +6552,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:6554: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:6555: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:6556: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6559: \$? = $ac_status" >&5 + echo "$as_me:6560: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:6561: result: yes" >&5 + echo "$as_me:6562: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:6565: result: no" >&5 + echo "$as_me:6566: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -6577,17 +6578,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:6580: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:6581: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6584: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6585: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 for model in $cf_list_models; do case $model in (libtool) -echo "$as_me:6590: checking for additional libtool options" >&5 +echo "$as_me:6591: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -6597,7 +6598,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:6600: result: $with_libtool_opts" >&5 +echo "$as_me:6601: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -6608,7 +6609,7 @@ case .$with_libtool_opts in ;; esac -echo "$as_me:6611: checking if exported-symbols file should be used" >&5 +echo "$as_me:6612: checking if exported-symbols file should be used" >&5 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 # Check whether --with-export-syms or --without-export-syms was given. @@ -6623,7 +6624,7 @@ then with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' fi -echo "$as_me:6626: result: $with_export_syms" >&5 +echo "$as_me:6627: result: $with_export_syms" >&5 echo "${ECHO_T}$with_export_syms" >&6 if test "x$with_export_syms" != xno then @@ -6634,15 +6635,15 @@ fi ;; (shared) if test "$CC_SHARED_OPTS" = "unknown"; then - { { echo "$as_me:6637: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:6638: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi # workaround for inept transition to PIE vs PIC... - echo "$as_me:6642: checking if current CFLAGS link properly" >&5 + echo "$as_me:6643: checking if current CFLAGS link properly" >&5 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6645 "configure" +#line 6646 "configure" #include "confdefs.h" #include int @@ -6654,16 +6655,16 @@ printf("Hello work\n"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6657: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6660: \$? = $ac_status" >&5 + echo "$as_me:6661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6663: \"$ac_try\"") >&5 + { (eval echo "$as_me:6664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6666: \$? = $ac_status" >&5 + echo "$as_me:6667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cflags_work=yes else @@ -6672,18 +6673,18 @@ cat conftest.$ac_ext >&5 cf_cflags_work=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6675: result: $cf_cflags_work" >&5 + echo "$as_me:6676: result: $cf_cflags_work" >&5 echo "${ECHO_T}$cf_cflags_work" >&6 if test "$cf_cflags_work" = no then test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 -echo "${as_me:-configure}:6681: testing try to work around by appending shared-options ..." 1>&5 +echo "${as_me:-configure}:6682: testing try to work around by appending shared-options ..." 1>&5 CFLAGS="$CFLAGS $CC_SHARED_OPTS" fi -echo "$as_me:6686: checking if versioned-symbols file should be used" >&5 +echo "$as_me:6687: checking if versioned-symbols file should be used" >&5 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 # Check whether --with-versioned-syms or --without-versioned-syms was given. @@ -6698,7 +6699,7 @@ then with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' fi -echo "$as_me:6701: result: $with_versioned_syms" >&5 +echo "$as_me:6702: result: $with_versioned_syms" >&5 echo "${ECHO_T}$with_versioned_syms" >&6 RESULTING_SYMS= @@ -6714,7 +6715,7 @@ then MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6717: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6718: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*-dy\ *) @@ -6722,11 +6723,11 @@ echo "${as_me:-configure}:6717: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6725: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6726: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*) - { echo "$as_me:6729: WARNING: this system does not support versioned-symbols" >&5 + { echo "$as_me:6730: WARNING: this system does not support versioned-symbols" >&5 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} ;; esac @@ -6738,7 +6739,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} # symbols. if test "x$VERSIONED_SYMS" != "x" then - echo "$as_me:6741: checking if wildcards can be used to selectively omit symbols" >&5 + echo "$as_me:6742: checking if wildcards can be used to selectively omit symbols" >&5 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 WILDCARD_SYMS=no @@ -6775,7 +6776,7 @@ local: } submodule_1.0; EOF cat >conftest.$ac_ext <&5 |fgrep _ismissing | egrep '[ ][DT][ ]'` test -n "$cf_missing" && WILDCARD_SYMS=yes fi - echo "$as_me:6809: result: $WILDCARD_SYMS" >&5 + echo "$as_me:6810: result: $WILDCARD_SYMS" >&5 echo "${ECHO_T}$WILDCARD_SYMS" >&6 rm -f conftest.* fi @@ -6817,7 +6818,7 @@ fi done # pretend that ncurses==ncursesw==ncursest -echo "$as_me:6820: checking if you want to disable library suffixes" >&5 +echo "$as_me:6821: checking if you want to disable library suffixes" >&5 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. @@ -6834,13 +6835,13 @@ else disable_lib_suffixes=no fi; -echo "$as_me:6837: result: $disable_lib_suffixes" >&5 +echo "$as_me:6838: result: $disable_lib_suffixes" >&5 echo "${ECHO_T}$disable_lib_suffixes" >&6 ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared"; then -echo "$as_me:6843: checking if rpath-hack should be disabled" >&5 +echo "$as_me:6844: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -6857,21 +6858,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:6860: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:6861: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:6864: checking for updated LDFLAGS" >&5 +echo "$as_me:6865: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:6867: result: maybe" >&5 + echo "$as_me:6868: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:6874: checking for $ac_word" >&5 +echo "$as_me:6875: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6886,7 +6887,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:6889: found $ac_dir/$ac_word" >&5 +echo "$as_me:6890: found $ac_dir/$ac_word" >&5 break done @@ -6894,10 +6895,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:6897: result: $cf_ldd_prog" >&5 + echo "$as_me:6898: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:6900: result: no" >&5 + echo "$as_me:6901: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6911,7 +6912,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 6914 "configure" +#line 6915 "configure" #include "confdefs.h" #include int @@ -6923,16 +6924,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6929: \$? = $ac_status" >&5 + echo "$as_me:6930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6932: \"$ac_try\"") >&5 + { (eval echo "$as_me:6933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6935: \$? = $ac_status" >&5 + echo "$as_me:6936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -6960,7 +6961,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:6963: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:6964: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -6972,11 +6973,11 @@ echo "${as_me:-configure}:6963: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6975: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6976: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6979: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6980: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -7013,7 +7014,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:7016: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:7017: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -7026,11 +7027,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:7029: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7030: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:7033: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7034: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -7067,7 +7068,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:7070: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:7071: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -7080,14 +7081,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:7083: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7084: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:7087: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7088: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:7090: result: no" >&5 + echo "$as_me:7091: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7098,7 +7099,7 @@ fi ############################################################################### ### use option --with-extra-suffix to append suffix to headers and libraries -echo "$as_me:7101: checking if you wish to append extra suffix to header/library paths" >&5 +echo "$as_me:7102: checking if you wish to append extra suffix to header/library paths" >&5 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 EXTRA_SUFFIX= @@ -7117,11 +7118,11 @@ if test "${with_extra_suffix+set}" = set; then esac fi; -echo "$as_me:7120: result: $EXTRA_SUFFIX" >&5 +echo "$as_me:7121: result: $EXTRA_SUFFIX" >&5 echo "${ECHO_T}$EXTRA_SUFFIX" >&6 ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:7124: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:7125: checking if you wish to install ncurses overwriting curses" >&5 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 # Check whether --enable-overwrite or --disable-overwrite was given. @@ -7131,10 +7132,10 @@ if test "${enable_overwrite+set}" = set; then else if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi fi; -echo "$as_me:7134: result: $with_overwrite" >&5 +echo "$as_me:7135: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:7137: checking if external terminfo-database is used" >&5 +echo "$as_me:7138: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -7144,7 +7145,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:7147: result: $use_database" >&5 +echo "$as_me:7148: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case $host_os in @@ -7160,7 +7161,7 @@ NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then NCURSES_USE_DATABASE=1 - echo "$as_me:7163: checking which terminfo source-file will be installed" >&5 + echo "$as_me:7164: checking which terminfo source-file will be installed" >&5 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 # Check whether --with-database or --without-database was given. @@ -7168,10 +7169,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:7171: result: $TERMINFO_SRC" >&5 + echo "$as_me:7172: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:7174: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:7175: checking whether to use hashed database instead of directory/tree" >&5 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 # Check whether --with-hashed-db or --without-hashed-db was given. @@ -7181,13 +7182,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:7184: result: $with_hashed_db" >&5 + echo "$as_me:7185: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:7190: checking for list of fallback descriptions" >&5 +echo "$as_me:7191: checking for list of fallback descriptions" >&5 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 # Check whether --with-fallbacks or --without-fallbacks was given. @@ -7197,11 +7198,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:7200: result: $with_fallback" >&5 +echo "$as_me:7201: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:7204: checking if you want modern xterm or antique" >&5 +echo "$as_me:7205: checking if you want modern xterm or antique" >&5 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 # Check whether --with-xterm-new or --without-xterm-new was given. @@ -7215,11 +7216,11 @@ case $with_xterm_new in (no) with_xterm_new=xterm-old;; (*) with_xterm_new=xterm-new;; esac -echo "$as_me:7218: result: $with_xterm_new" >&5 +echo "$as_me:7219: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:7222: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:7223: checking if xterm backspace sends BS or DEL" >&5 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 # Check whether --with-xterm-kbs or --without-xterm-kbs was given. @@ -7240,7 +7241,7 @@ case x$with_xterm_kbs in with_xterm_kbs=$withval ;; esac -echo "$as_me:7243: result: $with_xterm_kbs" >&5 +echo "$as_me:7244: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -7250,7 +7251,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:7253: checking for list of terminfo directories" >&5 +echo "$as_me:7254: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. @@ -7290,7 +7291,7 @@ case ".$cf_src_path" in cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:7293: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:7294: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -7313,14 +7314,14 @@ case "x$cf_dst_eval" in ;; esac -echo "$as_me:7316: result: $TERMINFO_DIRS" >&5 +echo "$as_me:7317: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:7324: checking for default terminfo directory" >&5 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. @@ -7356,7 +7357,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:7359: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:7360: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -7365,7 +7366,7 @@ esac fi eval TERMINFO="$withval" -echo "$as_me:7368: result: $TERMINFO" >&5 +echo "$as_me:7369: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:7380: checking if big-core option selected" >&5 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 # Check whether --enable-big-core or --disable-big-core was given. @@ -7388,7 +7389,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 7391 "configure" +#line 7392 "configure" #include "confdefs.h" #include @@ -7402,15 +7403,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7405: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7406: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7408: \$? = $ac_status" >&5 + echo "$as_me:7409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7410: \"$ac_try\"") >&5 + { (eval echo "$as_me:7411: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7413: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -7422,7 +7423,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:7425: result: $with_big_core" >&5 +echo "$as_me:7426: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "x$with_big_core" = "xyes" && cat >>confdefs.h <<\EOF @@ -7432,7 +7433,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:7435: checking if big-strings option selected" >&5 +echo "$as_me:7436: checking if big-strings option selected" >&5 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 # Check whether --enable-big-strings or --disable-big-strings was given. @@ -7456,14 +7457,14 @@ else esac fi; -echo "$as_me:7459: result: $with_big_strings" >&5 +echo "$as_me:7460: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:7466: checking if you want termcap-fallback support" >&5 +echo "$as_me:7467: checking if you want termcap-fallback support" >&5 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 # Check whether --enable-termcap or --disable-termcap was given. @@ -7473,14 +7474,14 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:7476: result: $with_termcap" >&5 +echo "$as_me:7477: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 NCURSES_USE_TERMCAP=0 if test "x$with_termcap" != "xyes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:7483: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:7484: error: You have disabled the database w/o specifying fallbacks" >&5 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} { (exit 1); exit 1; }; } fi @@ -7493,13 +7494,13 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:7496: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:7497: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} { (exit 1); exit 1; }; } fi NCURSES_USE_TERMCAP=1 - echo "$as_me:7502: checking for list of termcap files" >&5 + echo "$as_me:7503: checking for list of termcap files" >&5 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 # Check whether --with-termpath or --without-termpath was given. @@ -7539,7 +7540,7 @@ case ".$cf_src_path" in cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:7542: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:7543: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -7562,7 +7563,7 @@ case "x$cf_dst_eval" in ;; esac - echo "$as_me:7565: result: $TERMPATH" >&5 + echo "$as_me:7566: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + echo "$as_me:7574: checking if fast termcap-loader is needed" >&5 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 # Check whether --enable-getcap or --disable-getcap was given. @@ -7580,14 +7581,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; - echo "$as_me:7583: result: $with_getcap" >&5 + echo "$as_me:7584: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "x$with_getcap" = "xyes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF - echo "$as_me:7590: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:7591: checking if translated termcaps will be cached in ~/.terminfo" >&5 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. @@ -7597,7 +7598,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; - echo "$as_me:7600: result: $with_getcap_cache" >&5 + echo "$as_me:7601: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "x$with_getcap_cache" = "xyes" && cat >>confdefs.h <<\EOF @@ -7607,7 +7608,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:7610: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:7611: checking if ~/.terminfo is wanted" >&5 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. @@ -7617,14 +7618,14 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:7620: result: $with_home_terminfo" >&5 +echo "$as_me:7621: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "x$with_home_terminfo" = "xyes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:7627: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:7628: checking if you want to use restricted environment when running as root" >&5 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 # Check whether --enable-root-environ or --disable-root-environ was given. @@ -7634,7 +7635,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:7637: result: $with_root_environ" >&5 +echo "$as_me:7638: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "x$with_root_environ" = xyes && cat >>confdefs.h <<\EOF @@ -7649,23 +7650,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7652: checking for $ac_header" >&5 +echo "$as_me:7653: 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 7658 "configure" +#line 7659 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7662: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7663: \"$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:7668: \$? = $ac_status" >&5 + echo "$as_me:7669: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7684,7 +7685,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7687: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:7688: 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:7703: 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 7708 "configure" +#line 7709 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7736,16 +7737,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7740: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7742: \$? = $ac_status" >&5 + echo "$as_me:7743: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7745: \"$ac_try\"") >&5 + { (eval echo "$as_me:7746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7748: \$? = $ac_status" >&5 + echo "$as_me:7749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7755,7 +7756,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7758: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7759: 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:7776: 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 7781 "configure" +#line 7782 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7809,16 +7810,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7812: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7815: \$? = $ac_status" >&5 + echo "$as_me:7816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7818: \"$ac_try\"") >&5 + { (eval echo "$as_me:7819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7821: \$? = $ac_status" >&5 + echo "$as_me:7822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7828,7 +7829,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7831: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7832: 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:7843: checking if link/symlink functions work" >&5 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 if test "${cf_cv_link_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7852,7 +7853,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 7855 "configure" +#line 7856 "configure" #include "confdefs.h" #include @@ -7882,15 +7883,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7885: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7886: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7888: \$? = $ac_status" >&5 + echo "$as_me:7889: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7890: \"$ac_try\"") >&5 + { (eval echo "$as_me:7891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7893: \$? = $ac_status" >&5 + echo "$as_me:7894: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -7908,7 +7909,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:7911: result: $cf_cv_link_funcs" >&5 +echo "$as_me:7912: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF @@ -7928,7 +7929,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "x$ac_cv_func_symlink" = xyes ; then - echo "$as_me:7931: checking if tic should use symbolic links" >&5 + echo "$as_me:7932: checking if tic should use symbolic links" >&5 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 # Check whether --enable-symlinks or --disable-symlinks was given. @@ -7938,21 +7939,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:7941: result: $with_symlinks" >&5 + echo "$as_me:7942: result: $with_symlinks" >&5 echo "${ECHO_T}$with_symlinks" >&6 fi # If we have hard links and did not choose to use soft links instead, there is # no reason to make this choice optional - use the hard links. if test "$with_symlinks" = no ; then - echo "$as_me:7948: checking if tic should use hard links" >&5 + echo "$as_me:7949: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 if test "x$ac_cv_func_link" = xyes ; then with_links=yes else with_links=no fi - echo "$as_me:7955: result: $with_links" >&5 + echo "$as_me:7956: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -7967,7 +7968,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7970: checking if you want broken-linker support code" >&5 +echo "$as_me:7971: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -7977,7 +7978,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7980: result: $with_broken_linker" >&5 +echo "$as_me:7981: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -7999,14 +8000,14 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:8002: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:8003: testing cygwin linker is broken anyway ..." 1>&5 ;; esac fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:8009: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:8010: checking if tputs should process BSD-style prefix padding" >&5 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 # Check whether --enable-bsdpad or --disable-bsdpad was given. @@ -8016,7 +8017,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:8019: result: $with_bsdpad" >&5 +echo "$as_me:8020: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "x$with_bsdpad" = xyes && cat >>confdefs.h <<\EOF @@ -8073,14 +8074,14 @@ case $host_os in ;; (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) -echo "$as_me:8076: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:8077: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8083 "configure" +#line 8084 "configure" #include "confdefs.h" #include int @@ -8095,16 +8096,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8101: \$? = $ac_status" >&5 + echo "$as_me:8102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8104: \"$ac_try\"") >&5 + { (eval echo "$as_me:8105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8107: \$? = $ac_status" >&5 + echo "$as_me:8108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -8113,7 +8114,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8116 "configure" +#line 8117 "configure" #include "confdefs.h" #include int @@ -8128,16 +8129,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8131: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8134: \$? = $ac_status" >&5 + echo "$as_me:8135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8137: \"$ac_try\"") >&5 + { (eval echo "$as_me:8138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8140: \$? = $ac_status" >&5 + echo "$as_me:8141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -8152,12 +8153,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8155: result: $cf_cv_gnu_source" >&5 +echo "$as_me:8156: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then -echo "$as_me:8160: checking if we should also define _DEFAULT_SOURCE" >&5 +echo "$as_me:8161: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8165,7 +8166,7 @@ else CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8168 "configure" +#line 8169 "configure" #include "confdefs.h" #include int @@ -8180,16 +8181,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8183: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8184: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8186: \$? = $ac_status" >&5 + echo "$as_me:8187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8189: \"$ac_try\"") >&5 + { (eval echo "$as_me:8190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8192: \$? = $ac_status" >&5 + echo "$as_me:8193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_default_source=no else @@ -8200,7 +8201,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8203: result: $cf_cv_default_source" >&5 +echo "$as_me:8204: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" fi @@ -8226,16 +8227,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:8229: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8230: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:8235: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8236: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8238 "configure" +#line 8239 "configure" #include "confdefs.h" #include int @@ -8250,16 +8251,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8253: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8256: \$? = $ac_status" >&5 + echo "$as_me:8257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8259: \"$ac_try\"") >&5 + { (eval echo "$as_me:8260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8262: \$? = $ac_status" >&5 + echo "$as_me:8263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8280,7 +8281,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8283 "configure" +#line 8284 "configure" #include "confdefs.h" #include int @@ -8295,16 +8296,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8299: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8301: \$? = $ac_status" >&5 + echo "$as_me:8302: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8304: \"$ac_try\"") >&5 + { (eval echo "$as_me:8305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8307: \$? = $ac_status" >&5 + echo "$as_me:8308: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8315,15 +8316,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8318: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8319: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:8323: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8324: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8326 "configure" +#line 8327 "configure" #include "confdefs.h" #include int @@ -8338,16 +8339,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8344: \$? = $ac_status" >&5 + echo "$as_me:8345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8347: \"$ac_try\"") >&5 + { (eval echo "$as_me:8348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8350: \$? = $ac_status" >&5 + echo "$as_me:8351: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8363,7 +8364,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8366: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8367: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -8501,14 +8502,14 @@ fi ;; (*) -echo "$as_me:8504: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8505: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8511 "configure" +#line 8512 "configure" #include "confdefs.h" #include @@ -8527,16 +8528,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8530: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8531: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8533: \$? = $ac_status" >&5 + echo "$as_me:8534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8536: \"$ac_try\"") >&5 + { (eval echo "$as_me:8537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8539: \$? = $ac_status" >&5 + echo "$as_me:8540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8545,7 +8546,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8548 "configure" +#line 8549 "configure" #include "confdefs.h" #include @@ -8564,16 +8565,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8570: \$? = $ac_status" >&5 + echo "$as_me:8571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8573: \"$ac_try\"") >&5 + { (eval echo "$as_me:8574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8576: \$? = $ac_status" >&5 + echo "$as_me:8577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8588,7 +8589,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8591: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8592: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8716,16 +8717,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:8719: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8720: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:8725: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8726: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8728 "configure" +#line 8729 "configure" #include "confdefs.h" #include int @@ -8740,16 +8741,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8743: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8744: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8746: \$? = $ac_status" >&5 + echo "$as_me:8747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8749: \"$ac_try\"") >&5 + { (eval echo "$as_me:8750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8752: \$? = $ac_status" >&5 + echo "$as_me:8753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8770,7 +8771,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8773 "configure" +#line 8774 "configure" #include "confdefs.h" #include int @@ -8785,16 +8786,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8788: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8789: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8791: \$? = $ac_status" >&5 + echo "$as_me:8792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8794: \"$ac_try\"") >&5 + { (eval echo "$as_me:8795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8797: \$? = $ac_status" >&5 + echo "$as_me:8798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8805,15 +8806,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8809: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:8813: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8814: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8816 "configure" +#line 8817 "configure" #include "confdefs.h" #include int @@ -8828,16 +8829,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8834: \$? = $ac_status" >&5 + echo "$as_me:8835: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8837: \"$ac_try\"") >&5 + { (eval echo "$as_me:8838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8840: \$? = $ac_status" >&5 + echo "$as_me:8841: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8853,7 +8854,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8856: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8857: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -9045,7 +9046,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:9048: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:9049: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -9055,7 +9056,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:9058: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:9059: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -9065,7 +9066,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:9068: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:9069: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -9075,10 +9076,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:9078: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:9079: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 9081 "configure" +#line 9082 "configure" #include "confdefs.h" #include int @@ -9093,16 +9094,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9097: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9099: \$? = $ac_status" >&5 + echo "$as_me:9100: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9102: \"$ac_try\"") >&5 + { (eval echo "$as_me:9103: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9105: \$? = $ac_status" >&5 + echo "$as_me:9106: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -9111,12 +9112,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9114: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:9115: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 9119 "configure" +#line 9120 "configure" #include "confdefs.h" #include int @@ -9131,16 +9132,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9134: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9137: \$? = $ac_status" >&5 + echo "$as_me:9138: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9140: \"$ac_try\"") >&5 + { (eval echo "$as_me:9141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9143: \$? = $ac_status" >&5 + echo "$as_me:9144: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -9151,19 +9152,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:9154: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:9155: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:9159: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:9160: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9166 "configure" +#line 9167 "configure" #include "confdefs.h" #include @@ -9182,16 +9183,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9185: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9186: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9188: \$? = $ac_status" >&5 + echo "$as_me:9189: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9191: \"$ac_try\"") >&5 + { (eval echo "$as_me:9192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9194: \$? = $ac_status" >&5 + echo "$as_me:9195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -9200,7 +9201,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 9203 "configure" +#line 9204 "configure" #include "confdefs.h" #include @@ -9219,16 +9220,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9222: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9225: \$? = $ac_status" >&5 + echo "$as_me:9226: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9228: \"$ac_try\"") >&5 + { (eval echo "$as_me:9229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9231: \$? = $ac_status" >&5 + echo "$as_me:9232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -9243,7 +9244,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9246: result: $cf_cv_xopen_source" >&5 +echo "$as_me:9247: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -9365,14 +9366,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS" # Work around breakage on OS X -echo "$as_me:9368: checking if SIGWINCH is defined" >&5 +echo "$as_me:9369: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9375 "configure" +#line 9376 "configure" #include "confdefs.h" #include @@ -9387,23 +9388,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9393: \$? = $ac_status" >&5 + echo "$as_me:9394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9396: \"$ac_try\"") >&5 + { (eval echo "$as_me:9397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9399: \$? = $ac_status" >&5 + echo "$as_me:9400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 9406 "configure" +#line 9407 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -9421,16 +9422,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9424: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9425: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9427: \$? = $ac_status" >&5 + echo "$as_me:9428: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9430: \"$ac_try\"") >&5 + { (eval echo "$as_me:9431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9433: \$? = $ac_status" >&5 + echo "$as_me:9434: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -9444,11 +9445,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9447: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:9448: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:9451: checking for actual SIGWINCH definition" >&5 +echo "$as_me:9452: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9459,7 +9460,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 9462 "configure" +#line 9463 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -9481,16 +9482,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9484: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9487: \$? = $ac_status" >&5 + echo "$as_me:9488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9490: \"$ac_try\"") >&5 + { (eval echo "$as_me:9491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9493: \$? = $ac_status" >&5 + echo "$as_me:9494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -9504,7 +9505,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:9507: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:9508: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -9514,13 +9515,13 @@ fi # Checks for CODESET support. -echo "$as_me:9517: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:9518: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9523 "configure" +#line 9524 "configure" #include "confdefs.h" #include int @@ -9532,16 +9533,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9535: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9536: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9538: \$? = $ac_status" >&5 + echo "$as_me:9539: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9541: \"$ac_try\"") >&5 + { (eval echo "$as_me:9542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9544: \$? = $ac_status" >&5 + echo "$as_me:9545: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -9552,7 +9553,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9555: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:9556: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -9566,7 +9567,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:9569: checking if you want wide-character code" >&5 +echo "$as_me:9570: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -9576,7 +9577,7 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:9579: result: $with_widec" >&5 +echo "$as_me:9580: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 NCURSES_WCWIDTH_GRAPHICS=1 @@ -9600,23 +9601,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9603: checking for $ac_header" >&5 +echo "$as_me:9604: 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 9609 "configure" +#line 9610 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9613: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9614: \"$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:9619: \$? = $ac_status" >&5 + echo "$as_me:9620: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9635,7 +9636,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9638: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9639: 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:9649: checking if wchar.h can be used as is" >&5 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 if test "${cf_cv_wchar_h_okay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9655 "configure" +#line 9656 "configure" #include "confdefs.h" #include @@ -9674,16 +9675,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9677: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9680: \$? = $ac_status" >&5 + echo "$as_me:9681: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9683: \"$ac_try\"") >&5 + { (eval echo "$as_me:9684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9686: \$? = $ac_status" >&5 + echo "$as_me:9687: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_h_okay=yes else @@ -9693,16 +9694,16 @@ cf_cv_wchar_h_okay=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9696: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:9697: result: $cf_cv_wchar_h_okay" >&5 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 if test $cf_cv_wchar_h_okay = no then -echo "$as_me:9702: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:9703: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 9705 "configure" +#line 9706 "configure" #include "confdefs.h" #include @@ -9718,16 +9719,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9724: \$? = $ac_status" >&5 + echo "$as_me:9725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9727: \"$ac_try\"") >&5 + { (eval echo "$as_me:9728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9730: \$? = $ac_status" >&5 + echo "$as_me:9731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -9736,16 +9737,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:9739: result: $cf_result" >&5 +echo "$as_me:9740: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" elif test "x" != "x" ; then - echo "$as_me:9745: checking checking for compatible value versus " >&5 + echo "$as_me:9746: checking checking for compatible value versus " >&5 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 9748 "configure" +#line 9749 "configure" #include "confdefs.h" #include @@ -9761,16 +9762,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9764: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9767: \$? = $ac_status" >&5 + echo "$as_me:9768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9770: \"$ac_try\"") >&5 + { (eval echo "$as_me:9771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9773: \$? = $ac_status" >&5 + echo "$as_me:9774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9779,7 +9780,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9782: result: $cf_result" >&5 + echo "$as_me:9783: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -9789,7 +9790,7 @@ fi fi -echo "$as_me:9792: checking if wcwidth agrees graphics are single-width" >&5 +echo "$as_me:9793: checking if wcwidth agrees graphics are single-width" >&5 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 if test "${cf_cv_wcwidth_graphics+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9860,7 +9861,7 @@ if test "$cross_compiling" = yes; then cf_cv_wcwidth_graphics=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 9863 "configure" +#line 9864 "configure" #include "confdefs.h" #include @@ -9904,15 +9905,15 @@ main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9907: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9908: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9910: \$? = $ac_status" >&5 + echo "$as_me:9911: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9912: \"$ac_try\"") >&5 + { (eval echo "$as_me:9913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9915: \$? = $ac_status" >&5 + echo "$as_me:9916: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wcwidth_graphics=yes else @@ -9925,7 +9926,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:9928: result: $cf_cv_wcwidth_graphics" >&5 +echo "$as_me:9929: result: $cf_cv_wcwidth_graphics" >&5 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 @@ -9936,13 +9937,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9939: checking for $ac_func" >&5 +echo "$as_me:9940: 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 9945 "configure" +#line 9946 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -9973,16 +9974,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9976: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9977: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9979: \$? = $ac_status" >&5 + echo "$as_me:9980: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9982: \"$ac_try\"") >&5 + { (eval echo "$as_me:9983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9985: \$? = $ac_status" >&5 + echo "$as_me:9986: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -9992,7 +9993,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9995: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:9996: 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:10008: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10012,7 +10013,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10015 "configure" +#line 10016 "configure" #include "confdefs.h" #include @@ -10025,16 +10026,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10028: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10029: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10031: \$? = $ac_status" >&5 + echo "$as_me:10032: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10034: \"$ac_try\"") >&5 + { (eval echo "$as_me:10035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10037: \$? = $ac_status" >&5 + echo "$as_me:10038: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -10046,12 +10047,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:10049: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10050: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10054 "configure" +#line 10055 "configure" #include "confdefs.h" #include @@ -10064,16 +10065,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10067: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10070: \$? = $ac_status" >&5 + echo "$as_me:10071: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10073: \"$ac_try\"") >&5 + { (eval echo "$as_me:10074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10076: \$? = $ac_status" >&5 + echo "$as_me:10077: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -10087,7 +10088,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10090 "configure" +#line 10091 "configure" #include "confdefs.h" #include @@ -10100,16 +10101,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10103: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10106: \$? = $ac_status" >&5 + echo "$as_me:10107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10109: \"$ac_try\"") >&5 + { (eval echo "$as_me:10110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10112: \$? = $ac_status" >&5 + echo "$as_me:10113: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -10126,9 +10127,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:10129: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:10130: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:10131: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10132: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -10219,11 +10220,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:10222: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10223: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 10226 "configure" +#line 10227 "configure" #include "confdefs.h" #include @@ -10236,21 +10237,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10239: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10242: \$? = $ac_status" >&5 + echo "$as_me:10243: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10245: \"$ac_try\"") >&5 + { (eval echo "$as_me:10246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10248: \$? = $ac_status" >&5 + echo "$as_me:10249: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:10253: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10254: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -10268,7 +10269,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:10271: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10272: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -10343,13 +10344,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:10346: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10347: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 10352 "configure" +#line 10353 "configure" #include "confdefs.h" #include @@ -10362,21 +10363,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10365: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10366: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10368: \$? = $ac_status" >&5 + echo "$as_me:10369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10371: \"$ac_try\"") >&5 + { (eval echo "$as_me:10372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10374: \$? = $ac_status" >&5 + echo "$as_me:10375: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:10379: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10380: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -10418,7 +10419,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10421: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:10422: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -10453,7 +10454,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10456 "configure" +#line 10457 "configure" #include "confdefs.h" #include int @@ -10465,16 +10466,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10471: \$? = $ac_status" >&5 + echo "$as_me:10472: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10474: \"$ac_try\"") >&5 + { (eval echo "$as_me:10475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10477: \$? = $ac_status" >&5 + echo "$as_me:10478: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10491,7 +10492,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}:10494: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10495: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10527,7 +10528,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:10530: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10531: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -10559,14 +10560,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:10562: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:10563: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10569 "configure" +#line 10570 "configure" #include "confdefs.h" #include @@ -10584,23 +10585,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10587: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10588: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10590: \$? = $ac_status" >&5 + echo "$as_me:10591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10593: \"$ac_try\"") >&5 + { (eval echo "$as_me:10594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10596: \$? = $ac_status" >&5 + echo "$as_me:10597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 10603 "configure" +#line 10604 "configure" #include "confdefs.h" #include @@ -10619,16 +10620,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10622: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10623: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10625: \$? = $ac_status" >&5 + echo "$as_me:10626: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10628: \"$ac_try\"") >&5 + { (eval echo "$as_me:10629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10631: \$? = $ac_status" >&5 + echo "$as_me:10632: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -10640,7 +10641,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10643: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:10644: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -10658,14 +10659,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:10661: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:10662: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10668 "configure" +#line 10669 "configure" #include "confdefs.h" #include @@ -10683,23 +10684,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10686: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10689: \$? = $ac_status" >&5 + echo "$as_me:10690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10692: \"$ac_try\"") >&5 + { (eval echo "$as_me:10693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10695: \$? = $ac_status" >&5 + echo "$as_me:10696: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 10702 "configure" +#line 10703 "configure" #include "confdefs.h" #include @@ -10718,16 +10719,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10724: \$? = $ac_status" >&5 + echo "$as_me:10725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10727: \"$ac_try\"") >&5 + { (eval echo "$as_me:10728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10730: \$? = $ac_status" >&5 + echo "$as_me:10731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -10739,7 +10740,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10742: result: $cf_cv_wchar_t" >&5 +echo "$as_me:10743: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -10762,14 +10763,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:10765: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:10766: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10772 "configure" +#line 10773 "configure" #include "confdefs.h" #include @@ -10787,23 +10788,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10790: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10793: \$? = $ac_status" >&5 + echo "$as_me:10794: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10796: \"$ac_try\"") >&5 + { (eval echo "$as_me:10797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10799: \$? = $ac_status" >&5 + echo "$as_me:10800: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 10806 "configure" +#line 10807 "configure" #include "confdefs.h" #include @@ -10822,16 +10823,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10825: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10826: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10828: \$? = $ac_status" >&5 + echo "$as_me:10829: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10831: \"$ac_try\"") >&5 + { (eval echo "$as_me:10832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10834: \$? = $ac_status" >&5 + echo "$as_me:10835: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -10843,7 +10844,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10846: result: $cf_cv_wint_t" >&5 +echo "$as_me:10847: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -10875,7 +10876,7 @@ EOF fi ### use option --disable-lp64 to allow long chtype -echo "$as_me:10878: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:10879: checking whether to enable _LP64 definition in curses.h" >&5 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 # Check whether --enable-lp64 or --disable-lp64 was given. @@ -10885,7 +10886,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$cf_dft_with_lp64 fi; -echo "$as_me:10888: result: $with_lp64" >&5 +echo "$as_me:10889: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "x$with_lp64" = xyes ; then @@ -10901,7 +10902,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:10904: checking for special C compiler options needed for large files" >&5 + echo "$as_me:10905: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10913,7 +10914,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 10916 "configure" +#line 10917 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -10933,16 +10934,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10936: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10939: \$? = $ac_status" >&5 + echo "$as_me:10940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10942: \"$ac_try\"") >&5 + { (eval echo "$as_me:10943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10945: \$? = $ac_status" >&5 + echo "$as_me:10946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10952,16 +10953,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:10955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10956: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10958: \$? = $ac_status" >&5 + echo "$as_me:10959: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10961: \"$ac_try\"") >&5 + { (eval echo "$as_me:10962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10964: \$? = $ac_status" >&5 + echo "$as_me:10965: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -10975,13 +10976,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:10978: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:10979: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:10984: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:10985: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10989,7 +10990,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 10992 "configure" +#line 10993 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -11009,16 +11010,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11015: \$? = $ac_status" >&5 + echo "$as_me:11016: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11018: \"$ac_try\"") >&5 + { (eval echo "$as_me:11019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11021: \$? = $ac_status" >&5 + echo "$as_me:11022: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -11027,7 +11028,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 11030 "configure" +#line 11031 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -11048,16 +11049,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11052: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11054: \$? = $ac_status" >&5 + echo "$as_me:11055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11057: \"$ac_try\"") >&5 + { (eval echo "$as_me:11058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11060: \$? = $ac_status" >&5 + echo "$as_me:11061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -11068,7 +11069,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:11071: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:11072: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -11078,7 +11079,7 @@ EOF fi rm -rf conftest* - echo "$as_me:11081: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:11082: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11086,7 +11087,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 11089 "configure" +#line 11090 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -11106,16 +11107,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11109: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11110: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11112: \$? = $ac_status" >&5 + echo "$as_me:11113: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11115: \"$ac_try\"") >&5 + { (eval echo "$as_me:11116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11118: \$? = $ac_status" >&5 + echo "$as_me:11119: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -11124,7 +11125,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 11127 "configure" +#line 11128 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -11145,16 +11146,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11148: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11149: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11151: \$? = $ac_status" >&5 + echo "$as_me:11152: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11154: \"$ac_try\"") >&5 + { (eval echo "$as_me:11155: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11157: \$? = $ac_status" >&5 + echo "$as_me:11158: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -11165,7 +11166,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:11168: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:11169: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -11178,7 +11179,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:11181: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:11182: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11186,7 +11187,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 11189 "configure" +#line 11190 "configure" #include "confdefs.h" #include int @@ -11198,16 +11199,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11201: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11202: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11204: \$? = $ac_status" >&5 + echo "$as_me:11205: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11207: \"$ac_try\"") >&5 + { (eval echo "$as_me:11208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11210: \$? = $ac_status" >&5 + echo "$as_me:11211: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -11216,7 +11217,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 11219 "configure" +#line 11220 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -11229,16 +11230,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11232: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11235: \$? = $ac_status" >&5 + echo "$as_me:11236: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11238: \"$ac_try\"") >&5 + { (eval echo "$as_me:11239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11241: \$? = $ac_status" >&5 + echo "$as_me:11242: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -11249,7 +11250,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:11252: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:11253: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -11263,13 +11264,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:11266: checking for fseeko" >&5 +echo "$as_me:11267: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11272 "configure" +#line 11273 "configure" #include "confdefs.h" #include int @@ -11281,16 +11282,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11284: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11285: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11287: \$? = $ac_status" >&5 + echo "$as_me:11288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11290: \"$ac_try\"") >&5 + { (eval echo "$as_me:11291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11293: \$? = $ac_status" >&5 + echo "$as_me:11294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -11300,7 +11301,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11303: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:11304: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -11321,14 +11322,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:11324: checking whether to use struct dirent64" >&5 + echo "$as_me:11325: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11331 "configure" +#line 11332 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -11350,16 +11351,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11354: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11356: \$? = $ac_status" >&5 + echo "$as_me:11357: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11359: \"$ac_try\"") >&5 + { (eval echo "$as_me:11360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11362: \$? = $ac_status" >&5 + echo "$as_me:11363: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -11370,7 +11371,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11373: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:11374: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -11380,7 +11381,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:11383: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:11384: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -11390,14 +11391,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:11393: result: $with_tparm_varargs" >&5 +echo "$as_me:11394: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:11400: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:11401: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -11407,14 +11408,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:11410: result: $with_tic_depends" >&5 +echo "$as_me:11411: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --disable-wattr-macros to suppress wattr* macros from curses.h -echo "$as_me:11417: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 +echo "$as_me:11418: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6 # Check whether --enable-wattr-macros or --disable-wattr-macros was given. @@ -11426,16 +11427,101 @@ else fi; if [ "x$with_wattr_macros" != xyes ]; then NCURSES_WATTR_MACROS=0 - echo "$as_me:11429: result: yes" >&5 + echo "$as_me:11430: result: yes" >&5 echo "${ECHO_T}yes" >&6 else NCURSES_WATTR_MACROS=1 - echo "$as_me:11433: result: no" >&5 + echo "$as_me:11434: result: no" >&5 echo "${ECHO_T}no" >&6 fi +echo "$as_me:11438: checking for X11 rgb file" >&5 +echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 + +# Check whether --with-x11-rgb or --without-x11-rgb was given. +if test "${with_x11_rgb+set}" = set; then + withval="$with_x11_rgb" + RGB_PATH=$withval +else + RGB_PATH=auto +fi; + +if test "x$RGB_PATH" = xauto +then + RGB_PATH='${exec_prefix}/lib/X11/rgb.txt' + for cf_path in \ + /opt/local/share/X11/rgb.txt \ + /opt/X11/share/X11/rgb.txt \ + /usr/share/X11/rgb.txt \ + /usr/X11/share/X11/rgb.txt \ + /usr/X11/lib/X11/rgb.txt \ + /usr/lib/X11/rgb.txt \ + /etc/X11/rgb.txt \ + /usr/pkg/lib/X11/rgb.txt \ + /usr/X11R7/lib/X11/rgb.txt \ + /usr/X11R6/lib/X11/rgb.txt \ + /usr/X11R5/lib/X11/rgb.txt \ + /usr/X11R4/lib/X11/rgb.txt \ + /usr/local/lib/X11/rgb.txt \ + /usr/local/share/X11/rgb.txt \ + /usr/lib64/X11/rgb.txt + do + if test -f "$cf_path" ; then + RGB_PATH="$cf_path" + break + fi + done +else + cf_path=$RGB_PATH + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$cf_path" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval cf_path="$cf_path" + case ".$cf_path" in + (.NONE/*) + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:11502: error: expected a pathname, not \"$cf_path\"" >&5 +echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi + +echo "$as_me:11510: result: $RGB_PATH" >&5 +echo "${ECHO_T}$RGB_PATH" >&6 + +cat >>confdefs.h <&5 +echo "$as_me:11524: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -11445,10 +11531,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:11448: result: $NCURSES_BOOL" >&5 +echo "$as_me:11534: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:11451: checking for alternate terminal capabilities file" >&5 +echo "$as_me:11537: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -11459,11 +11545,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:11462: result: $TERMINFO_CAPS" >&5 +echo "$as_me:11548: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:11466: checking for type of chtype" >&5 +echo "$as_me:11552: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -11473,11 +11559,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=$cf_dft_chtype fi; -echo "$as_me:11476: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:11562: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:11480: checking for type of ospeed" >&5 +echo "$as_me:11566: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -11487,11 +11573,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:11490: result: $NCURSES_OSPEED" >&5 +echo "$as_me:11576: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:11494: checking for type of mmask_t" >&5 +echo "$as_me:11580: checking for type of mmask_t" >&5 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. @@ -11501,11 +11587,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=$cf_dft_mmask_t fi; -echo "$as_me:11504: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:11590: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:11508: checking for size CCHARW_MAX" >&5 +echo "$as_me:11594: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -11515,11 +11601,11 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:11518: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:11604: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:11522: checking for type of tparm args" >&5 +echo "$as_me:11608: checking for type of tparm args" >&5 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 # Check whether --with-tparm-arg or --without-tparm-arg was given. @@ -11529,11 +11615,11 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=$cf_dft_tparm_arg fi; -echo "$as_me:11532: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:11618: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ### Enable compiling-in rcs id's -echo "$as_me:11536: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:11622: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -11543,7 +11629,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:11546: result: $with_rcs_ids" >&5 +echo "$as_me:11632: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "x$with_rcs_ids" = xyes && cat >>confdefs.h <<\EOF @@ -11552,7 +11638,7 @@ EOF ############################################################################### -echo "$as_me:11555: checking format of man-pages" >&5 +echo "$as_me:11641: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -11641,14 +11727,14 @@ case $MANPAGE_FORMAT in ;; esac -echo "$as_me:11644: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:11730: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:11647: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:11733: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:11651: checking for manpage renaming" >&5 +echo "$as_me:11737: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -11676,7 +11762,7 @@ if test "$MANPAGE_RENAMES" != no ; then if test -f $srcdir/man/$MANPAGE_RENAMES ; then MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES elif test ! -f $MANPAGE_RENAMES ; then - { { echo "$as_me:11679: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:11765: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -11690,10 +11776,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} fi fi -echo "$as_me:11693: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:11779: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:11696: checking if manpage aliases will be installed" >&5 +echo "$as_me:11782: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -11704,7 +11790,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:11707: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:11793: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in @@ -11718,7 +11804,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:11721: checking if manpage symlinks should be used" >&5 +echo "$as_me:11807: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -11731,17 +11817,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:11734: WARNING: cannot make symlinks" >&5 + { echo "$as_me:11820: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:11740: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:11826: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:11744: checking for manpage tbl" >&5 +echo "$as_me:11830: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -11752,7 +11838,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:11755: result: $MANPAGE_TBL" >&5 +echo "$as_me:11841: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -12085,7 +12171,7 @@ chmod 755 $cf_edit_man ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:12088: checking if you want to build with function extensions" >&5 +echo "$as_me:12174: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -12095,7 +12181,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:12098: result: $with_ext_funcs" >&5 +echo "$as_me:12184: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 @@ -12155,7 +12241,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:12158: checking if you want to build with SCREEN extensions" >&5 +echo "$as_me:12244: checking if you want to build with SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -12165,7 +12251,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:12168: result: $with_sp_funcs" >&5 +echo "$as_me:12254: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 @@ -12184,7 +12270,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:12187: checking if you want to build with terminal-driver" >&5 +echo "$as_me:12273: checking if you want to build with terminal-driver" >&5 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -12194,7 +12280,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:12197: result: $with_term_driver" >&5 +echo "$as_me:12283: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -12203,19 +12289,19 @@ cat >>confdefs.h <<\EOF EOF if test "x$with_termlib" != xno ; then - { { echo "$as_me:12206: error: The term-driver option conflicts with the termlib option" >&5 + { { echo "$as_me:12292: error: The term-driver option conflicts with the termlib option" >&5 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:12211: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:12297: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:12218: checking for extended use of const keyword" >&5 +echo "$as_me:12304: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -12225,7 +12311,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:12228: result: $with_ext_const" >&5 +echo "$as_me:12314: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -12233,7 +12319,7 @@ if test "x$with_ext_const" = xyes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:12236: checking if you want to use extended colors" >&5 +echo "$as_me:12322: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -12243,12 +12329,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:12246: result: $with_ext_colors" >&5 +echo "$as_me:12332: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "x$with_ext_colors" = xyes ; then if test "x$with_widec" != xyes ; then - { echo "$as_me:12251: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:12337: WARNING: This option applies only to wide-character library" >&5 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) @@ -12258,7 +12344,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12261: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12347: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12282,7 +12368,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:12285: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:12371: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -12292,7 +12378,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:12295: result: $with_ext_mouse" >&5 +echo "$as_me:12381: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "x$with_ext_mouse" = xyes ; then @@ -12303,7 +12389,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12306: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12392: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12312,7 +12398,7 @@ fi fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:12315: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:12401: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 # Check whether --enable-ext-putwin or --disable-ext-putwin was given. @@ -12322,7 +12408,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:12325: result: $with_ext_putwin" >&5 +echo "$as_me:12411: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -12332,7 +12418,7 @@ EOF fi -echo "$as_me:12335: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:12421: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -12342,20 +12428,20 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:12345: result: $with_no_padding" >&5 +echo "$as_me:12431: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:12352: checking for ANSI C header files" >&5 +echo "$as_me:12438: 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 12358 "configure" +#line 12444 "configure" #include "confdefs.h" #include #include @@ -12363,13 +12449,13 @@ else #include _ACEOF -if { (eval echo "$as_me:12366: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12452: \"$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:12372: \$? = $ac_status" >&5 + echo "$as_me:12458: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12391,7 +12477,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 12394 "configure" +#line 12480 "configure" #include "confdefs.h" #include @@ -12409,7 +12495,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 12412 "configure" +#line 12498 "configure" #include "confdefs.h" #include @@ -12430,7 +12516,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 12433 "configure" +#line 12519 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -12456,15 +12542,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12459: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12545: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12462: \$? = $ac_status" >&5 + echo "$as_me:12548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12464: \"$ac_try\"") >&5 + { (eval echo "$as_me:12550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12467: \$? = $ac_status" >&5 + echo "$as_me:12553: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12477,7 +12563,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:12480: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12566: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -12493,28 +12579,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12496: checking for $ac_header" >&5 +echo "$as_me:12582: 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 12502 "configure" +#line 12588 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12511: \$? = $ac_status" >&5 + echo "$as_me:12597: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12514: \"$ac_try\"") >&5 + { (eval echo "$as_me:12600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12517: \$? = $ac_status" >&5 + echo "$as_me:12603: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -12524,7 +12610,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12527: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12613: 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:12623: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12543 "configure" +#line 12629 "configure" #include "confdefs.h" $ac_includes_default int @@ -12555,16 +12641,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12558: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12644: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12561: \$? = $ac_status" >&5 + echo "$as_me:12647: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12564: \"$ac_try\"") >&5 + { (eval echo "$as_me:12650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12567: \$? = $ac_status" >&5 + echo "$as_me:12653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -12574,10 +12660,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12577: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:12663: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:12580: checking size of signed char" >&5 +echo "$as_me:12666: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12586,7 +12672,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 12589 "configure" +#line 12675 "configure" #include "confdefs.h" $ac_includes_default int @@ -12598,21 +12684,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12601: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12604: \$? = $ac_status" >&5 + echo "$as_me:12690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12607: \"$ac_try\"") >&5 + { (eval echo "$as_me:12693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12610: \$? = $ac_status" >&5 + echo "$as_me:12696: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12615 "configure" +#line 12701 "configure" #include "confdefs.h" $ac_includes_default int @@ -12624,16 +12710,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12630: \$? = $ac_status" >&5 + echo "$as_me:12716: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12633: \"$ac_try\"") >&5 + { (eval echo "$as_me:12719: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12636: \$? = $ac_status" >&5 + echo "$as_me:12722: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -12649,7 +12735,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12652 "configure" +#line 12738 "configure" #include "confdefs.h" $ac_includes_default int @@ -12661,16 +12747,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12667: \$? = $ac_status" >&5 + echo "$as_me:12753: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12670: \"$ac_try\"") >&5 + { (eval echo "$as_me:12756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12673: \$? = $ac_status" >&5 + echo "$as_me:12759: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -12686,7 +12772,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 12689 "configure" +#line 12775 "configure" #include "confdefs.h" $ac_includes_default int @@ -12698,16 +12784,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12701: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12787: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12704: \$? = $ac_status" >&5 + echo "$as_me:12790: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12707: \"$ac_try\"") >&5 + { (eval echo "$as_me:12793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12710: \$? = $ac_status" >&5 + echo "$as_me:12796: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -12720,12 +12806,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:12723: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12809: 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 12728 "configure" +#line 12814 "configure" #include "confdefs.h" $ac_includes_default int @@ -12741,15 +12827,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12744: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12747: \$? = $ac_status" >&5 + echo "$as_me:12833: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12749: \"$ac_try\"") >&5 + { (eval echo "$as_me:12835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12752: \$? = $ac_status" >&5 + echo "$as_me:12838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -12765,7 +12851,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:12768: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:12854: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:12865: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -12786,12 +12872,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:12789: result: $with_signed_char" >&5 +echo "$as_me:12875: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:12794: checking if you want SIGWINCH handler" >&5 +echo "$as_me:12880: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -12801,7 +12887,7 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:12804: result: $with_sigwinch" >&5 +echo "$as_me:12890: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF @@ -12809,7 +12895,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:12812: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:12898: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -12819,14 +12905,14 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:12822: result: $with_tcap_names" >&5 +echo "$as_me:12908: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 ############################################################################## -echo "$as_me:12829: checking if you want to link with the pthread library" >&5 +echo "$as_me:12915: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -12836,27 +12922,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:12839: result: $with_pthread" >&5 +echo "$as_me:12925: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:12843: checking for pthread.h" >&5 + echo "$as_me:12929: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12849 "configure" +#line 12935 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12853: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12939: \"$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:12859: \$? = $ac_status" >&5 + echo "$as_me:12945: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12875,7 +12961,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12878: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:12964: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -12885,7 +12971,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:12888: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:12974: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -12906,7 +12992,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 12909 "configure" +#line 12995 "configure" #include "confdefs.h" #include @@ -12923,16 +13009,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12929: \$? = $ac_status" >&5 + echo "$as_me:13015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12932: \"$ac_try\"") >&5 + { (eval echo "$as_me:13018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12935: \$? = $ac_status" >&5 + echo "$as_me:13021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -12942,7 +13028,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:12945: result: $with_pthread" >&5 + echo "$as_me:13031: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -12970,7 +13056,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:12973: error: Cannot link with pthread library" >&5 + { { echo "$as_me:13059: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -12980,13 +13066,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:12983: checking for pthread_kill" >&5 + echo "$as_me:13069: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12989 "configure" +#line 13075 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -13017,16 +13103,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13020: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13106: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13023: \$? = $ac_status" >&5 + echo "$as_me:13109: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13026: \"$ac_try\"") >&5 + { (eval echo "$as_me:13112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13029: \$? = $ac_status" >&5 + echo "$as_me:13115: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -13036,11 +13122,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13039: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:13125: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 if test $ac_cv_func_pthread_kill = yes; then - echo "$as_me:13043: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:13129: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -13050,7 +13136,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:13053: result: $use_pthreads_eintr" >&5 + echo "$as_me:13139: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -13061,7 +13147,7 @@ EOF fi fi - echo "$as_me:13064: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:13150: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -13071,18 +13157,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:13074: result: $use_weak_symbols" >&5 + echo "$as_me:13160: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:13078: checking if $CC supports weak symbols" >&5 +echo "$as_me:13164: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13085 "configure" +#line 13171 "configure" #include "confdefs.h" #include @@ -13108,16 +13194,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13114: \$? = $ac_status" >&5 + echo "$as_me:13200: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13117: \"$ac_try\"") >&5 + { (eval echo "$as_me:13203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13120: \$? = $ac_status" >&5 + echo "$as_me:13206: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -13128,7 +13214,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13131: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:13217: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -13161,7 +13247,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:13164: checking if you want reentrant code" >&5 +echo "$as_me:13250: checking if you want reentrant code" >&5 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -13171,7 +13257,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:13174: result: $with_reentrant" >&5 +echo "$as_me:13260: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -13243,7 +13329,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:13246: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:13332: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -13255,7 +13341,7 @@ else NCURSES_SIZE_T=short fi -echo "$as_me:13258: checking if you want opaque curses-library structures" >&5 +echo "$as_me:13344: checking if you want opaque curses-library structures" >&5 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. @@ -13277,16 +13363,16 @@ else test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no fi; -echo "$as_me:13280: result: $enable_opaque_curses" >&5 +echo "$as_me:13366: result: $enable_opaque_curses" >&5 echo "${ECHO_T}$enable_opaque_curses" >&6 test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ -{ { echo "$as_me:13285: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:13371: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:13289: checking if you want opaque form-library structures" >&5 +echo "$as_me:13375: checking if you want opaque form-library structures" >&5 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. @@ -13296,10 +13382,10 @@ if test "${enable_opaque_form+set}" = set; then else enable_opaque_form=no fi; -echo "$as_me:13299: result: $enable_opaque_form" >&5 +echo "$as_me:13385: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:13302: checking if you want opaque menu-library structures" >&5 +echo "$as_me:13388: checking if you want opaque menu-library structures" >&5 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. @@ -13309,10 +13395,10 @@ if test "${enable_opaque_menu+set}" = set; then else enable_opaque_menu=no fi; -echo "$as_me:13312: result: $enable_opaque_menu" >&5 +echo "$as_me:13398: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:13315: checking if you want opaque panel-library structures" >&5 +echo "$as_me:13401: checking if you want opaque panel-library structures" >&5 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. @@ -13322,7 +13408,7 @@ if test "${enable_opaque_panel+set}" = set; then else enable_opaque_panel=no fi; -echo "$as_me:13325: result: $enable_opaque_panel" >&5 +echo "$as_me:13411: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -13332,7 +13418,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PAN ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:13335: checking for prefix used to wrap public variables" >&5 + echo "$as_me:13421: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -13342,7 +13428,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:13345: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:13431: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -13355,7 +13441,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:13358: checking if you want all development code" >&5 +echo "$as_me:13444: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -13365,11 +13451,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:13368: result: $with_develop" >&5 +echo "$as_me:13454: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:13372: checking if you want hard-tabs code" >&5 +echo "$as_me:13458: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -13379,7 +13465,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:13382: result: $enable_hard_tabs" >&5 +echo "$as_me:13468: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -13387,7 +13473,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:13390: checking if you want limited support for xmc" >&5 +echo "$as_me:13476: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -13397,7 +13483,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:13400: result: $enable_xmc_glitch" >&5 +echo "$as_me:13486: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -13407,7 +13493,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:13410: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:13496: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -13417,7 +13503,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:13420: result: $with_assumed_color" >&5 +echo "$as_me:13506: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -13425,7 +13511,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:13428: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:13514: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -13435,7 +13521,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:13438: result: $with_hashmap" >&5 +echo "$as_me:13524: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -13443,7 +13529,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:13446: checking if you want colorfgbg code" >&5 +echo "$as_me:13532: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -13453,7 +13539,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:13456: result: $with_colorfgbg" >&5 +echo "$as_me:13542: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -13461,7 +13547,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:13464: checking if you want interop bindings" >&5 +echo "$as_me:13550: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -13471,13 +13557,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:13474: result: $with_exp_interop" >&5 +echo "$as_me:13560: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 -echo "$as_me:13480: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:13566: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -13487,7 +13573,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:13490: result: $with_safe_sprintf" >&5 +echo "$as_me:13576: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "x$with_safe_sprintf" = xyes && cat >>confdefs.h <<\EOF @@ -13497,7 +13583,7 @@ EOF ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:13500: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:13586: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -13507,7 +13593,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:13510: result: $with_scroll_hints" >&5 +echo "$as_me:13596: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -13516,7 +13602,7 @@ EOF fi -echo "$as_me:13519: checking if you want wgetch-events code" >&5 +echo "$as_me:13605: checking if you want wgetch-events code" >&5 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -13526,7 +13612,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:13529: result: $with_wgetch_events" >&5 +echo "$as_me:13615: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "x$with_wgetch_events" = xyes && cat >>confdefs.h <<\EOF @@ -13537,7 +13623,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:13540: checking if you want to see long compiling messages" >&5 +echo "$as_me:13626: 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. @@ -13571,7 +13657,7 @@ else ECHO_CC='' fi; -echo "$as_me:13574: result: $enableval" >&5 +echo "$as_me:13660: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -13583,7 +13669,7 @@ else fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:13586: checking if you want to see compiler warnings" >&5 +echo "$as_me:13672: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -13591,7 +13677,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:13594: result: $with_warnings" >&5 +echo "$as_me:13680: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -13603,12 +13689,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13606: checking if this is really Intel C compiler" >&5 + echo "$as_me:13692: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 13611 "configure" +#line 13697 "configure" #include "confdefs.h" int @@ -13625,16 +13711,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13628: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13714: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13631: \$? = $ac_status" >&5 + echo "$as_me:13717: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13634: \"$ac_try\"") >&5 + { (eval echo "$as_me:13720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13637: \$? = $ac_status" >&5 + echo "$as_me:13723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13645,7 +13731,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13648: result: $INTEL_COMPILER" >&5 + echo "$as_me:13734: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -13654,12 +13740,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:13657: checking if this is really Clang C compiler" >&5 + echo "$as_me:13743: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 13662 "configure" +#line 13748 "configure" #include "confdefs.h" int @@ -13676,16 +13762,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13679: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13682: \$? = $ac_status" >&5 + echo "$as_me:13768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13685: \"$ac_try\"") >&5 + { (eval echo "$as_me:13771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13688: \$? = $ac_status" >&5 + echo "$as_me:13774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13696,12 +13782,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13699: result: $CLANG_COMPILER" >&5 + echo "$as_me:13785: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:13807: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -13734,12 +13820,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:13737: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13823: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13740: \$? = $ac_status" >&5 + echo "$as_me:13826: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13742: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13828: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -13748,7 +13834,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:13751: checking for $CC warning options..." >&5 + { echo "$as_me:13837: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -13772,12 +13858,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $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:13775: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13778: \$? = $ac_status" >&5 + echo "$as_me:13864: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13780: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13866: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -13788,7 +13874,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}:13791: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13877: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13798,7 +13884,7 @@ echo "${as_me:-configure}:13791: 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}:13801: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13887: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13818,12 +13904,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13821: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:13907: 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 13826 "configure" +#line 13912 "configure" #include "confdefs.h" int @@ -13840,16 +13926,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13843: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13846: \$? = $ac_status" >&5 + echo "$as_me:13932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13849: \"$ac_try\"") >&5 + { (eval echo "$as_me:13935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13852: \$? = $ac_status" >&5 + echo "$as_me:13938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13860,7 +13946,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13863: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:13949: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -13869,12 +13955,12 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:13872: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:13958: 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 13877 "configure" +#line 13963 "configure" #include "confdefs.h" int @@ -13891,16 +13977,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13894: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13897: \$? = $ac_status" >&5 + echo "$as_me:13983: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13900: \"$ac_try\"") >&5 + { (eval echo "$as_me:13986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13903: \$? = $ac_status" >&5 + echo "$as_me:13989: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13911,7 +13997,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13914: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:14000: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -13923,7 +14009,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:14030: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -13958,12 +14044,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:13961: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13964: \$? = $ac_status" >&5 + echo "$as_me:14050: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13966: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14052: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -13972,7 +14058,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:13975: checking for $CXX warning options..." >&5 + { echo "$as_me:14061: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -14002,16 +14088,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:14005: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14008: \$? = $ac_status" >&5 + echo "$as_me:14094: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14010: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14096: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:14014: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14100: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -14047,10 +14133,10 @@ cat > conftest.i <&5 + { echo "$as_me:14136: 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:14188: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14105: \$? = $ac_status" >&5 + echo "$as_me:14191: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14107: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14193: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -14163,7 +14249,7 @@ fi rm -rf conftest* fi -echo "$as_me:14166: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:14252: 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. @@ -14173,7 +14259,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:14176: result: $with_string_hacks" >&5 +echo "$as_me:14262: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -14182,15 +14268,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:14185: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:14271: 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:14187: checking for strlcat" >&5 + echo "$as_me:14273: 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 14193 "configure" +#line 14279 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strlcat (); below. */ @@ -14221,16 +14307,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14224: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14310: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14227: \$? = $ac_status" >&5 + echo "$as_me:14313: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14230: \"$ac_try\"") >&5 + { (eval echo "$as_me:14316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14233: \$? = $ac_status" >&5 + echo "$as_me:14319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -14240,7 +14326,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14243: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:14329: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -14250,7 +14336,7 @@ EOF else - echo "$as_me:14253: checking for strlcat in -lbsd" >&5 + echo "$as_me:14339: 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 @@ -14258,7 +14344,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14261 "configure" +#line 14347 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14277,16 +14363,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14280: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14366: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14283: \$? = $ac_status" >&5 + echo "$as_me:14369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14286: \"$ac_try\"") >&5 + { (eval echo "$as_me:14372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14289: \$? = $ac_status" >&5 + echo "$as_me:14375: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -14297,7 +14383,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14300: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:14386: 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 @@ -14320,23 +14406,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:14323: checking for $ac_header" >&5 +echo "$as_me:14409: 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 14329 "configure" +#line 14415 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14333: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14419: \"$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:14339: \$? = $ac_status" >&5 + echo "$as_me:14425: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14355,7 +14441,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14358: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14444: 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:14465: 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 14385 "configure" +#line 14471 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14413,16 +14499,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14419: \$? = $ac_status" >&5 + echo "$as_me:14505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14422: \"$ac_try\"") >&5 + { (eval echo "$as_me:14508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14425: \$? = $ac_status" >&5 + echo "$as_me:14511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14432,7 +14518,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14435: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14521: 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:14534: 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. @@ -14455,7 +14541,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:14458: result: $with_assertions" >&5 +echo "$as_me:14544: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -14471,7 +14557,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:14474: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:14560: 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. @@ -14488,7 +14574,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:14491: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:14577: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -14602,23 +14688,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:14605: checking for dmalloc.h" >&5 + echo "$as_me:14691: 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 14611 "configure" +#line 14697 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14615: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14701: \"$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:14621: \$? = $ac_status" >&5 + echo "$as_me:14707: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14637,11 +14723,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14640: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14726: 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:14644: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14730: 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 @@ -14649,7 +14735,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14652 "configure" +#line 14738 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14668,16 +14754,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14757: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14674: \$? = $ac_status" >&5 + echo "$as_me:14760: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14677: \"$ac_try\"") >&5 + { (eval echo "$as_me:14763: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14680: \$? = $ac_status" >&5 + echo "$as_me:14766: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -14688,7 +14774,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14691: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14777: 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:14792: 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. @@ -14720,7 +14806,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:14723: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:14809: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -14834,23 +14920,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:14837: checking for dbmalloc.h" >&5 + echo "$as_me:14923: 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 14843 "configure" +#line 14929 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14847: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14933: \"$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:14853: \$? = $ac_status" >&5 + echo "$as_me:14939: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14869,11 +14955,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14872: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:14958: 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:14876: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:14962: 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 @@ -14881,7 +14967,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14884 "configure" +#line 14970 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14900,16 +14986,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14903: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14989: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14906: \$? = $ac_status" >&5 + echo "$as_me:14992: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14909: \"$ac_try\"") >&5 + { (eval echo "$as_me:14995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14912: \$? = $ac_status" >&5 + echo "$as_me:14998: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -14920,7 +15006,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14923: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:15009: 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:15024: 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. @@ -14952,7 +15038,7 @@ EOF else with_valgrind= fi; -echo "$as_me:14955: result: ${with_valgrind:-no}" >&5 +echo "$as_me:15041: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -15065,7 +15151,7 @@ fi ;; esac -echo "$as_me:15068: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:15154: 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. @@ -15075,7 +15161,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:15078: result: $with_no_leaks" >&5 +echo "$as_me:15164: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -15127,7 +15213,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15130: checking whether to add trace feature to all models" >&5 +echo "$as_me:15216: 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. @@ -15137,7 +15223,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:15140: result: $cf_with_trace" >&5 +echo "$as_me:15226: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -15251,7 +15337,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:15254: checking if we want to use GNAT projects" >&5 +echo "$as_me:15340: 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. @@ -15268,7 +15354,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:15271: result: $enable_gnat_projects" >&5 +echo "$as_me:15357: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -15278,13 +15364,13 @@ case $cf_cv_system_name in LIBS=" -lpsapi $LIBS" ;; (*) -echo "$as_me:15281: checking for gettimeofday" >&5 +echo "$as_me:15367: 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 15287 "configure" +#line 15373 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -15315,16 +15401,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15318: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15404: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15321: \$? = $ac_status" >&5 + echo "$as_me:15407: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15324: \"$ac_try\"") >&5 + { (eval echo "$as_me:15410: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15327: \$? = $ac_status" >&5 + echo "$as_me:15413: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -15334,7 +15420,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15337: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:15423: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -15344,7 +15430,7 @@ EOF else -echo "$as_me:15347: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:15433: 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 @@ -15352,7 +15438,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15355 "configure" +#line 15441 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15371,16 +15457,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15377: \$? = $ac_status" >&5 + echo "$as_me:15463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15380: \"$ac_try\"") >&5 + { (eval echo "$as_me:15466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15383: \$? = $ac_status" >&5 + echo "$as_me:15469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -15391,7 +15477,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15394: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:15480: 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 @@ -15421,14 +15507,14 @@ fi ;; esac -echo "$as_me:15424: checking if -lm needed for math functions" >&5 +echo "$as_me:15510: 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 15431 "configure" +#line 15517 "configure" #include "confdefs.h" #include @@ -15444,16 +15530,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:15447: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15450: \$? = $ac_status" >&5 + echo "$as_me:15536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15453: \"$ac_try\"") >&5 + { (eval echo "$as_me:15539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15456: \$? = $ac_status" >&5 + echo "$as_me:15542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -15463,7 +15549,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15466: result: $cf_cv_need_libm" >&5 +echo "$as_me:15552: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -15471,13 +15557,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:15474: checking for ANSI C header files" >&5 +echo "$as_me:15560: 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 15480 "configure" +#line 15566 "configure" #include "confdefs.h" #include #include @@ -15485,13 +15571,13 @@ else #include _ACEOF -if { (eval echo "$as_me:15488: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15574: \"$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:15494: \$? = $ac_status" >&5 + echo "$as_me:15580: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15513,7 +15599,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 15516 "configure" +#line 15602 "configure" #include "confdefs.h" #include @@ -15531,7 +15617,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 15534 "configure" +#line 15620 "configure" #include "confdefs.h" #include @@ -15552,7 +15638,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 15555 "configure" +#line 15641 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -15578,15 +15664,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15667: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15584: \$? = $ac_status" >&5 + echo "$as_me:15670: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 + { (eval echo "$as_me:15672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15589: \$? = $ac_status" >&5 + echo "$as_me:15675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15599,7 +15685,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:15602: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15688: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -15612,13 +15698,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:15615: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:15701: 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 15621 "configure" +#line 15707 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -15633,16 +15719,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15639: \$? = $ac_status" >&5 + echo "$as_me:15725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15642: \"$ac_try\"") >&5 + { (eval echo "$as_me:15728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15645: \$? = $ac_status" >&5 + echo "$as_me:15731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -15652,7 +15738,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15655: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15741: 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:15754: 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 @@ -15673,7 +15759,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15676 "configure" +#line 15762 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15692,16 +15778,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15695: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15781: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15698: \$? = $ac_status" >&5 + echo "$as_me:15784: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15701: \"$ac_try\"") >&5 + { (eval echo "$as_me:15787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15704: \$? = $ac_status" >&5 + echo "$as_me:15790: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -15712,14 +15798,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15715: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:15801: 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:15722: checking for opendir in -lx" >&5 + echo "$as_me:15808: 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 @@ -15727,7 +15813,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15730 "configure" +#line 15816 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15746,16 +15832,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15749: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15835: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15752: \$? = $ac_status" >&5 + echo "$as_me:15838: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15755: \"$ac_try\"") >&5 + { (eval echo "$as_me:15841: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15758: \$? = $ac_status" >&5 + echo "$as_me:15844: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -15766,7 +15852,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15769: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:15855: 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" @@ -15774,13 +15860,13 @@ fi fi -echo "$as_me:15777: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:15863: 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 15783 "configure" +#line 15869 "configure" #include "confdefs.h" #include #include @@ -15796,16 +15882,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15802: \$? = $ac_status" >&5 + echo "$as_me:15888: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15805: \"$ac_try\"") >&5 + { (eval echo "$as_me:15891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15808: \$? = $ac_status" >&5 + echo "$as_me:15894: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -15815,7 +15901,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15818: result: $ac_cv_header_time" >&5 +echo "$as_me:15904: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -15834,13 +15920,13 @@ case $host_os in ;; esac -echo "$as_me:15837: checking for regcomp" >&5 +echo "$as_me:15923: 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 15843 "configure" +#line 15929 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -15871,16 +15957,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15874: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15960: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15877: \$? = $ac_status" >&5 + echo "$as_me:15963: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15880: \"$ac_try\"") >&5 + { (eval echo "$as_me:15966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15883: \$? = $ac_status" >&5 + echo "$as_me:15969: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -15890,7 +15976,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15893: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:15979: 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 @@ -15899,7 +15985,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:15902: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:15988: 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 @@ -15907,7 +15993,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15910 "configure" +#line 15996 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15926,16 +16012,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15929: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15932: \$? = $ac_status" >&5 + echo "$as_me:16018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15935: \"$ac_try\"") >&5 + { (eval echo "$as_me:16021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15938: \$? = $ac_status" >&5 + echo "$as_me:16024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -15946,7 +16032,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15949: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:16035: 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 @@ -15975,13 +16061,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:15978: checking for compile" >&5 + echo "$as_me:16064: 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 15984 "configure" +#line 16070 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -16012,16 +16098,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16101: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16018: \$? = $ac_status" >&5 + echo "$as_me:16104: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16021: \"$ac_try\"") >&5 + { (eval echo "$as_me:16107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16024: \$? = $ac_status" >&5 + echo "$as_me:16110: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -16031,13 +16117,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16034: result: $ac_cv_func_compile" >&5 +echo "$as_me:16120: 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:16040: checking for compile in -lgen" >&5 + echo "$as_me:16126: 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 @@ -16045,7 +16131,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16048 "configure" +#line 16134 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16064,16 +16150,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16067: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16153: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16070: \$? = $ac_status" >&5 + echo "$as_me:16156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16073: \"$ac_try\"") >&5 + { (eval echo "$as_me:16159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16076: \$? = $ac_status" >&5 + echo "$as_me:16162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -16084,7 +16170,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16087: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16173: 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 @@ -16112,11 +16198,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:16115: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16201: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:16119: checking for regular-expression headers" >&5 +echo "$as_me:16205: 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 @@ -16128,7 +16214,7 @@ case $cf_regex_func in for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 16131 "configure" +#line 16217 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -16143,16 +16229,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16146: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16232: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16149: \$? = $ac_status" >&5 + echo "$as_me:16235: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16152: \"$ac_try\"") >&5 + { (eval echo "$as_me:16238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16155: \$? = $ac_status" >&5 + echo "$as_me:16241: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16169,7 +16255,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 16172 "configure" +#line 16258 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -16187,16 +16273,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16276: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16193: \$? = $ac_status" >&5 + echo "$as_me:16279: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16196: \"$ac_try\"") >&5 + { (eval echo "$as_me:16282: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16199: \$? = $ac_status" >&5 + echo "$as_me:16285: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16212,11 +16298,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:16215: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16301: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in - (no) { echo "$as_me:16219: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:16305: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -16255,23 +16341,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16258: checking for $ac_header" >&5 +echo "$as_me:16344: 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 16264 "configure" +#line 16350 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16268: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16354: \"$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:16274: \$? = $ac_status" >&5 + echo "$as_me:16360: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16290,7 +16376,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16293: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16379: 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:16392: 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 16312 "configure" +#line 16398 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16316: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16402: \"$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:16322: \$? = $ac_status" >&5 + echo "$as_me:16408: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16338,7 +16424,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16341: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16427: 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:16437: 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 @@ -16358,7 +16444,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 16361 "configure" +#line 16447 "configure" #include "confdefs.h" #include <$cf_header> @@ -16371,16 +16457,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16374: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16460: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16377: \$? = $ac_status" >&5 + echo "$as_me:16463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16380: \"$ac_try\"") >&5 + { (eval echo "$as_me:16466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16383: \$? = $ac_status" >&5 + echo "$as_me:16469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -16392,7 +16478,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16395: result: $cf_cv_getopt_header" >&5 +echo "$as_me:16481: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -16413,7 +16499,7 @@ fi # Note: even non-Posix ISC needs to declare fd_set if test "x$ISC" = xyes ; then -echo "$as_me:16416: checking for main in -lcposix" >&5 +echo "$as_me:16502: checking for main in -lcposix" >&5 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16421,7 +16507,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16424 "configure" +#line 16510 "configure" #include "confdefs.h" int @@ -16433,16 +16519,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16436: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16522: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16439: \$? = $ac_status" >&5 + echo "$as_me:16525: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16442: \"$ac_try\"") >&5 + { (eval echo "$as_me:16528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16445: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -16453,7 +16539,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16456: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:16542: result: $ac_cv_lib_cposix_main" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 if test $ac_cv_lib_cposix_main = yes; then cat >>confdefs.h <&5 + echo "$as_me:16553: checking for bzero in -linet" >&5 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_bzero+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16472,7 +16558,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16475 "configure" +#line 16561 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16491,16 +16577,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16580: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16497: \$? = $ac_status" >&5 + echo "$as_me:16583: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16500: \"$ac_try\"") >&5 + { (eval echo "$as_me:16586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16503: \$? = $ac_status" >&5 + echo "$as_me:16589: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -16511,7 +16597,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16514: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:16600: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then @@ -16534,14 +16620,14 @@ LIBS="$cf_add_libs" fi fi -echo "$as_me:16537: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16623: 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 16544 "configure" +#line 16630 "configure" #include "confdefs.h" #include @@ -16561,16 +16647,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16650: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16567: \$? = $ac_status" >&5 + echo "$as_me:16653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16570: \"$ac_try\"") >&5 + { (eval echo "$as_me:16656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16573: \$? = $ac_status" >&5 + echo "$as_me:16659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -16582,7 +16668,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16585: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16671: 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 @@ -16597,13 +16683,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:16600: checking for an ANSI C-conforming const" >&5 +echo "$as_me:16686: 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 16606 "configure" +#line 16692 "configure" #include "confdefs.h" int @@ -16661,16 +16747,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16667: \$? = $ac_status" >&5 + echo "$as_me:16753: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16670: \"$ac_try\"") >&5 + { (eval echo "$as_me:16756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16673: \$? = $ac_status" >&5 + echo "$as_me:16759: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -16680,7 +16766,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16683: result: $ac_cv_c_const" >&5 +echo "$as_me:16769: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -16690,7 +16776,7 @@ EOF fi -echo "$as_me:16693: checking for inline" >&5 +echo "$as_me:16779: 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 @@ -16698,7 +16784,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 16701 "configure" +#line 16787 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -16707,16 +16793,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16796: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16713: \$? = $ac_status" >&5 + echo "$as_me:16799: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16716: \"$ac_try\"") >&5 + { (eval echo "$as_me:16802: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16719: \$? = $ac_status" >&5 + echo "$as_me:16805: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -16727,7 +16813,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16730: result: $ac_cv_c_inline" >&5 +echo "$as_me:16816: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -16753,7 +16839,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:16756: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:16842: 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 @@ -16762,7 +16848,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 16765 "configure" +#line 16851 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -16774,16 +16860,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16780: \$? = $ac_status" >&5 + echo "$as_me:16866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16783: \"$ac_try\"") >&5 + { (eval echo "$as_me:16869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16786: \$? = $ac_status" >&5 + echo "$as_me:16872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -16795,7 +16881,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:16798: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:16884: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -16901,7 +16987,7 @@ fi fi fi -echo "$as_me:16904: checking for signal global datatype" >&5 +echo "$as_me:16990: 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 @@ -16913,7 +16999,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 16916 "configure" +#line 17002 "configure" #include "confdefs.h" #include @@ -16936,16 +17022,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16942: \$? = $ac_status" >&5 + echo "$as_me:17028: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16945: \"$ac_try\"") >&5 + { (eval echo "$as_me:17031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16948: \$? = $ac_status" >&5 + echo "$as_me:17034: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -16959,7 +17045,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16962: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:17048: 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:17057: 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 @@ -16978,7 +17064,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 16981 "configure" +#line 17067 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -17013,15 +17099,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17019: \$? = $ac_status" >&5 + echo "$as_me:17105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17021: \"$ac_try\"") >&5 + { (eval echo "$as_me:17107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17024: \$? = $ac_status" >&5 + echo "$as_me:17110: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -17036,7 +17122,7 @@ fi fi -echo "$as_me:17039: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:17125: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:17137: 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 17058 "configure" +#line 17144 "configure" #include "confdefs.h" int @@ -17067,16 +17153,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17070: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17156: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17073: \$? = $ac_status" >&5 + echo "$as_me:17159: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17076: \"$ac_try\"") >&5 + { (eval echo "$as_me:17162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17079: \$? = $ac_status" >&5 + echo "$as_me:17165: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -17088,7 +17174,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17091: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:17177: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -17104,14 +17190,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:17107: checking if external errno is declared" >&5 +echo "$as_me:17193: 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 17114 "configure" +#line 17200 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17129,16 +17215,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17218: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17135: \$? = $ac_status" >&5 + echo "$as_me:17221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17138: \"$ac_try\"") >&5 + { (eval echo "$as_me:17224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17141: \$? = $ac_status" >&5 + echo "$as_me:17227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -17149,7 +17235,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17152: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:17238: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -17164,14 +17250,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:17167: checking if external errno exists" >&5 +echo "$as_me:17253: 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 17174 "configure" +#line 17260 "configure" #include "confdefs.h" #undef errno @@ -17186,16 +17272,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17189: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17192: \$? = $ac_status" >&5 + echo "$as_me:17278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17195: \"$ac_try\"") >&5 + { (eval echo "$as_me:17281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17198: \$? = $ac_status" >&5 + echo "$as_me:17284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -17206,7 +17292,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17209: result: $cf_cv_have_errno" >&5 +echo "$as_me:17295: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -17219,7 +17305,7 @@ EOF fi -echo "$as_me:17222: checking if data-only library module links" >&5 +echo "$as_me:17308: 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 @@ -17227,20 +17313,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17319: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17236: \$? = $ac_status" >&5 + echo "$as_me:17322: \$? = $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:17342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17259: \$? = $ac_status" >&5 + echo "$as_me:17345: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17269,7 +17355,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17272 "configure" +#line 17358 "configure" #include "confdefs.h" int main(void) @@ -17280,15 +17366,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17283: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17286: \$? = $ac_status" >&5 + echo "$as_me:17372: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17288: \"$ac_try\"") >&5 + { (eval echo "$as_me:17374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17291: \$? = $ac_status" >&5 + echo "$as_me:17377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -17303,7 +17389,7 @@ fi fi -echo "$as_me:17306: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17392: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17344,13 +17430,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17347: checking for $ac_func" >&5 +echo "$as_me:17433: 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 17353 "configure" +#line 17439 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17381,16 +17467,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17387: \$? = $ac_status" >&5 + echo "$as_me:17473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17390: \"$ac_try\"") >&5 + { (eval echo "$as_me:17476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17393: \$? = $ac_status" >&5 + echo "$as_me:17479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17400,7 +17486,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17403: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17489: 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:17501: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:17422: checking for terminal-capability database functions" >&5 +echo "$as_me:17508: 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 17429 "configure" +#line 17515 "configure" #include "confdefs.h" #include @@ -17446,16 +17532,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17449: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17535: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17452: \$? = $ac_status" >&5 + echo "$as_me:17538: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17455: \"$ac_try\"") >&5 + { (eval echo "$as_me:17541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17458: \$? = $ac_status" >&5 + echo "$as_me:17544: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -17466,7 +17552,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17469: result: $cf_cv_cgetent" >&5 +echo "$as_me:17555: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -17476,14 +17562,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:17479: checking if cgetent uses const parameter" >&5 +echo "$as_me:17565: 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 17486 "configure" +#line 17572 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -17506,16 +17592,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17512: \$? = $ac_status" >&5 + echo "$as_me:17598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17515: \"$ac_try\"") >&5 + { (eval echo "$as_me:17601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17518: \$? = $ac_status" >&5 + echo "$as_me:17604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -17526,7 +17612,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17529: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:17615: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -17540,14 +17626,14 @@ fi fi -echo "$as_me:17543: checking for isascii" >&5 +echo "$as_me:17629: 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 17550 "configure" +#line 17636 "configure" #include "confdefs.h" #include int @@ -17559,16 +17645,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17562: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17648: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17565: \$? = $ac_status" >&5 + echo "$as_me:17651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17568: \"$ac_try\"") >&5 + { (eval echo "$as_me:17654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17571: \$? = $ac_status" >&5 + echo "$as_me:17657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -17579,7 +17665,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17582: result: $cf_cv_have_isascii" >&5 +echo "$as_me:17668: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -17587,10 +17673,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:17590: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:17676: 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 17593 "configure" +#line 17679 "configure" #include "confdefs.h" #include @@ -17604,16 +17690,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17693: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17610: \$? = $ac_status" >&5 + echo "$as_me:17696: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17613: \"$ac_try\"") >&5 + { (eval echo "$as_me:17699: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17616: \$? = $ac_status" >&5 + echo "$as_me:17702: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -17621,7 +17707,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17624 "configure" +#line 17710 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17636,16 +17722,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17639: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17642: \$? = $ac_status" >&5 + echo "$as_me:17728: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17645: \"$ac_try\"") >&5 + { (eval echo "$as_me:17731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17648: \$? = $ac_status" >&5 + echo "$as_me:17734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -17661,11 +17747,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17664: result: $sigact_bad" >&5 +echo "$as_me:17750: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:17668: checking if nanosleep really works" >&5 +echo "$as_me:17754: 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 @@ -17675,7 +17761,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17678 "configure" +#line 17764 "configure" #include "confdefs.h" #include @@ -17700,15 +17786,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17703: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17789: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17706: \$? = $ac_status" >&5 + echo "$as_me:17792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17708: \"$ac_try\"") >&5 + { (eval echo "$as_me:17794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17711: \$? = $ac_status" >&5 + echo "$as_me:17797: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -17720,7 +17806,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17723: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:17809: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -17735,23 +17821,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17738: checking for $ac_header" >&5 +echo "$as_me:17824: 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 17744 "configure" +#line 17830 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17748: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17834: \"$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:17754: \$? = $ac_status" >&5 + echo "$as_me:17840: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17770,7 +17856,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17773: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17859: 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:17874: 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 17794 "configure" +#line 17880 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17798: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17884: \"$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:17804: \$? = $ac_status" >&5 + echo "$as_me:17890: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17820,7 +17906,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17823: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17909: 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:17927: 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 17844 "configure" +#line 17930 "configure" #include "confdefs.h" #include int @@ -17853,16 +17939,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17856: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17942: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17859: \$? = $ac_status" >&5 + echo "$as_me:17945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17862: \"$ac_try\"") >&5 + { (eval echo "$as_me:17948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17865: \$? = $ac_status" >&5 + echo "$as_me:17951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -17870,7 +17956,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17873 "configure" +#line 17959 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17884,16 +17970,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17887: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17973: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17890: \$? = $ac_status" >&5 + echo "$as_me:17976: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17893: \"$ac_try\"") >&5 + { (eval echo "$as_me:17979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17896: \$? = $ac_status" >&5 + echo "$as_me:17982: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -17909,19 +17995,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:17912: result: $termios_bad" >&5 + echo "$as_me:17998: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:17917: checking for tcgetattr" >&5 +echo "$as_me:18003: 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 17924 "configure" +#line 18010 "configure" #include "confdefs.h" #include @@ -17949,16 +18035,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17952: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18038: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17955: \$? = $ac_status" >&5 + echo "$as_me:18041: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17958: \"$ac_try\"") >&5 + { (eval echo "$as_me:18044: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17961: \$? = $ac_status" >&5 + echo "$as_me:18047: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -17968,21 +18054,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17971: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:18057: 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:17978: checking for vsscanf function or workaround" >&5 +echo "$as_me:18064: 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 17985 "configure" +#line 18071 "configure" #include "confdefs.h" #include @@ -17998,16 +18084,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18087: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18004: \$? = $ac_status" >&5 + echo "$as_me:18090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18007: \"$ac_try\"") >&5 + { (eval echo "$as_me:18093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18010: \$? = $ac_status" >&5 + echo "$as_me:18096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -18015,7 +18101,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18018 "configure" +#line 18104 "configure" #include "confdefs.h" #include @@ -18037,16 +18123,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18040: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18126: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18043: \$? = $ac_status" >&5 + echo "$as_me:18129: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18046: \"$ac_try\"") >&5 + { (eval echo "$as_me:18132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18049: \$? = $ac_status" >&5 + echo "$as_me:18135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -18054,7 +18140,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18057 "configure" +#line 18143 "configure" #include "confdefs.h" #include @@ -18076,16 +18162,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18082: \$? = $ac_status" >&5 + echo "$as_me:18168: \$? = $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:18171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18088: \$? = $ac_status" >&5 + echo "$as_me:18174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -18100,7 +18186,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:18103: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:18189: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in @@ -18126,23 +18212,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18129: checking for $ac_header" >&5 +echo "$as_me:18215: 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 18135 "configure" +#line 18221 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18139: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18225: \"$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:18145: \$? = $ac_status" >&5 + echo "$as_me:18231: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18161,7 +18247,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18164: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18250: 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:18260: 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 @@ -18182,7 +18268,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 18185 "configure" +#line 18271 "configure" #include "confdefs.h" #include @@ -18223,15 +18309,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18312: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18229: \$? = $ac_status" >&5 + echo "$as_me:18315: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18231: \"$ac_try\"") >&5 + { (eval echo "$as_me:18317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18234: \$? = $ac_status" >&5 + echo "$as_me:18320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -18246,16 +18332,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18249: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:18335: 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:18252: checking for mkstemp" >&5 + echo "$as_me:18338: 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 18258 "configure" +#line 18344 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -18286,16 +18372,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18375: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18292: \$? = $ac_status" >&5 + echo "$as_me:18378: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18295: \"$ac_try\"") >&5 + { (eval echo "$as_me:18381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18298: \$? = $ac_status" >&5 + echo "$as_me:18384: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -18305,7 +18391,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18308: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:18394: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -18326,21 +18412,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:18329: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:18415: 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:18332: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:18418: 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:18338: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18424: 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 18343 "configure" +#line 18429 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -18357,15 +18443,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18446: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18363: \$? = $ac_status" >&5 + echo "$as_me:18449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18365: \"$ac_try\"") >&5 + { (eval echo "$as_me:18451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18368: \$? = $ac_status" >&5 + echo "$as_me:18454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -18378,7 +18464,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:18381: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:18467: 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 @@ -18389,13 +18475,13 @@ EOF fi fi -echo "$as_me:18392: checking for intptr_t" >&5 +echo "$as_me:18478: 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 18398 "configure" +#line 18484 "configure" #include "confdefs.h" $ac_includes_default int @@ -18410,16 +18496,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18413: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18499: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18416: \$? = $ac_status" >&5 + echo "$as_me:18502: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18419: \"$ac_try\"") >&5 + { (eval echo "$as_me:18505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18422: \$? = $ac_status" >&5 + echo "$as_me:18508: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -18429,7 +18515,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18432: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:18518: 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 : @@ -18441,13 +18527,13 @@ EOF fi -echo "$as_me:18444: checking for ssize_t" >&5 +echo "$as_me:18530: 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 18450 "configure" +#line 18536 "configure" #include "confdefs.h" $ac_includes_default int @@ -18462,16 +18548,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18465: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18468: \$? = $ac_status" >&5 + echo "$as_me:18554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18471: \"$ac_try\"") >&5 + { (eval echo "$as_me:18557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18474: \$? = $ac_status" >&5 + echo "$as_me:18560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else @@ -18481,7 +18567,7 @@ ac_cv_type_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18484: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:18570: 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 : @@ -18493,14 +18579,14 @@ EOF fi -echo "$as_me:18496: checking for type sigaction_t" >&5 +echo "$as_me:18582: 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 18503 "configure" +#line 18589 "configure" #include "confdefs.h" #include @@ -18513,16 +18599,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18516: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18602: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18519: \$? = $ac_status" >&5 + echo "$as_me:18605: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18522: \"$ac_try\"") >&5 + { (eval echo "$as_me:18608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18525: \$? = $ac_status" >&5 + echo "$as_me:18611: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -18533,14 +18619,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18536: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:18622: 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:18543: checking declaration of size-change" >&5 +echo "$as_me:18629: 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 @@ -18555,7 +18641,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 18558 "configure" +#line 18644 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -18599,16 +18685,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18602: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18605: \$? = $ac_status" >&5 + echo "$as_me:18691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18608: \"$ac_try\"") >&5 + { (eval echo "$as_me:18694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18611: \$? = $ac_status" >&5 + echo "$as_me:18697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -18627,7 +18713,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:18630: result: $cf_cv_sizechange" >&5 +echo "$as_me:18716: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -18645,13 +18731,13 @@ EOF esac fi -echo "$as_me:18648: checking for memmove" >&5 +echo "$as_me:18734: 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 18654 "configure" +#line 18740 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -18682,16 +18768,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18685: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18771: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18688: \$? = $ac_status" >&5 + echo "$as_me:18774: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18691: \"$ac_try\"") >&5 + { (eval echo "$as_me:18777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18694: \$? = $ac_status" >&5 + echo "$as_me:18780: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -18701,19 +18787,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18704: result: $ac_cv_func_memmove" >&5 +echo "$as_me:18790: 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:18710: checking for bcopy" >&5 +echo "$as_me:18796: 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 18716 "configure" +#line 18802 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -18744,16 +18830,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18833: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18750: \$? = $ac_status" >&5 + echo "$as_me:18836: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18753: \"$ac_try\"") >&5 + { (eval echo "$as_me:18839: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18756: \$? = $ac_status" >&5 + echo "$as_me:18842: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -18763,11 +18849,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18766: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:18852: 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:18770: checking if bcopy does overlapping moves" >&5 + echo "$as_me:18856: 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 @@ -18777,7 +18863,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18780 "configure" +#line 18866 "configure" #include "confdefs.h" int main(void) { @@ -18791,15 +18877,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18794: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18797: \$? = $ac_status" >&5 + echo "$as_me:18883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18799: \"$ac_try\"") >&5 + { (eval echo "$as_me:18885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18802: \$? = $ac_status" >&5 + echo "$as_me:18888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -18812,7 +18898,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18815: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:18901: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -18839,13 +18925,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:18842: checking for $ac_func" >&5 +echo "$as_me:18928: 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 18848 "configure" +#line 18934 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -18876,16 +18962,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18879: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18882: \$? = $ac_status" >&5 + echo "$as_me:18968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18885: \"$ac_try\"") >&5 + { (eval echo "$as_me:18971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18888: \$? = $ac_status" >&5 + echo "$as_me:18974: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -18895,7 +18981,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18898: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:18984: 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:18994: 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 @@ -18915,7 +19001,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18918 "configure" +#line 19004 "configure" #include "confdefs.h" #include @@ -18967,15 +19053,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18970: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19056: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18973: \$? = $ac_status" >&5 + echo "$as_me:19059: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18975: \"$ac_try\"") >&5 + { (eval echo "$as_me:19061: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18978: \$? = $ac_status" >&5 + echo "$as_me:19064: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -18987,21 +19073,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18990: result: $cf_cv_working_poll" >&5 +echo "$as_me:19076: 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:18997: checking for va_copy" >&5 +echo "$as_me:19083: 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 19004 "configure" +#line 19090 "configure" #include "confdefs.h" #include @@ -19018,16 +19104,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19024: \$? = $ac_status" >&5 + echo "$as_me:19110: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19027: \"$ac_try\"") >&5 + { (eval echo "$as_me:19113: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19030: \$? = $ac_status" >&5 + echo "$as_me:19116: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -19037,7 +19123,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19040: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:19126: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && @@ -19045,14 +19131,14 @@ cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:19048: checking for __va_copy" >&5 +echo "$as_me:19134: 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 19055 "configure" +#line 19141 "configure" #include "confdefs.h" #include @@ -19069,16 +19155,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19158: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19075: \$? = $ac_status" >&5 + echo "$as_me:19161: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19078: \"$ac_try\"") >&5 + { (eval echo "$as_me:19164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19081: \$? = $ac_status" >&5 + echo "$as_me:19167: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -19088,7 +19174,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19091: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:19177: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && @@ -19096,13 +19182,13 @@ cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:19099: checking for pid_t" >&5 +echo "$as_me:19185: 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 19105 "configure" +#line 19191 "configure" #include "confdefs.h" $ac_includes_default int @@ -19117,16 +19203,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19120: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19123: \$? = $ac_status" >&5 + echo "$as_me:19209: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19126: \"$ac_try\"") >&5 + { (eval echo "$as_me:19212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19129: \$? = $ac_status" >&5 + echo "$as_me:19215: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -19136,7 +19222,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19139: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:19225: 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 : @@ -19151,23 +19237,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:19154: checking for $ac_header" >&5 +echo "$as_me:19240: 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 19160 "configure" +#line 19246 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19164: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19250: \"$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:19170: \$? = $ac_status" >&5 + echo "$as_me:19256: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19186,7 +19272,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19189: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19275: 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:19288: 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 19208 "configure" +#line 19294 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -19236,16 +19322,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19325: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19242: \$? = $ac_status" >&5 + echo "$as_me:19328: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19245: \"$ac_try\"") >&5 + { (eval echo "$as_me:19331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19248: \$? = $ac_status" >&5 + echo "$as_me:19334: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -19255,7 +19341,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19258: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19344: 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:19356: 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 @@ -19290,15 +19376,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19293: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19379: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19296: \$? = $ac_status" >&5 + echo "$as_me:19382: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19298: \"$ac_try\"") >&5 + { (eval echo "$as_me:19384: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19301: \$? = $ac_status" >&5 + echo "$as_me:19387: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -19310,7 +19396,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19313: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:19399: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -19324,12 +19410,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:19327: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19413: 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:19332: checking for working vfork" >&5 + echo "$as_me:19418: 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 @@ -19338,7 +19424,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 19341 "configure" +#line 19427 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -19435,15 +19521,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19438: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19524: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19441: \$? = $ac_status" >&5 + echo "$as_me:19527: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19443: \"$ac_try\"") >&5 + { (eval echo "$as_me:19529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19446: \$? = $ac_status" >&5 + echo "$as_me:19532: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -19455,13 +19541,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19458: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:19544: 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:19464: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19550: 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 @@ -19488,7 +19574,7 @@ fi # special check for test/ditto.c -echo "$as_me:19491: checking for openpty in -lutil" >&5 +echo "$as_me:19577: 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 @@ -19496,7 +19582,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19499 "configure" +#line 19585 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19515,16 +19601,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19518: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19521: \$? = $ac_status" >&5 + echo "$as_me:19607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19524: \"$ac_try\"") >&5 + { (eval echo "$as_me:19610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19527: \$? = $ac_status" >&5 + echo "$as_me:19613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -19535,7 +19621,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19538: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19624: 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 @@ -19543,7 +19629,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19546: checking for openpty header" >&5 +echo "$as_me:19632: 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 @@ -19570,7 +19656,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 19573 "configure" +#line 19659 "configure" #include "confdefs.h" #include <$cf_header> @@ -19587,16 +19673,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19590: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19593: \$? = $ac_status" >&5 + echo "$as_me:19679: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19596: \"$ac_try\"") >&5 + { (eval echo "$as_me:19682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19599: \$? = $ac_status" >&5 + echo "$as_me:19685: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -19614,7 +19700,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:19617: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19703: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19684,7 +19770,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19687 "configure" +#line 19773 "configure" #include "confdefs.h" #include int @@ -19696,16 +19782,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19785: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19702: \$? = $ac_status" >&5 + echo "$as_me:19788: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19705: \"$ac_try\"") >&5 + { (eval echo "$as_me:19791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19708: \$? = $ac_status" >&5 + echo "$as_me:19794: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19722,7 +19808,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}:19725: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19811: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19758,7 +19844,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}:19761: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19847: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19769,7 +19855,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:19772: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:19858: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -19838,7 +19924,7 @@ if test -n "$cf_item" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19841 "configure" +#line 19927 "configure" #include "confdefs.h" #include int @@ -19850,16 +19936,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19853: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19939: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19856: \$? = $ac_status" >&5 + echo "$as_me:19942: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19859: \"$ac_try\"") >&5 + { (eval echo "$as_me:19945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19862: \$? = $ac_status" >&5 + echo "$as_me:19948: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19876,7 +19962,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}:19879: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19965: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19956,7 +20042,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}:19959: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20045: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19973,23 +20059,23 @@ fi fi esac -echo "$as_me:19976: checking for db.h" >&5 +echo "$as_me:20062: 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 19982 "configure" +#line 20068 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:19986: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20072: \"$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:19992: \$? = $ac_status" >&5 + echo "$as_me:20078: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20008,11 +20094,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20011: result: $ac_cv_header_db_h" >&5 +echo "$as_me:20097: 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:20015: checking for version of db" >&5 +echo "$as_me:20101: 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 @@ -20023,10 +20109,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:20026: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:20112: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 20029 "configure" +#line 20115 "configure" #include "confdefs.h" $ac_includes_default @@ -20056,16 +20142,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20059: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20062: \$? = $ac_status" >&5 + echo "$as_me:20148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20065: \"$ac_try\"") >&5 + { (eval echo "$as_me:20151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20068: \$? = $ac_status" >&5 + echo "$as_me:20154: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -20079,16 +20165,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:20082: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:20168: 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:20086: error: Cannot determine version of db" >&5 + { { echo "$as_me:20172: 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:20091: checking for db libraries" >&5 +echo "$as_me:20177: 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 @@ -20118,10 +20204,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:20121: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:20207: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 20124 "configure" +#line 20210 "configure" #include "confdefs.h" $ac_includes_default @@ -20176,16 +20262,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20179: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20265: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20182: \$? = $ac_status" >&5 + echo "$as_me:20268: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20185: \"$ac_try\"") >&5 + { (eval echo "$as_me:20271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20188: \$? = $ac_status" >&5 + echo "$as_me:20274: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -20205,11 +20291,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:20208: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:20294: 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:20212: error: Cannot determine library for db" >&5 + { { echo "$as_me:20298: 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 @@ -20235,7 +20321,7 @@ fi else - { { echo "$as_me:20238: error: Cannot find db.h" >&5 + { { echo "$as_me:20324: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -20250,7 +20336,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:20253: checking if we should include stdbool.h" >&5 +echo "$as_me:20339: 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 @@ -20258,7 +20344,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20261 "configure" +#line 20347 "configure" #include "confdefs.h" int @@ -20270,23 +20356,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20273: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20359: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20276: \$? = $ac_status" >&5 + echo "$as_me:20362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20279: \"$ac_try\"") >&5 + { (eval echo "$as_me:20365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20282: \$? = $ac_status" >&5 + echo "$as_me:20368: \$? = $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 20289 "configure" +#line 20375 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -20302,16 +20388,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20305: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20391: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20308: \$? = $ac_status" >&5 + echo "$as_me:20394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20311: \"$ac_try\"") >&5 + { (eval echo "$as_me:20397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20314: \$? = $ac_status" >&5 + echo "$as_me:20400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -20325,13 +20411,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:20328: result: yes" >&5 +then echo "$as_me:20414: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20330: result: no" >&5 +else echo "$as_me:20416: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:20334: checking for builtin bool type" >&5 +echo "$as_me:20420: 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 @@ -20339,7 +20425,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20342 "configure" +#line 20428 "configure" #include "confdefs.h" #include @@ -20354,16 +20440,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20357: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20360: \$? = $ac_status" >&5 + echo "$as_me:20446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20363: \"$ac_try\"") >&5 + { (eval echo "$as_me:20449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20366: \$? = $ac_status" >&5 + echo "$as_me:20452: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -20376,9 +20462,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:20379: result: yes" >&5 +then echo "$as_me:20465: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20381: result: no" >&5 +else echo "$as_me:20467: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20395,10 +20481,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:20398: checking if we already have C++ library" >&5 + echo "$as_me:20484: 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 20401 "configure" +#line 20487 "configure" #include "confdefs.h" #include @@ -20412,16 +20498,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20415: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20418: \$? = $ac_status" >&5 + echo "$as_me:20504: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20421: \"$ac_try\"") >&5 + { (eval echo "$as_me:20507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20424: \$? = $ac_status" >&5 + echo "$as_me:20510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_libstdcpp=yes else @@ -20430,7 +20516,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:20433: result: $cf_have_libstdcpp" >&5 + echo "$as_me:20519: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -20449,7 +20535,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:20452: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:20538: 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 @@ -20475,7 +20561,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20478 "configure" +#line 20564 "configure" #include "confdefs.h" #include @@ -20489,16 +20575,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20492: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20578: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20495: \$? = $ac_status" >&5 + echo "$as_me:20581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20498: \"$ac_try\"") >&5 + { (eval echo "$as_me:20584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20501: \$? = $ac_status" >&5 + echo "$as_me:20587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -20510,7 +20596,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:20513: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:20599: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="-l$cf_stdcpp_libname" @@ -20532,7 +20618,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:20535: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:20621: 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 @@ -20547,15 +20633,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:20550: \"$ac_try\"") >&5 +if { (eval echo "$as_me:20636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20553: \$? = $ac_status" >&5 + echo "$as_me:20639: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:20555: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:20641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20558: \$? = $ac_status" >&5 + echo "$as_me:20644: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -20566,10 +20652,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:20569: result: yes" >&5 + echo "$as_me:20655: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:20572: result: no" >&5 + echo "$as_me:20658: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20589,7 +20675,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:20592: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:20678: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -20610,7 +20696,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20613 "configure" +#line 20699 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -20624,16 +20710,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20713: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20630: \$? = $ac_status" >&5 + echo "$as_me:20716: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20633: \"$ac_try\"") >&5 + { (eval echo "$as_me:20719: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20636: \$? = $ac_status" >&5 + echo "$as_me:20722: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20670,7 +20756,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20673 "configure" +#line 20759 "configure" #include "confdefs.h" #include @@ -20684,16 +20770,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20687: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20773: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20690: \$? = $ac_status" >&5 + echo "$as_me:20776: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20693: \"$ac_try\"") >&5 + { (eval echo "$as_me:20779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20696: \$? = $ac_status" >&5 + echo "$as_me:20782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20726,7 +20812,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:20729: result: $cf_cxx_library" >&5 + echo "$as_me:20815: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -20742,7 +20828,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:20745: checking how to run the C++ preprocessor" >&5 +echo "$as_me:20831: 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 @@ -20759,18 +20845,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 20762 "configure" +#line 20848 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20767: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20853: \"$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:20773: \$? = $ac_status" >&5 + echo "$as_me:20859: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20793,17 +20879,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 20796 "configure" +#line 20882 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20800: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20886: \"$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:20806: \$? = $ac_status" >&5 + echo "$as_me:20892: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20840,7 +20926,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:20843: result: $CXXCPP" >&5 +echo "$as_me:20929: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -20850,18 +20936,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 20853 "configure" +#line 20939 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20858: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20944: \"$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:20864: \$? = $ac_status" >&5 + echo "$as_me:20950: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20884,17 +20970,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 20887 "configure" +#line 20973 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20891: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20977: \"$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:20897: \$? = $ac_status" >&5 + echo "$as_me:20983: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20922,7 +21008,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:20925: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:21011: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -20937,23 +21023,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:20940: checking for $ac_header" >&5 +echo "$as_me:21026: 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 20946 "configure" +#line 21032 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20950: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21036: \"$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:20956: \$? = $ac_status" >&5 + echo "$as_me:21042: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20972,7 +21058,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20975: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:21061: 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:21074: 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 20994 "configure" +#line 21080 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20998: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21084: \"$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:21004: \$? = $ac_status" >&5 + echo "$as_me:21090: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -21020,7 +21106,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:21023: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:21109: 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:21120: 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 21037 "configure" +#line 21123 "configure" #include "confdefs.h" #include @@ -21051,16 +21137,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21054: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21140: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21057: \$? = $ac_status" >&5 + echo "$as_me:21143: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21060: \"$ac_try\"") >&5 + { (eval echo "$as_me:21146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21063: \$? = $ac_status" >&5 + echo "$as_me:21149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -21069,7 +21155,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:21072: result: $cf_iostream_namespace" >&5 + echo "$as_me:21158: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -21080,7 +21166,7 @@ EOF fi fi -echo "$as_me:21083: checking if we should include stdbool.h" >&5 +echo "$as_me:21169: 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 @@ -21088,7 +21174,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21091 "configure" +#line 21177 "configure" #include "confdefs.h" int @@ -21100,23 +21186,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21189: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21106: \$? = $ac_status" >&5 + echo "$as_me:21192: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21109: \"$ac_try\"") >&5 + { (eval echo "$as_me:21195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21112: \$? = $ac_status" >&5 + echo "$as_me:21198: \$? = $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 21119 "configure" +#line 21205 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -21132,16 +21218,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21135: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21138: \$? = $ac_status" >&5 + echo "$as_me:21224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21141: \"$ac_try\"") >&5 + { (eval echo "$as_me:21227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21144: \$? = $ac_status" >&5 + echo "$as_me:21230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -21155,13 +21241,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:21158: result: yes" >&5 +then echo "$as_me:21244: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21160: result: no" >&5 +else echo "$as_me:21246: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21164: checking for builtin bool type" >&5 +echo "$as_me:21250: 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 @@ -21169,7 +21255,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21172 "configure" +#line 21258 "configure" #include "confdefs.h" #include @@ -21184,16 +21270,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21273: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21190: \$? = $ac_status" >&5 + echo "$as_me:21276: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21193: \"$ac_try\"") >&5 + { (eval echo "$as_me:21279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21196: \$? = $ac_status" >&5 + echo "$as_me:21282: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -21206,13 +21292,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:21209: result: yes" >&5 +then echo "$as_me:21295: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21211: result: no" >&5 +else echo "$as_me:21297: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21215: checking for size of bool" >&5 +echo "$as_me:21301: 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 @@ -21223,7 +21309,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21226 "configure" +#line 21312 "configure" #include "confdefs.h" #include @@ -21265,15 +21351,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21268: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21271: \$? = $ac_status" >&5 + echo "$as_me:21357: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21273: \"$ac_try\"") >&5 + { (eval echo "$as_me:21359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21276: \$? = $ac_status" >&5 + echo "$as_me:21362: \$? = $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 @@ -21291,18 +21377,18 @@ fi fi rm -f cf_test.out -echo "$as_me:21294: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21380: 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:21300: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21386: 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:21305: checking for special defines needed for etip.h" >&5 +echo "$as_me:21391: 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" @@ -21320,7 +21406,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 21323 "configure" +#line 21409 "configure" #include "confdefs.h" #include @@ -21334,16 +21420,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21337: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21423: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21340: \$? = $ac_status" >&5 + echo "$as_me:21426: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21343: \"$ac_try\"") >&5 + { (eval echo "$as_me:21429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21346: \$? = $ac_status" >&5 + echo "$as_me:21432: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:21453: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:21372: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:21458: 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 @@ -21386,7 +21472,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21389 "configure" +#line 21475 "configure" #include "confdefs.h" class TEST { @@ -21405,15 +21491,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21411: \$? = $ac_status" >&5 + echo "$as_me:21497: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21413: \"$ac_try\"") >&5 + { (eval echo "$as_me:21499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21416: \$? = $ac_status" >&5 + echo "$as_me:21502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -21432,7 +21518,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21435: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:21521: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -21442,7 +21528,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:21445: checking if $CXX accepts static_cast" >&5 +echo "$as_me:21531: 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 @@ -21456,7 +21542,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 21459 "configure" +#line 21545 "configure" #include "confdefs.h" class NCursesPanel @@ -21500,16 +21586,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21503: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21589: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21506: \$? = $ac_status" >&5 + echo "$as_me:21592: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21509: \"$ac_try\"") >&5 + { (eval echo "$as_me:21595: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21512: \$? = $ac_status" >&5 + echo "$as_me:21598: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -21527,7 +21613,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21530: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:21616: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -21576,7 +21662,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:21579: checking for size of bool" >&5 +echo "$as_me:21665: 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 @@ -21587,7 +21673,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21590 "configure" +#line 21676 "configure" #include "confdefs.h" #include @@ -21629,15 +21715,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21632: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21718: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21635: \$? = $ac_status" >&5 + echo "$as_me:21721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21637: \"$ac_try\"") >&5 + { (eval echo "$as_me:21723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21640: \$? = $ac_status" >&5 + echo "$as_me:21726: \$? = $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 @@ -21655,25 +21741,25 @@ fi fi rm -f cf_test.out -echo "$as_me:21658: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21744: 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:21664: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21750: 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:21670: checking for fallback type of bool" >&5 + echo "$as_me:21756: 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:21676: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:21762: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -21702,7 +21788,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:21705: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:21791: 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 @@ -21713,7 +21799,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:21716: checking for $ac_word" >&5 +echo "$as_me:21802: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21728,7 +21814,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:21731: found $ac_dir/$ac_word" >&5 +echo "$as_me:21817: found $ac_dir/$ac_word" >&5 break done @@ -21737,10 +21823,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:21740: result: $gnat_exists" >&5 + echo "$as_me:21826: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:21743: result: no" >&5 + echo "$as_me:21829: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21749,12 +21835,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:21752: checking for gnat version" >&5 +echo "$as_me:21838: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:21757: result: $cf_gnat_version" >&5 +echo "$as_me:21843: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -21762,7 +21848,7 @@ case $cf_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:21765: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:21851: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -21770,7 +21856,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:21773: checking for $ac_word" >&5 +echo "$as_me:21859: 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 @@ -21785,7 +21871,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:21788: found $ac_dir/$ac_word" >&5 +echo "$as_me:21874: found $ac_dir/$ac_word" >&5 break done @@ -21794,10 +21880,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:21797: result: $M4_exists" >&5 + echo "$as_me:21883: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:21800: result: no" >&5 + echo "$as_me:21886: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21806,7 +21892,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:21809: checking if GNAT works" >&5 + echo "$as_me:21895: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -21834,7 +21920,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:21837: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:21923: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -21843,7 +21929,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:21846: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:21932: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -21860,10 +21946,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:21863: result: $ADAFLAGS" >&5 + echo "$as_me:21949: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:21866: checking if GNATPREP supports -T option" >&5 +echo "$as_me:21952: 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 @@ -21873,11 +21959,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:21876: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:21962: 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:21880: checking if GNAT supports generics" >&5 +echo "$as_me:21966: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in (3.[1-9]*|[4-9].*) @@ -21887,7 +21973,7 @@ case $cf_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:21890: result: $cf_gnat_generics" >&5 +echo "$as_me:21976: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -21899,7 +21985,7 @@ else cf_generic_objects= fi -echo "$as_me:21902: checking if GNAT supports SIGINT" >&5 +echo "$as_me:21988: 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 @@ -21947,7 +22033,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:21950: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:22036: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -21960,7 +22046,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:21963: checking if GNAT supports project files" >&5 +echo "$as_me:22049: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in (3.[0-9]*) @@ -22020,15 +22106,15 @@ CF_EOF esac ;; esac -echo "$as_me:22023: result: $cf_gnat_projects" >&5 +echo "$as_me:22109: 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:22029: checking if GNAT supports libraries" >&5 + echo "$as_me:22115: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:22031: result: $cf_gnat_libraries" >&5 + echo "$as_me:22117: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -22048,7 +22134,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:22051: checking for ada-compiler" >&5 +echo "$as_me:22137: 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. @@ -22059,12 +22145,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:22062: result: $cf_ada_compiler" >&5 +echo "$as_me:22148: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:22067: checking for ada-include" >&5 +echo "$as_me:22153: 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. @@ -22100,7 +22186,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22103: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22189: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22109,10 +22195,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:22112: result: $ADA_INCLUDE" >&5 +echo "$as_me:22198: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:22115: checking for ada-objects" >&5 +echo "$as_me:22201: 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. @@ -22148,7 +22234,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22151: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22237: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22157,10 +22243,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:22160: result: $ADA_OBJECTS" >&5 +echo "$as_me:22246: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:22163: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:22249: 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. @@ -22170,7 +22256,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:22173: result: $with_ada_sharedlib" >&5 +echo "$as_me:22259: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -22193,13 +22279,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:22196: checking for wchar_t" >&5 + echo "$as_me:22282: 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 22202 "configure" +#line 22288 "configure" #include "confdefs.h" $ac_includes_default int @@ -22214,16 +22300,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22217: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22220: \$? = $ac_status" >&5 + echo "$as_me:22306: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22223: \"$ac_try\"") >&5 + { (eval echo "$as_me:22309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22226: \$? = $ac_status" >&5 + echo "$as_me:22312: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -22233,10 +22319,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:22236: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:22322: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:22239: checking size of wchar_t" >&5 +echo "$as_me:22325: 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 @@ -22245,7 +22331,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 22248 "configure" +#line 22334 "configure" #include "confdefs.h" $ac_includes_default int @@ -22257,21 +22343,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22260: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22346: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22263: \$? = $ac_status" >&5 + echo "$as_me:22349: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22266: \"$ac_try\"") >&5 + { (eval echo "$as_me:22352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22269: \$? = $ac_status" >&5 + echo "$as_me:22355: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22274 "configure" +#line 22360 "configure" #include "confdefs.h" $ac_includes_default int @@ -22283,16 +22369,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22286: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22372: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22289: \$? = $ac_status" >&5 + echo "$as_me:22375: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22292: \"$ac_try\"") >&5 + { (eval echo "$as_me:22378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22295: \$? = $ac_status" >&5 + echo "$as_me:22381: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -22308,7 +22394,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22311 "configure" +#line 22397 "configure" #include "confdefs.h" $ac_includes_default int @@ -22320,16 +22406,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22323: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22326: \$? = $ac_status" >&5 + echo "$as_me:22412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22329: \"$ac_try\"") >&5 + { (eval echo "$as_me:22415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22332: \$? = $ac_status" >&5 + echo "$as_me:22418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -22345,7 +22431,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 22348 "configure" +#line 22434 "configure" #include "confdefs.h" $ac_includes_default int @@ -22357,16 +22443,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22360: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22363: \$? = $ac_status" >&5 + echo "$as_me:22449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22366: \"$ac_try\"") >&5 + { (eval echo "$as_me:22452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22369: \$? = $ac_status" >&5 + echo "$as_me:22455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -22379,12 +22465,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:22382: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22468: 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 22387 "configure" +#line 22473 "configure" #include "confdefs.h" $ac_includes_default int @@ -22400,15 +22486,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22403: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22406: \$? = $ac_status" >&5 + echo "$as_me:22492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22408: \"$ac_try\"") >&5 + { (eval echo "$as_me:22494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22411: \$? = $ac_status" >&5 + echo "$as_me:22497: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -22424,7 +22510,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:22427: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:22513: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:22531: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -22484,7 +22570,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:22487: result: $LIB_SUBSETS" >&5 +echo "$as_me:22573: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -22515,7 +22601,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:22518: checking default library suffix" >&5 +echo "$as_me:22604: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22526,10 +22612,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:22529: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:22615: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:22532: checking default library-dependency suffix" >&5 +echo "$as_me:22618: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -22587,10 +22673,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:22590: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:22676: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:22593: checking default object directory" >&5 +echo "$as_me:22679: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22606,11 +22692,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:22609: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:22695: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:22613: checking c++ library-dependency suffix" >&5 +echo "$as_me:22699: 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++) @@ -22678,7 +22764,7 @@ else fi fi -echo "$as_me:22681: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:22767: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -22854,19 +22940,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:22857: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:22943: 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:22866: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22952: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22869: \$? = $ac_status" >&5 + echo "$as_me:22955: \$? = $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 @@ -22877,10 +22963,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22880 "configure" +#line 22966 "configure" #include "confdefs.h" -#line 22883 "configure" +#line 22969 "configure" #include int cf_ldflags_static(FILE *fp); @@ -22895,16 +22981,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22898: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22984: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22901: \$? = $ac_status" >&5 + echo "$as_me:22987: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22904: \"$ac_try\"") >&5 + { (eval echo "$as_me:22990: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22907: \$? = $ac_status" >&5 + echo "$as_me:22993: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -22927,7 +23013,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:22930: result: $cf_ldflags_static" >&5 + echo "$as_me:23016: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -22943,7 +23029,7 @@ fi ;; esac -echo "$as_me:22946: checking where we will install curses.h" >&5 +echo "$as_me:23032: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -22953,7 +23039,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:22956: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:23042: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -22961,7 +23047,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:22964: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:23050: 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 @@ -22979,7 +23065,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:22982: checking for src modules" >&5 +echo "$as_me:23068: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -23044,7 +23130,7 @@ EOF fi fi done -echo "$as_me:23047: result: $cf_cv_src_modules" >&5 +echo "$as_me:23133: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -23281,7 +23367,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:23284: checking for $ac_word" >&5 +echo "$as_me:23370: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23298,7 +23384,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_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:23301: found $ac_dir/$ac_word" >&5 + echo "$as_me:23387: found $ac_dir/$ac_word" >&5 break fi done @@ -23310,10 +23396,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:23313: result: $TIC_PATH" >&5 + echo "$as_me:23399: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:23316: result: no" >&5 + echo "$as_me:23402: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23321,7 +23407,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:23324: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:23410: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -23357,7 +23443,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}:23360: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:23446: 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//'` @@ -23368,7 +23454,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:23371: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:23457: 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 @@ -23384,7 +23470,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:23387: result: $PKG_CFLAGS" >&5 +echo "$as_me:23473: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -23441,7 +23527,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}:23444: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:23530: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -23551,7 +23637,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:23554: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23640: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -23727,7 +23813,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23730: error: ambiguous option: $1 + { { echo "$as_me:23816: 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;} @@ -23746,7 +23832,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23749: error: unrecognized option: $1 + -*) { { echo "$as_me:23835: 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;} @@ -23865,7 +23951,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:23868: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23954: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24094,6 +24180,8 @@ s,@NCURSES_OK_WINT_T@,$NCURSES_OK_WINT_T,;t t s,@cf_cv_enable_lp64@,$cf_cv_enable_lp64,;t t s,@NCURSES_TPARM_VARARGS@,$NCURSES_TPARM_VARARGS,;t t s,@NCURSES_WATTR_MACROS@,$NCURSES_WATTR_MACROS,;t t +s,@RGB_PATH@,$RGB_PATH,;t t +s,@no_x11_rgb@,$no_x11_rgb,;t t s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t @@ -24345,7 +24433,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24348: creating $ac_file" >&5 + { echo "$as_me:24436: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24363,7 +24451,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:24366: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24454: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24376,7 +24464,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24379: error: cannot find input file: $f" >&5 + { { echo "$as_me:24467: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24392,7 +24480,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:24395: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24483: 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;} @@ -24401,7 +24489,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:24404: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24492: 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;} @@ -24438,7 +24526,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:24441: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24529: 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;} @@ -24449,7 +24537,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:24452: WARNING: Some variables may not be substituted: + { echo "$as_me:24540: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24498,7 +24586,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:24501: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24589: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24509,7 +24597,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:24512: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24600: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24522,7 +24610,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24525: error: cannot find input file: $f" >&5 + { { echo "$as_me:24613: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24580,7 +24668,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:24583: $ac_file is unchanged" >&5 + { echo "$as_me:24671: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -24925,7 +25013,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:24928: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:25016: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index de2c1725..e32a14f0 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.646 2017/08/07 23:27:56 tom Exp $ +dnl $Id: configure.in,v 1.647 2017/11/25 21:07:54 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20170501) -AC_REVISION($Revision: 1.646 $) +AC_REVISION($Revision: 1.647 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -956,6 +956,8 @@ else fi AC_SUBST(NCURSES_WATTR_MACROS) +CF_WITH_X11_RGB + ### use option --with-bool to override bool's type AC_MSG_CHECKING(for type of bool) AC_ARG_WITH(bool, diff --git a/dist.mk b/dist.mk index 3c07d12c..8b7ac275 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1192 2017/11/12 15:22:04 tom Exp $ +# $Id: dist.mk,v 1.1193 2017/11/19 20:12:11 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20171118 +NCURSES_PATCH = 20171125 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 0b62be53..8e5f6852 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -125,7 +125,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 7a2cdb5f..2b6e09ab 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -190,7 +190,7 @@
 

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 0c2acec5..eb16bf7c 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -148,7 +148,7 @@
 

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index fbacde1e..13e3721d 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.43 2017/11/19 01:54:00 tom Exp @
+  * @Id: curs_addch.3x,v 1.44 2017/11/20 01:27:20 tom Exp @
 -->
 
 
@@ -210,7 +210,7 @@
 
 

Character Set

        X/Open Curses assumes that the parameter passed to  waddch  contains  a
-       single  character.   As  discussed in curs_attr(3x), that character may
+       single  character.   As  discussed in curs_attr(3x), that character may
        have been more than eight bits in an SVr3 or SVr4  implementation,  but
        in  the  X/Open Curses model, the details are not given.  The important
        distinction between SVr4 curses and X/Open Curses is that the non-char-
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 6c9baba0..8d95b9b8 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.52 2017/11/18 23:47:37 tom Exp @
+  * @Id: curs_color.3x,v 1.53 2017/11/20 01:03:45 tom Exp @
 -->
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 36ad16b1..58c2580a 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.11 2017/03/04 21:24:04 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.12 2017/11/21 00:45:48 tom Exp @
 -->
 
 
@@ -124,9 +124,9 @@
 
 

PORTABILITY

        These functions are described in The Single Unix Specification, Version
-       2.   No  error conditions are defined.  This implementation returns ERR
+       2.   No  error conditions are defined.  This implementation returns ERR
        if the window pointer is null, or if the lower-level wget_wch call  re-
-       turns  an ERR.  In the latter case, an ERR return without other data is
+       turns  an ERR.  In the latter case, an ERR return without other data is
        treated as an end-of-file condition, and the returned array contains  a
        WEOF followed by a null wchar_t.
 
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index c84a03de..75b751b1 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.50 2017/11/18 23:56:00 tom Exp @
+  * @Id: curs_getch.3x,v 1.51 2017/11/21 00:45:48 tom Exp @
 -->
 
 
@@ -283,10 +283,10 @@
        other than ERR (OK in the case of ungetch) upon successful completion.
 
           ungetch
-               returns ERR if there is no more room in the FIFO.
+               returns ERR if there is no more room in the FIFO.
 
           wgetch
-               returns ERR if the window pointer is null, or  if  its  timeout
+               returns ERR if the window pointer is null, or  if  its  timeout
                expires without having any data, or if the execution was inter-
                rupted by a signal (errno will be set to EINTR).
 
@@ -362,7 +362,7 @@
 
        Programmers concerned about portability should be prepared  for  either
        of  two  cases: (a) signal receipt does not interrupt getch; (b) signal
-       receipt interrupts getch and causes it to return ERR with errno set  to
+       receipt interrupts getch and causes it to return ERR with errno set  to
        EINTR.
 
        The  has_key function is unique to ncurses.  We recommend that any code
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 4c9de883..a11b949b 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.22 2017/05/30 21:08:31 tom Exp @
+  * @Id: curs_getstr.3x,v 1.23 2017/11/21 00:45:48 tom Exp @
 -->
 
 
@@ -109,8 +109,8 @@
 

PORTABILITY

        These  functions  are  described  in  the XSI Curses standard, Issue 4.
        They read single-byte characters only.  The standard  does  not  define
-       any  error  conditions.   This implementation returns ERR if the window
-       pointer is null, or if the lower-level wgetch(3x) call returns an ERR.
+       any  error  conditions.   This implementation returns ERR if the window
+       pointer is null, or if the lower-level wgetch(3x) call returns an ERR.
 
        SVr3 and early SVr4 curses  implementations  did  not  reject  function
        keys;  the  SVr4.0  documentation  claimed that "special keys" (such as
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index 9698ca44..0129c873 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -67,9 +67,9 @@
 
 

RETURN VALUE

        No errors are defined in the XSI Curses standard.  This  implementation
-       checks  for null pointers, returns ERR in that case.  Also, the mv rou-
-       tines check for error moving the cursor, returning ERR  in  that  case.
-       Otherwise they return OK
+       checks  for null pointers, returns ERR in that case.  Also, the mv rou-
+       tines check for error moving the cursor, returning ERR  in  that  case.
+       Otherwise they return OK.
 
        Functions  with  a  "mv"  prefix  first perform a cursor movement using
        wmove, and return an error if the position is outside the window, or if
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index f17cae09..132e5fb9 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -93,7 +93,7 @@
 
 

PORTABILITY

        The XSI Curses defines no error conditions.  This implementation checks
-       for null pointers, returning ERR in that case.
+       for null pointers, returning ERR in that case.
 
 
 

SEE ALSO

diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index 7aea8037..995fbaee 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inopts.3x,v 1.25 2017/02/18 16:39:44 tom Exp @
+  * @Id: curs_inopts.3x,v 1.26 2017/11/21 00:47:10 tom Exp @
 -->
 
 
@@ -112,7 +112,7 @@
        The halfdelay routine is used for half-delay mode, which is similar  to
        cbreak mode in that characters typed by the user are immediately avail-
        able to the program.  However, after blocking for tenths tenths of sec-
-       onds,  ERR  is returned if nothing has been typed.  The value of tenths
+       onds,  ERR  is returned if nothing has been typed.  The value of tenths
        must be a number between 1 and 255.  Use nocbreak to  leave  half-delay
        mode.
 
@@ -207,7 +207,7 @@
 
 
 

RETURN VALUE

-       All routines that return an integer return  ERR  upon  failure  and  OK
+       All routines that return an integer return  ERR  upon  failure  and  OK
        (SVr4 specifies only "an integer value other than ERR") upon successful
        completion, unless otherwise noted in the  preceding  routine  descrip-
        tions.
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index e4c734b7..2594b52c 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -68,7 +68,7 @@
 
 
 

RETURN VALUE

-       If successful, these functions return OK.  If not, they return ERR.
+       If successful, these functions return OK.  If not, they return ERR.
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        wmove, and return an error if the position is outside the window, or if
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 0f3cf5d9..62a81b34 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -93,8 +93,8 @@
 
 
 

RETURN VALUE

-       Upon successful completion, these functions return OK.  Otherwise, they
-       return ERR.
+       Upon successful completion, these functions return OK.  Otherwise, they
+       return ERR.
 
        Functions with a "mv" prefix first  perform  a  cursor  movement  using
        wmove, and return an error if the position is outside the window, or if
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index 54f6b467..2786b03a 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -68,7 +68,7 @@
 
 
 

RETURN VALUE

-       All routines that return an integer return  ERR  upon  failure  and  OK
+       All routines that return an integer return  ERR  upon  failure  and  OK
        (SVr4 specifies only "an integer value other than ERR") upon successful
        completion, unless otherwise noted in the  preceding  routine  descrip-
        tions.
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 50b837bc..66b5c3e9 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -75,7 +75,7 @@
 
 
 

RETURN VALUE

-       All routines that return an integer return  ERR  upon  failure  and  OK
+       All routines that return an integer return  ERR  upon  failure  and  OK
        (SVr4 specifies only "an integer value other than ERR") upon successful
        completion, unless otherwise noted in the  preceding  routine  descrip-
        tions.
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index b0b8c751..9c22ec7c 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.7 2017/11/19 00:23:58 tom Exp @
+  * @Id: curs_legacy.3x,v 1.8 2017/11/21 00:45:48 tom Exp @
 -->
 
 
@@ -90,7 +90,7 @@
 
 
 

RETURN VALUE

-       Except  as noted, these functions return an integer, or ERR if the win-
+       Except  as noted, these functions return an integer, or ERR if the win-
        dow parameter is null.
 
 
diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html
index eb0a31f6..43880502 100644
--- a/doc/html/man/curs_move.3x.html
+++ b/doc/html/man/curs_move.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_move.3x,v 1.15 2017/01/07 19:25:15 tom Exp @
+  * @Id: curs_move.3x,v 1.16 2017/11/21 00:46:31 tom Exp @
 -->
 
 
@@ -64,7 +64,7 @@
 
 
 

RETURN VALUE

-       These routines return ERR upon failure and OK (SVr4 specifies only  "an
+       These routines return ERR upon failure and OK (SVr4 specifies only  "an
        integer value other than ERR") upon successful completion.
 
        Specifically, they return an error if the window pointer is null, or if
diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html
index 1a6e159b..13cc7cd2 100644
--- a/doc/html/man/curs_pad.3x.html
+++ b/doc/html/man/curs_pad.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_pad.3x,v 1.23 2017/11/19 01:29:46 tom Exp @
+  * @Id: curs_pad.3x,v 1.24 2017/11/21 01:16:26 tom Exp @
 -->
 
 
@@ -185,8 +185,10 @@
        o   SVr4 curses sets a flag in the WINDOW  structure  in  newpad  which
            tells if the window is a pad.
 
-           However, it uses this information only in wscrl, and does not check
-           in wrefresh to ensure that the pad is refreshed properly.
+           However,  it  uses this information only in waddch (to decide if it
+           should call wrefresh) and wscrl (to avoid  scrolling  a  pad),  and
+           does  not  check  in  wrefresh  to ensure that the pad is refreshed
+           properly.
 
        o   Solaris X/Open Curses checks if a window is a pad in  wnoutrefresh,
            returning ERR in that case.
diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html
index 4b8da395..6440ad2b 100644
--- a/doc/html/man/curs_print.3x.html
+++ b/doc/html/man/curs_print.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_print.3x,v 1.11 2017/01/07 17:33:15 tom Exp @
+  * @Id: curs_print.3x,v 1.12 2017/11/20 01:27:30 tom Exp @
 -->
 
 
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index b96870cd..ed3fd6e8 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.18 2017/04/17 00:07:02 tom Exp @
+  * @Id: curs_scanw.3x,v 1.19 2017/11/21 00:46:31 tom Exp @
 -->
 
 
@@ -96,11 +96,11 @@
        for both, because that header is included in <curses.h>.
 
        Both  XSI and The Single Unix Specification, Version 2 state that these
-       functions return ERR or OK.  Since the underlying scanf(3)  can  return
+       functions return ERR or OK.  Since the underlying scanf(3)  can  return
        the  number  of  items scanned, and the SVr4 code was documented to use
        this feature, this is probably an editing error which was introduced in
        XSI,  rather  than  being  done  intentionally.   Portable applications
-       should only test if the return value is ERR, since the OK value  (zero)
+       should only test if the return value is ERR, since the OK value  (zero)
        is  likely  to  be  misleading.  One possible way to get useful results
        would be to use a "%n" conversion at the end of the  format  string  to
        ensure that something was processed.
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index ecb768d2..21a25f37 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.32 2017/11/18 23:47:37 tom Exp @
+  * @Id: curs_slk.3x,v 1.33 2017/11/21 00:46:31 tom Exp @
 -->
 
 
@@ -162,7 +162,7 @@
 
 
 

RETURN VALUE

-       These  routines return ERR upon failure and OK (SVr4 specifies only "an
+       These  routines return ERR upon failure and OK (SVr4 specifies only "an
        integer value other than ERR") upon successful completion.
 
        X/Open defines no error conditions.  In this implementation
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 08782237..c415bfc5 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.56 2017/11/18 23:47:37 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.57 2017/11/21 00:46:31 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -442,7 +442,7 @@
        (*putc)(char).
 
        At least one implementation of X/Open Curses (Solaris) returns a  value
-       other  than  OK/ERR from tputs.  That returns the length of the string,
+       other  than  OK/ERR from tputs.  That returns the length of the string,
        and does no error-checking.
 
        X/Open notes that after calling mvcur, the curses state may  not  match
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html
index 5b4d8212..72326e6f 100644
--- a/doc/html/man/curs_touch.3x.html
+++ b/doc/html/man/curs_touch.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_touch.3x,v 1.17 2017/11/18 23:40:19 tom Exp @
+  * @Id: curs_touch.3x,v 1.20 2017/11/25 16:19:42 tom Exp @
 -->
 
 
@@ -91,25 +91,35 @@
 
           is_linetouched
                returns an error if the window pointer is null, or if the  line
-               number  is  outside the window.  Note that ERR is distinct from
-               TRUE and FALSE, which are the  normal  return  values  of  this
-               function.
+               number is outside the window.
+
+               The constant ERR is distinct from TRUE and FALSE, which are the
+               normal return values of this function.   Because  the  function
+               returns a bool, returning ERR (which is neither TRUE nor FALSE)
+               may not be supported by the compiler.
+
+               To provide error-checking and also match  the  X/Open  function
+               prototype, the ERR is provided by a macro named is_linetouched.
+               The actual function returns FALSE when it detects an error.
 
           wtouchln
-               returns  an error if the window pointer is null, or if the line
+               returns an error if the window pointer is null, or if the  line
                number is outside the window.
 
 
 

PORTABILITY

-       The XSI Curses standard, Issue 4 describes these functions.
+       These  functions  were  introduced  by SVr4.  The Solaris curses header
+       file, for instance, defines both an actual function and macro for each.
+       The  macros  give the same result as the actual functions.  SVr4 curses
+       does not check the window parameter win to ensure that it is not  NULL;
+       otherwise this implementation behaves the same as SVr4.
 
-       Some historic curses implementations had, as an  undocumented  feature,
-       the  ability  to  do the equivalent of clearok(..., 1) by saying touch-
-       win(stdscr) or clear(stdscr).  This will not work under ncurses.
+       The XSI Curses standard, Issue 4 describes these functions, but defines
+       no error conditions.
 
 
 

NOTES

-       Note that all routines except wtouchln may be macros.
+       All of these routines except wtouchln may be macros.
 
 
 

SEE ALSO

diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html
index cbb11d0d..4f4b58d7 100644
--- a/doc/html/man/define_key.3x.html
+++ b/doc/html/man/define_key.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -69,9 +69,9 @@
 
 

RETURN VALUE

        The keycode must be greater than zero, and the string non-null,  other-
-       wise  ERR  is  returned.  ERR may also be returned if there is insuffi-
+       wise  ERR  is  returned.  ERR may also be returned if there is insuffi-
        cient memory to allocate the data to store the definition.  If no error
-       is detected, OK is returned.
+       is detected, OK is returned.
 
 
 

PORTABILITY

diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index b8d40012..b820eb77 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form.3x,v 1.29 2017/02/18 16:46:53 tom Exp @
+  * @Id: form.3x,v 1.30 2017/11/25 20:28:02 tom Exp @
 -->
 
 
@@ -221,8 +221,20 @@
        These routines emulate the System V forms library.  They were not  sup-
        ported on Version 7 or BSD versions.
 
-       A  few functions are extensions added for ncurses, e.g., form_driver_w,
-       unfocus_current_field.
+       The  menu facility was documented in SVr4.2 in Character User Interface
+       Programming (UNIX SVR4.2).
+
+       It is not part of X/Open Curses.
+
+       Aside from ncurses, there are few implementations:
+
+       o   systems based on SVr4 source code, e.g., Solaris.
+
+       o   NetBSD curses.
+
+       A few  functions  in  this  implementation  are  extensions  added  for
+       ncurses,   but   not   provided   by   other   implementations,   e.g.,
+       form_driver_w, unfocus_current_field.
 
 
 

AUTHORS

@@ -234,7 +246,7 @@
        curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 
diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html
index 518c414e..7974dc1c 100644
--- a/doc/html/man/form_field_validation.3x.html
+++ b/doc/html/man/form_field_validation.3x.html
@@ -1,6 +1,6 @@
 
 
 
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
index e2869767..86df85c6 100644
--- a/doc/html/man/form_variables.3x.html
+++ b/doc/html/man/form_variables.3x.html
@@ -1,6 +1,6 @@
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index a6964dc6..64b58242 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -476,7 +476,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 270626cf..ab1a12e5 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -85,7 +85,7 @@
 

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 

AUTHOR

diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html
index a50ae402..b3a7425e 100644
--- a/doc/html/man/keyok.3x.html
+++ b/doc/html/man/keyok.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -63,10 +63,10 @@
 
 
 

RETURN VALUE

-       The  keycode  must  be  greater than zero, else ERR is returned.  If it
-       does not correspond to a defined key, then ERR  is  returned.   If  the
+       The  keycode  must  be  greater than zero, else ERR is returned.  If it
+       does not correspond to a defined key, then ERR  is  returned.   If  the
        enable  parameter  is  true,  then the key must have been disabled, and
-       vice versa.  Otherwise, the function returns OK.
+       vice versa.  Otherwise, the function returns OK.
 
 
 

PORTABILITY

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index a911b01d..ad2f2521 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu.3x,v 1.23 2017/02/18 16:49:46 tom Exp @
+  * @Id: menu.3x,v 1.24 2017/11/25 20:24:22 tom Exp @
 -->
 
 
@@ -200,17 +200,28 @@
        These routines emulate the System V menu library.  They were  not  sup-
        ported on Version 7 or BSD versions.
 
+       The  menu facility was documented in SVr4.2 in Character User Interface
+       Programming (UNIX SVR4.2).
+
+       It is not part of X/Open Curses.
+
+       Aside from ncurses, there are few implementations:
+
+       o   systems based on SVr4 source code, e.g., Solaris.
+
+       o   NetBSD curses.
+
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages and adaptation for ncurses by Eric S.
+       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
        Raymond.
 
 
 

SEE ALSO

-       curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+       curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index a0526f2c..43d5a112 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -59,7 +59,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index f6ed90f2..822a2d34 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -112,7 +112,7 @@
 

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 7cc98340..5c36528c 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: panel.3x,v 1.21 2017/02/18 16:53:23 tom Exp @
+  * @Id: panel.3x,v 1.24 2017/11/25 20:31:13 tom Exp @
 -->
 
 
@@ -112,7 +112,7 @@
 
        panel_hidden(pan)
               returns  TRUE if the panel is in the panel stack, FALSE if it is
-              not.  If the panel is a null pointer, return ERR.
+              not.  If the panel is a null pointer, return ERR.
 
        show_panel(pan)
               makes a hidden panel visible by placing it on top of the  panels
@@ -165,7 +165,7 @@
 
 

COMPATIBILITY

        Reasonable care has been taken  to   ensure   compatibility  with   the
-       native   panel  facility  introduced  in SVr3.2 (inspection of the SVr4
+       native   panel  facility introduced in System V (inspection of the SVr4
        manual pages suggests the programming  interface  is  unchanged).   The
        PANEL data structures are merely  similar. The  programmer is cautioned
        not to directly use PANEL fields.
@@ -185,6 +185,16 @@
        would give a link-error with static libraries).
 
 
+

PORTABILITY

+       The panel facility was documented in SVr4.2 in Character User Interface
+       Programming (UNIX SVR4.2).
+
+       It is not part of X/Open Curses.
+
+       Aside  from  ncurses,  only  systems  based  on SVr4 source code, e.g.,
+       Solaris provide this library.
+
+
 

FILES

        panel.h interface for the panels library
 
@@ -194,7 +204,7 @@
 

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.0 (patch 20171118).
+       This describes ncurses version 6.0 (patch 20171125).
 
 
 

AUTHOR

@@ -215,6 +225,7 @@
 
  • DIAGNOSTICS
  • COMPATIBILITY
  • NOTE
  • +
  • PORTABILITY
  • FILES
  • SEE ALSO
  • AUTHOR
  • diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html index 811ac652..6e338da2 100644 --- a/doc/html/man/scr_dump.5.html +++ b/doc/html/man/scr_dump.5.html @@ -26,7 +26,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: scr_dump.5,v 1.11 2017/11/18 23:51:59 tom Exp @ + * @Id: scr_dump.5,v 1.12 2017/11/25 20:12:55 tom Exp @ --> diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html index 1354f6c5..21c370be 100644 --- a/doc/html/man/tabs.1.html +++ b/doc/html/man/tabs.1.html @@ -164,7 +164,7 @@

    SEE ALSO

            tset(1), infocmp(1m), curses(3x), terminfo(5).
     
    -       This describes ncurses version 6.0 (patch 20171118).
    +       This describes ncurses version 6.0 (patch 20171125).
     
     
     
    diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
    index 864745d4..76863dbb 100644
    --- a/doc/html/man/terminfo.5.html
    +++ b/doc/html/man/terminfo.5.html
    @@ -74,7 +74,7 @@
            Terminfo describes terminals by giving a set of capabilities which they
            have, by specifying how to perform screen operations, and by specifying
            padding  requirements  and  initialization  sequences.   This describes
    -       ncurses version 6.0 (patch 20171118).
    +       ncurses version 6.0 (patch 20171125).
     
     
     

    Terminfo Entry Syntax

    diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
    index 83ba73f1..69a43208 100644
    --- a/doc/html/man/tic.1m.html
    +++ b/doc/html/man/tic.1m.html
    @@ -364,7 +364,7 @@
            infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
            term(5).  terminfo(5).
     
    -       This describes ncurses version 6.0 (patch 20171118).
    +       This describes ncurses version 6.0 (patch 20171125).
     
     
     

    AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
    index a3d4d69a..bf852833 100644
    --- a/doc/html/man/toe.1m.html
    +++ b/doc/html/man/toe.1m.html
    @@ -113,7 +113,7 @@
            tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
            minfo(5).
     
    -       This describes ncurses version 6.0 (patch 20171118).
    +       This describes ncurses version 6.0 (patch 20171125).
     
     
     
    diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
    index 558c39cc..2cc422cd 100644
    --- a/doc/html/man/tput.1.html
    +++ b/doc/html/man/tput.1.html
    @@ -27,7 +27,7 @@
       * sale, use or other dealings in this Software without prior written       *
       * authorization.                                                           *
       ****************************************************************************
    -  * @Id: tput.1,v 1.56 2017/11/18 23:51:17 tom Exp @
    +  * @Id: tput.1,v 1.57 2017/11/20 01:07:02 tom Exp @
     -->
     
     
    @@ -482,7 +482,7 @@
     

    SEE ALSO

            clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
     
    -       This describes ncurses version 6.0 (patch 20171118).
    +       This describes ncurses version 6.0 (patch 20171125).
     
     
     
    diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
    index 729cc066..9d117042 100644
    --- a/doc/html/man/tset.1.html
    +++ b/doc/html/man/tset.1.html
    @@ -26,7 +26,7 @@
       * sale, use or other dealings in this Software without prior written       *
       * authorization.                                                           *
       ****************************************************************************
    -  * @Id: tset.1,v 1.50 2017/11/18 23:51:17 tom Exp @
    +  * @Id: tset.1,v 1.52 2017/11/20 01:27:53 tom Exp @
     -->
     
     
    @@ -389,7 +389,7 @@
            csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
            ttys(5), environ(7)
     
    -       This describes ncurses version 6.0 (patch 20171118).
    +       This describes ncurses version 6.0 (patch 20171125).
     
     
     
    diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
    index cc9e398b..600ac87e 100644
    --- a/doc/html/man/user_caps.5.html
    +++ b/doc/html/man/user_caps.5.html
    @@ -26,7 +26,7 @@
       * sale, use or other dealings in this Software without prior written       *
       * authorization.                                                           *
       ****************************************************************************
    -  * @Id: user_caps.5,v 1.3 2017/11/18 23:51:59 tom Exp @
    +  * @Id: user_caps.5,v 1.4 2017/11/25 20:13:12 tom Exp @
     -->
     
     
    diff --git a/include/curses.h.in b/include/curses.h.in
    index e3ce85ff..a417c7af 100644
    --- a/include/curses.h.in
    +++ b/include/curses.h.in
    @@ -32,7 +32,7 @@
      *     and: Thomas E. Dickey                        1996-on                 *
      ****************************************************************************/
     
    -/* $Id: curses.h.in,v 1.256 2017/08/11 17:47:51 tom Exp $ */
    +/* $Id: curses.h.in,v 1.257 2017/11/21 00:11:37 tom Exp $ */
     
     #ifndef __NCURSES_H
     #define __NCURSES_H
    @@ -884,6 +884,12 @@ extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* spec
     
     extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
     
    +/*
    + * X/Open says this returns a bool; SVr4 also checked for out-of-range line.
    + * The macro provides compatibility:
    + */
    +#define is_linetouched(w,l) ((!(w) || ((l) > getmaxy(w)) || ((l) < 0)) ? ERR : (is_linetouched)((w),(l)))
    +
     /*
      * These functions are not in X/Open, but we use them in macro definitions:
      */
    diff --git a/man/curs_addch.3x b/man/curs_addch.3x
    index 69a59d60..cfcb4a26 100644
    --- a/man/curs_addch.3x
    +++ b/man/curs_addch.3x
    @@ -27,7 +27,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_addch.3x,v 1.43 2017/11/19 01:54:00 tom Exp $
    +.\" $Id: curs_addch.3x,v 1.44 2017/11/20 01:27:20 tom Exp $
     .TH curs_addch 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -210,7 +210,7 @@ ncurses(3X)).
     .SS Character Set
     X/Open Curses assumes that the parameter passed to \fBwaddch\fP contains
     a single character.
    -As discussed in \fBcurs_attr(3X)\fP, that character may have been
    +As discussed in \fBcurs_attr\fP(3X), that character may have been
     more than eight bits in an SVr3 or SVr4 implementation,
     but in the X/Open Curses model, the details are not given.
     The important distinction between SVr4 curses and X/Open Curses is
    diff --git a/man/curs_color.3x b/man/curs_color.3x
    index da1d8c96..ac868be1 100644
    --- a/man/curs_color.3x
    +++ b/man/curs_color.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_color.3x,v 1.52 2017/11/18 23:47:37 tom Exp $
    +.\" $Id: curs_color.3x,v 1.53 2017/11/20 01:03:45 tom Exp $
     .TH curs_color 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -174,7 +174,7 @@ background color for all terminals.
           \fBCOLOR_WHITE\fR
     .fi
     .PP
    -Some terminals support more than the eight (8) \*(lqANSI\*(rq colors.
    +Some terminals support more than the eight (8) \*(``ANSI\*('' colors.
     There are no standard names for those additional colors. 
     .SH VARIABLES
     .SS COLORS
    @@ -208,7 +208,7 @@ initializes its internal table representing the
     red, green and blue components of the color palette.
     .IP
     The components depend on whether the terminal uses
    -CGA (aka \*(lqANSI\*(rq) or
    +CGA (aka \*(``ANSI\*('') or
     HLS (i.e., the \fBhls\fP (\fBhue_lightness_saturation\fP) capability is set).
     The table is initialized first for eight basic colors
     (black, red, green, yellow, blue, magenta, cyan, and white),
    @@ -346,7 +346,7 @@ The routines \fBcan_change_color\fR and \fBhas_colors\fR return \fBTRUE\fR
     or \fBFALSE\fR.
     .PP
     All other routines return the integer \fBERR\fR upon failure and an \fBOK\fR
    -(SVr4 specifies only \*(lqan integer value other than \fBERR\fR\*(rq) upon successful
    +(SVr4 specifies only \*(``an integer value other than \fBERR\fR\*('') upon successful
     completion.
     .PP
     X/Open defines no error conditions.
    @@ -392,7 +392,7 @@ The A_BLINK attribute should in theory cause the background to go bright.
     This often fails to work, and even some cards for which it mostly works
     (such as the
     Paradise and compatibles) do the wrong thing when you try to set a bright
    -\*(lqyellow\*(rq background (you get a blinking yellow foreground instead).
    +\*(``yellow\*('' background (you get a blinking yellow foreground instead).
     .bP
     Color RGB values are not settable.
     .SH PORTABILITY
    diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
    index be4dc371..76c1d75d 100644
    --- a/man/curs_get_wstr.3x
    +++ b/man/curs_get_wstr.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_get_wstr.3x,v 1.11 2017/03/04 21:24:04 tom Exp $
    +.\" $Id: curs_get_wstr.3x,v 1.12 2017/11/21 00:45:48 tom Exp $
     .TH curs_get_wstr 3X ""
     .na
     .hy 0
    @@ -161,10 +161,10 @@ or if the window pointer is null.
     .SH PORTABILITY
     These functions are described in The Single Unix Specification, Version 2.
     No error conditions are defined.
    -This implementation returns ERR if the window pointer is null,
    -or if the lower-level \fBwget_wch\fR call returns an ERR.
    +This implementation returns \fBERR\fP if the window pointer is null,
    +or if the lower-level \fBwget_wch\fR call returns an \fBERR\fP.
     In the latter case,
    -an ERR return without other data is treated as an end-of-file condition,
    +an \fBERR\fP return without other data is treated as an end-of-file condition,
     and the returned array contains a \fBWEOF\fR followed by a null \fBwchar_t\fR.
     .PP
     X/Open curses documented these functions to pass an array of \fBwchar_t\fR
    diff --git a/man/curs_getch.3x b/man/curs_getch.3x
    index ce4b959e..e74df1d8 100644
    --- a/man/curs_getch.3x
    +++ b/man/curs_getch.3x
    @@ -27,7 +27,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_getch.3x,v 1.50 2017/11/18 23:56:00 tom Exp $
    +.\" $Id: curs_getch.3x,v 1.51 2017/11/21 00:45:48 tom Exp $
     .TH curs_getch 3X ""
     .na
     .hy 0
    @@ -295,11 +295,11 @@ completion.
     .RS 3
     .TP 5
     \fBungetch\fP
    -returns ERR
    +returns \fBERR\fP
     if there is no more room in the FIFO.
     .TP
     \fBwgetch\fP
    -returns ERR
    +returns \fBERR\fP
     if the window pointer is null, or
     if its timeout expires without having any data, or
     if the execution was interrupted by a signal (\fBerrno\fR will be set to
    @@ -386,7 +386,7 @@ NetBSD curses later added this extension.
     .PP
     Programmers concerned about portability should be prepared for either of two
     cases: (a) signal receipt does not interrupt \fBgetch\fR; (b) signal receipt
    -interrupts \fBgetch\fR and causes it to return ERR with \fBerrno\fR set to
    +interrupts \fBgetch\fR and causes it to return \fBERR\fP with \fBerrno\fR set to
     \fBEINTR\fR.
     .PP
     The \fBhas_key\fR function is unique to \fBncurses\fR.
    diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
    index 5f160130..d82034f9 100644
    --- a/man/curs_getstr.3x
    +++ b/man/curs_getstr.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_getstr.3x,v 1.22 2017/05/30 21:08:31 tom Exp $
    +.\" $Id: curs_getstr.3x,v 1.23 2017/11/21 00:45:48 tom Exp $
     .TH curs_getstr 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -108,8 +108,8 @@ Note that \fBgetstr\fR, \fBmvgetstr\fR, and \fBmvwgetstr\fR may be macros.
     These functions are described in the XSI Curses standard, Issue 4.
     They read single-byte characters only.
     The standard does not define any error conditions.
    -This implementation returns ERR if the window pointer is null,
    -or if the lower-level \fBwgetch\fR(3X) call returns an ERR.
    +This implementation returns \fBERR\fP if the window pointer is null,
    +or if the lower-level \fBwgetch\fR(3X) call returns an \fBERR\fP.
     .PP
     SVr3 and early SVr4 curses implementations did not reject function keys;
     the SVr4.0 documentation claimed that \*(``special keys\*(''
    diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
    index 5f50e5a8..948d388e 100644
    --- a/man/curs_in_wch.3x
    +++ b/man/curs_in_wch.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 2002-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 2002-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_in_wch.3x,v 1.5 2010/12/04 18:36:44 tom Exp $
    +.\" $Id: curs_in_wch.3x,v 1.6 2017/11/21 00:53:44 tom Exp $
     .TH curs_in_wch 3X ""
     .SH NAME
     \fBin_wch\fR,
    @@ -49,10 +49,10 @@ the current position in the named window into the \fBcchar_t\fR object
     referenced by wcval.
     .SH RETURN VALUE
     No errors are defined in the XSI Curses standard.
    -This implementation checks for null pointers, returns ERR in that case.
    -Also, the \fImv\fR routines check for error moving the cursor, returning ERR
    +This implementation checks for null pointers, returns \fBERR\fP in that case.
    +Also, the \fImv\fR routines check for error moving the cursor, returning \fBERR\fP
     in that case.
    -Otherwise they return OK
    +Otherwise they return \fBOK\fP.
     .PP
     Functions with a "mv" prefix first perform a cursor movement using
     \fBwmove\fP, and return an error if the position is outside the window,
    diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
    index f9296877..f746d704 100644
    --- a/man/curs_in_wchstr.3x
    +++ b/man/curs_in_wchstr.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_in_wchstr.3x,v 1.9 2012/11/03 23:03:59 tom Exp $
    +.\" $Id: curs_in_wchstr.3x,v 1.10 2017/11/21 00:53:44 tom Exp $
     .TH curs_in_wchstr 3X ""
     .na
     .hy 0
    @@ -110,7 +110,7 @@ or if the window pointer is null.
     .SH PORTABILITY
     The XSI Curses defines no error conditions.
     This implementation checks for null pointers,
    -returning ERR in that case.
    +returning \fBERR\fP in that case.
     .SH SEE ALSO
     Functions:
     \fBcurses\fR(3X),
    diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
    index c1882eae..4abc3d09 100644
    --- a/man/curs_inopts.3x
    +++ b/man/curs_inopts.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_inopts.3x,v 1.25 2017/02/18 16:39:44 tom Exp $
    +.\" $Id: curs_inopts.3x,v 1.26 2017/11/21 00:47:10 tom Exp $
     .TH curs_inopts 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -140,7 +140,7 @@ The \fBhalfdelay\fR routine is used for half-delay mode, which is similar to
     \fBcbreak\fR mode in that characters typed by the user are immediately
     available to the program.
     However, after blocking for \fItenths\fR tenths of
    -seconds, ERR is returned if nothing has been typed.
    +seconds, \fBERR\fP is returned if nothing has been typed.
     The value of \fItenths\fR
     must be a number between 1 and 255.
     Use \fBnocbreak\fR to leave half-delay
    @@ -266,9 +266,10 @@ If \fIfd\fR is
     \-1, then no typeahead checking is done.
     .\"
     .SH RETURN VALUE
    -All routines that return an integer return \fBERR\fR upon failure and OK (SVr4
    -specifies only \*(``an integer value other than \fBERR\fR\*('') upon successful
    -completion, unless otherwise noted in the preceding routine descriptions.
    +All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
    +(SVr4 specifies only \*(``an integer value other than \fBERR\fR\*('')
    +upon successful completion,
    +unless otherwise noted in the preceding routine descriptions.
     .PP
     X/Open does not define any error conditions.
     In this implementation,
    diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
    index 4c6a925e..0eff335f 100644
    --- a/man/curs_ins_wch.3x
    +++ b/man/curs_ins_wch.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 2002-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 2002-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_ins_wch.3x,v 1.5 2010/12/04 18:38:55 tom Exp $
    +.\" $Id: curs_ins_wch.3x,v 1.6 2017/11/21 00:53:44 tom Exp $
     .TH curs_ins_wch 3X ""
     .SH NAME
     \fBins_wch\fR,
    @@ -50,8 +50,8 @@ All characters to the right of the cursor are moved one space to the right,
     with the possibility of the rightmost character on the line being lost.
     The insertion operation does not change the cursor position.
     .SH RETURN VALUE
    -If successful, these functions return OK.
    -If not, they return ERR.
    +If successful, these functions return \fBOK\fP.
    +If not, they return \fBERR\fP.
     .PP
     Functions with a "mv" prefix first perform a cursor movement using
     \fBwmove\fP, and return an error if the position is outside the window,
    diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
    index 12479b0d..5e11bae5 100644
    --- a/man/curs_ins_wstr.3x
    +++ b/man/curs_ins_wstr.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 2002-2012,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_ins_wstr.3x,v 1.7 2012/11/03 23:03:59 tom Exp $
    +.\" $Id: curs_ins_wstr.3x,v 1.8 2017/11/21 00:53:44 tom Exp $
     .TH curs_ins_wstr 3X ""
     .na
     .hy 0
    @@ -93,8 +93,8 @@ functions will fail.
     XSI does not define what will happen if a nonspacing character follows
     a control character.
     .SH RETURN VALUE
    -Upon successful completion, these functions return OK.
    -Otherwise, they return ERR.
    +Upon successful completion, these functions return \fBOK\fP.
    +Otherwise, they return \fBERR\fP.
     .PP
     Functions with a "mv" prefix first perform a cursor movement using
     \fBwmove\fP, and return an error if the position is outside the window,
    diff --git a/man/curs_insch.3x b/man/curs_insch.3x
    index 77e92ec0..62e3db18 100644
    --- a/man/curs_insch.3x
    +++ b/man/curs_insch.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_insch.3x,v 1.13 2010/12/04 18:38:55 tom Exp $
    +.\" $Id: curs_insch.3x,v 1.14 2017/11/21 00:53:44 tom Exp $
     .TH curs_insch 3X ""
     .SH NAME
     \fBinsch\fR,
    @@ -50,9 +50,10 @@ cursor.  All characters to the right of the cursor are moved one space to the
     right, with the possibility of the rightmost character on the line being lost.
     The insertion operation does not change the cursor position.
     .SH RETURN VALUE
    -All routines that return an integer return \fBERR\fR upon failure and OK (SVr4
    -specifies only "an integer value other than \fBERR\fR") upon successful
    -completion, unless otherwise noted in the preceding routine descriptions.
    +All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
    +(SVr4 specifies only "an integer value other than \fBERR\fR")
    +upon successful completion,
    +unless otherwise noted in the preceding routine descriptions.
     .PP
     Functions with a "mv" prefix first perform a cursor movement using
     \fBwmove\fP, and return an error if the position is outside the window,
    diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
    index 3e38a531..b396ec52 100644
    --- a/man/curs_insstr.3x
    +++ b/man/curs_insstr.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_insstr.3x,v 1.21 2010/12/04 18:38:55 tom Exp $
    +.\" $Id: curs_insstr.3x,v 1.22 2017/11/21 00:53:44 tom Exp $
     .TH curs_insstr 3X ""
     .SH NAME
     \fBinsstr\fR,
    @@ -70,9 +70,10 @@ If \fIn\fR<=0, then the entire string is inserted.
     .PP
     Special characters are handled as in \fBaddch\fP.
     .SH RETURN VALUE
    -All routines that return an integer return \fBERR\fR upon failure and OK (SVr4
    -specifies only "an integer value other than \fBERR\fR") upon successful
    -completion, unless otherwise noted in the preceding routine descriptions.
    +All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
    +(SVr4 specifies only "an integer value other than \fBERR\fR")
    +upon successful completion,
    +unless otherwise noted in the preceding routine descriptions.
     .PP
     X/Open defines no error conditions.
     In this implementation,
    diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
    index fa0930fe..998abd08 100644
    --- a/man/curs_legacy.3x
    +++ b/man/curs_legacy.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_legacy.3x,v 1.7 2017/11/19 00:23:58 tom Exp $
    +.\" $Id: curs_legacy.3x,v 1.8 2017/11/21 00:45:48 tom Exp $
     .de bP
     .ie n  .IP \(bu 4
     .el    .IP \(bu 2
    @@ -85,7 +85,7 @@ data as \fBgetparyx\fP.
     .SH RETURN VALUE
     Except as noted,
     these functions return an integer,
    -or ERR if the window parameter is null.
    +or \fBERR\fP if the window parameter is null.
     .SH NOTES
     All of these interfaces are provided as macros and functions.
     The macros are suppressed (and only the functions provided)
    diff --git a/man/curs_move.3x b/man/curs_move.3x
    index 50d722c5..c1f3f77e 100644
    --- a/man/curs_move.3x
    +++ b/man/curs_move.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_move.3x,v 1.15 2017/01/07 19:25:15 tom Exp $
    +.\" $Id: curs_move.3x,v 1.16 2017/11/21 00:46:31 tom Exp $
     .TH curs_move 3X ""
     .na
     .hy 0
    @@ -48,7 +48,7 @@ column \fIx\fR.  This routine does not move the physical cursor of the terminal
     until \fBrefresh\fR(3X) is called.  The position specified is relative to the upper
     left-hand corner of the window, which is (0,0).
     .SH RETURN VALUE
    -These routines return \fBERR\fR upon failure and OK (SVr4
    +These routines return \fBERR\fR upon failure and \fBOK\fP (SVr4
     specifies only "an integer value other than \fBERR\fR") upon successful
     completion.
     .PP
    diff --git a/man/curs_pad.3x b/man/curs_pad.3x
    index 495fc7b1..afe523b4 100644
    --- a/man/curs_pad.3x
    +++ b/man/curs_pad.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_pad.3x,v 1.23 2017/11/19 01:29:46 tom Exp $
    +.\" $Id: curs_pad.3x,v 1.24 2017/11/21 01:16:26 tom Exp $
     .de bP
     .ie n  .IP \(bu 4
     .el    .IP \(bu 2
    @@ -192,7 +192,9 @@ and is not checked by the vendor Unix implementations:
     SVr4 curses sets a flag in the \fBWINDOW\fP structure in \fBnewpad\fP
     which tells if the window is a \fIpad\fP.
     .IP
    -However, it uses this information only in \fBwscrl\fP,
    +However, it uses this information only in
    +\fBwaddch\fP (to decide if it should call \fBwrefresh\fP) and
    +\fBwscrl\fP (to avoid scrolling a pad),
     and does not check in \fBwrefresh\fP to ensure that the pad
     is refreshed properly.
     .bP
    diff --git a/man/curs_print.3x b/man/curs_print.3x
    index 039f5b73..1d17add9 100644
    --- a/man/curs_print.3x
    +++ b/man/curs_print.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_print.3x,v 1.11 2017/01/07 17:33:15 tom Exp $
    +.\" $Id: curs_print.3x,v 1.12 2017/11/20 01:27:30 tom Exp $
     .TH curs_print 3X ""
     .SH NAME
     \fBmcprint\fR \- ship binary data to printer
    @@ -48,7 +48,7 @@ rule of thumb is to sleep for a second after shipping each 80-character line.
     .SH RETURN VALUE
     The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
     for some reason.  In this case, errno will contain either an error associated
    -with \fBwrite(2)\fR or one of the following:
    +with \fBwrite\fP(2) or one of the following:
     .TP 5
     ENODEV
     Capabilities for printer redirection do not exist.
    diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
    index 85a8ae32..a502d933 100644
    --- a/man/curs_scanw.3x
    +++ b/man/curs_scanw.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_scanw.3x,v 1.18 2017/04/17 00:07:02 tom Exp $
    +.\" $Id: curs_scanw.3x,v 1.19 2017/11/21 00:46:31 tom Exp $
     .TH curs_scanw 3X ""
     .SH NAME
     \fBscanw\fR,
    @@ -82,13 +82,13 @@ This implementation uses \fB\fR for both, because that header
     is included in \fB.
     .LP
     Both XSI and The Single Unix Specification, Version 2 state that these
    -functions return ERR or OK.
    +functions return \fBERR\fP or \fBOK\fP.
     Since the underlying \fBscanf\fR(3) can return the number of items scanned,
     and the SVr4 code was documented to use this feature,
     this is probably an editing error which was introduced in XSI,
     rather than being done intentionally.
    -Portable applications should only test if the return value is ERR,
    -since the OK value (zero) is likely to be misleading.
    +Portable applications should only test if the return value is \fBERR\fP,
    +since the \fBOK\fP value (zero) is likely to be misleading.
     One possible way to get useful results would be to use a "%n" conversion
     at the end of the format string to ensure that something was processed.
     .SH SEE ALSO
    diff --git a/man/curs_slk.3x b/man/curs_slk.3x
    index 8024b06b..91950352 100644
    --- a/man/curs_slk.3x
    +++ b/man/curs_slk.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_slk.3x,v 1.32 2017/11/18 23:47:37 tom Exp $
    +.\" $Id: curs_slk.3x,v 1.33 2017/11/21 00:46:31 tom Exp $
     .TH curs_slk 3X ""
     .de bP
     .ie n  .IP \(bu 4
    @@ -193,7 +193,7 @@ this implementation provides
     \fBextended_slk_color\fR which accepts an integer value, e.g., 32-bits.
     .
     .SH RETURN VALUE
    -These routines return \fBERR\fR upon failure and OK (SVr4 specifies only "an
    +These routines return \fBERR\fR upon failure and \fBOK\fP (SVr4 specifies only "an
     integer value other than \fBERR\fR") upon successful completion.
     .PP
     X/Open defines no error conditions.
    diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
    index 01772467..c160cebb 100644
    --- a/man/curs_terminfo.3x
    +++ b/man/curs_terminfo.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_terminfo.3x,v 1.56 2017/11/18 23:47:37 tom Exp $
    +.\" $Id: curs_terminfo.3x,v 1.57 2017/11/21 00:46:31 tom Exp $
     .TH curs_terminfo 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -503,7 +503,7 @@ In System V Release 4, the third argument of \fBtputs\fR has the type
     \fBint (*putc)(char)\fR.
     .PP
     At least one implementation of X/Open Curses (Solaris) returns a value
    -other than OK/ERR from \fBtputs\fP.
    +other than \fBOK\fP/\fBERR\fP from \fBtputs\fP.
     That returns the length of the string, and does no error-checking.
     .PP
     X/Open notes that after calling \fBmvcur\fR, the curses state may not match the
    diff --git a/man/curs_touch.3x b/man/curs_touch.3x
    index d576fe5d..8d4a88cb 100644
    --- a/man/curs_touch.3x
    +++ b/man/curs_touch.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_touch.3x,v 1.17 2017/11/18 23:40:19 tom Exp $
    +.\" $Id: curs_touch.3x,v 1.20 2017/11/25 16:19:42 tom Exp $
     .TH curs_touch 3X ""
     .na
     .hy 0
    @@ -90,7 +90,16 @@ In this implementation
     returns an error 
     if the window pointer is null, or
     if the line number is outside the window.
    -Note that ERR is distinct from \fBTRUE\fP and \fBFALSE\fP, which are the normal return values of this function.
    +.IP
    +The constant \fBERR\fP is distinct from \fBTRUE\fP and \fBFALSE\fP,
    +which are the normal return values of this function.
    +Because the function returns a \fBbool\fP,
    +returning \fBERR\fP (which is neither \fBTRUE\fP nor \fBFALSE\fP)
    +may not be supported by the compiler.
    +.IP
    +To provide error-checking and also match the X/Open function prototype,
    +the \fBERR\fP is provided by a macro named \fBis_linetouched\fP.
    +The actual function returns \fBFALSE\fP when it detects an error.
     .TP 5
     \fBwtouchln\fP
     returns an error 
    @@ -98,14 +107,19 @@ if the window pointer is null, or
     if the line number is outside the window.
     .RE
     .SH PORTABILITY
    -The XSI Curses standard, Issue 4 describes these functions.
     .PP
    -Some historic curses implementations had, as an undocumented feature, the
    -ability to do the equivalent of \fBclearok(..., 1)\fR by saying
    -\fBtouchwin(stdscr)\fR or \fBclear(stdscr)\fR.  This will not work under
    -ncurses.
    +These functions were introduced by SVr4.
    +The Solaris curses header file,
    +for instance, defines both an actual function and macro for each.
    +The macros give the same result as the actual functions.
    +SVr4 curses does not check the window parameter \fIwin\fP to ensure
    +that it is not \fBNULL\fP;
    +otherwise this implementation behaves the same as SVr4.
    +.PP
    +The XSI Curses standard, Issue 4 describes these functions,
    +but defines no error conditions.
     .SH NOTES
    -Note that all routines except \fBwtouchln\fR may be macros.
    +All of these routines except \fBwtouchln\fR may be macros.
     .SH SEE ALSO
     \fBcurses\fR(3X),
     \fBcurs_refresh\fR(3X),
    diff --git a/man/define_key.3x b/man/define_key.3x
    index 18eaff87..298a979c 100644
    --- a/man/define_key.3x
    +++ b/man/define_key.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -28,7 +28,7 @@
     .\"
     .\" Author: Thomas E. Dickey 1997
     .\"
    -.\" $Id: define_key.3x,v 1.14 2010/12/04 18:49:20 tom Exp $
    +.\" $Id: define_key.3x,v 1.15 2017/11/21 00:53:44 tom Exp $
     .TH define_key 3X ""
     .SH NAME
     \fBdefine_key\fP \- define a keycode
    @@ -48,10 +48,10 @@ Similarly, if the given keycode is negative or zero, any existing string
     for the given definition is removed.
     .SH RETURN VALUE
     The keycode must be greater than zero, and the string non-null,
    -otherwise ERR is returned.
    -ERR may also be returned if there is insufficient memory to allocate the
    +otherwise \fBERR\fP is returned.
    +\fBERR\fP may also be returned if there is insufficient memory to allocate the
     data to store the definition.
    -If no error is detected, OK is returned.
    +If no error is detected, \fBOK\fP is returned.
     .SH PORTABILITY
     These routines are specific to ncurses.  They were not supported on
     Version 7, BSD or System V implementations.  It is recommended that
    diff --git a/man/form.3x b/man/form.3x
    index 64759f2f..ecc7a440 100644
    --- a/man/form.3x
    +++ b/man/form.3x
    @@ -27,12 +27,16 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: form.3x,v 1.29 2017/02/18 16:46:53 tom Exp $
    +.\" $Id: form.3x,v 1.30 2017/11/25 20:28:02 tom Exp $
     .TH form 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
     .ie \n(.g .ds '' \(rq
     .el       .ds '' ''
    +.de bP
    +.ie n  .IP \(bu 4
    +.el    .IP \(bu 2
    +..
     .SH NAME
     \fBform\fR \- curses extension for programming forms
     .SH SYNOPSIS
    @@ -206,7 +210,19 @@ you want to say \*(``\-lform \-lncurses\*('', not the other way around
     These routines emulate the System V forms library.  They were not supported on
     Version 7 or BSD versions.
     .PP
    -A few functions are extensions added for ncurses, e.g.,
    +The menu facility was documented in SVr4.2 in
    +\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
    +.PP
    +It is not part of X/Open Curses.
    +.PP
    +Aside from ncurses, there are few implementations:
    +.bP
    +systems based on SVr4 source code, e.g., Solaris.
    +.bP
    +NetBSD curses.
    +.PP
    +A few functions in this implementation are extensions added for ncurses,
    +but not provided by other implementations, e.g.,
     \fBform_driver_w\fP,
     \fBunfocus_current_field\fP.
     .SH AUTHORS
    diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
    index 3505fdb2..e573efaa 100644
    --- a/man/form_field_validation.3x
    +++ b/man/form_field_validation.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: form_field_validation.3x,v 1.20 2010/12/04 18:38:55 tom Exp $
    +.\" $Id: form_field_validation.3x,v 1.21 2017/11/20 01:28:31 tom Exp $
     .TH form_field_validation 3X ""
     .SH NAME
     \fBform_field_validation\fR \- data type validation for fields
    @@ -73,7 +73,7 @@ of any set of more than one list elements with that prefix). Please notice
     that the string list is copied. So you may use a list that lives in automatic variables on the stack.
     .TP 5
     TYPE_INTEGER
    -Integer data, parsable to an integer by \fBatoi(3)\fR.  Requires a third
    +Integer data, parsable to an integer by \fBatoi\fP(3).  Requires a third
     \fBint\fR argument controlling the precision, a fourth \fBlong\fR argument
     constraining minimum value, and a fifth \fBlong\fR constraining maximum value.
     If the maximum value is less than or equal to the minimum value, the range is
    diff --git a/man/form_variables.3x b/man/form_variables.3x
    index f4af349b..7760de24 100644
    --- a/man/form_variables.3x
    +++ b/man/form_variables.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
    +.\" Copyright (c) 2010-2013,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -26,9 +26,8 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: form_variables.3x,v 1.4 2013/06/22 17:58:32 tom Exp $
    +.\" $Id: form_variables.3x,v 1.5 2017/11/20 00:59:21 tom Exp $
     .TH form_variables 3X ""
    -.ds n 5
     .na
     .hy 0
     .SH NAME
    diff --git a/man/keyok.3x b/man/keyok.3x
    index 8eaf9a3c..68d9f169 100644
    --- a/man/keyok.3x
    +++ b/man/keyok.3x
    @@ -1,5 +1,5 @@
     .\"***************************************************************************
    -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
    +.\" Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
     .\"                                                                          *
     .\" Permission is hereby granted, free of charge, to any person obtaining a  *
     .\" copy of this software and associated documentation files (the            *
    @@ -28,7 +28,7 @@
     .\"
     .\" Author: Thomas E. Dickey 1997
     .\"
    -.\" $Id: keyok.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
    +.\" $Id: keyok.3x,v 1.12 2017/11/21 00:53:44 tom Exp $
     .TH keyok 3X ""
     .SH NAME
     \fBkeyok\fP \- enable or disable a keycode
    @@ -42,11 +42,11 @@ It permits an application to disable specific keycodes, rather than
     use the \fIkeypad\fP function to disable all keycodes.
     Keys that have been disabled can be re-enabled.
     .SH RETURN VALUE
    -The keycode must be greater than zero, else ERR is returned.
    -If it does not correspond to a defined key, then ERR is returned.
    +The keycode must be greater than zero, else \fBERR\fP is returned.
    +If it does not correspond to a defined key, then \fBERR\fP is returned.
     If the \fIenable\fP parameter is true, then the key must have been disabled,
     and vice versa.
    -Otherwise, the function returns OK.
    +Otherwise, the function returns \fBOK\fP.
     .SH PORTABILITY
     These routines are specific to ncurses.  They were not supported on
     Version 7, BSD or System V implementations.  It is recommended that
    diff --git a/man/menu.3x b/man/menu.3x
    index 6e61512d..79613ea5 100644
    --- a/man/menu.3x
    +++ b/man/menu.3x
    @@ -27,12 +27,16 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: menu.3x,v 1.23 2017/02/18 16:49:46 tom Exp $
    +.\" $Id: menu.3x,v 1.24 2017/11/25 20:24:22 tom Exp $
     .TH menu 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
     .ie \n(.g .ds '' \(rq
     .el       .ds '' ''
    +.de bP
    +.ie n  .IP \(bu 4
    +.el    .IP \(bu 2
    +..
     .SH NAME
     \fBmenu\fR \- curses extension for programming menus
     .SH SYNOPSIS
    @@ -180,6 +184,17 @@ you should say \*(``\-lmenu \-lncurses\*('', not the other way around
     .SH PORTABILITY
     These routines emulate the System V menu library.  They were not supported on
     Version 7 or BSD versions.
    +.PP
    +The menu facility was documented in SVr4.2 in
    +\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
    +.PP
    +It is not part of X/Open Curses.
    +.PP
    +Aside from ncurses, there are few implementations:
    +.bP
    +systems based on SVr4 source code, e.g., Solaris.
    +.bP
    +NetBSD curses.
     .SH AUTHORS
     Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
     S. Raymond.
    diff --git a/man/panel.3x b/man/panel.3x
    index 0d683130..4468e1d4 100644
    --- a/man/panel.3x
    +++ b/man/panel.3x
    @@ -26,14 +26,12 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: panel.3x,v 1.21 2017/02/18 16:53:23 tom Exp $
    +.\" $Id: panel.3x,v 1.24 2017/11/25 20:31:13 tom Exp $
     .TH panel 3X ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
     .ie \n(.g .ds '' \(rq
     .el       .ds '' ''
    -.ds n 5
    -.ds d @TERMINFO@
     .SH NAME
     panel \- panel stack extension for curses
     .SH SYNOPSIS
    @@ -115,7 +113,7 @@ view. The \fBPANEL\fR structure is not lost, merely removed from the stack.
     .B panel_hidden(pan)
     returns \fBTRUE\fP if the panel is in the panel stack,
     \fBFALSE\fP if it is not.
    -If the panel is a null pointer, return ERR.
    +If the panel is a null pointer, return \fBERR\fP.
     .TP
     .B show_panel(pan)
     makes a hidden panel visible by placing it on top of the panels in the
    @@ -162,7 +160,7 @@ occurs. Each routine that returns an int value returns \fBOK\fR if it
     executes successfully and \fBERR\fR if not.
     .SH COMPATIBILITY
     Reasonable care has been taken to  ensure  compatibility
    -with  the  native  panel facility introduced in SVr3.2 (inspection of
    +with  the  native  panel facility introduced in System V (inspection of
     the SVr4 manual pages suggests the programming interface is unchanged).
     The \fBPANEL\fR data structures are merely  similar. The  programmer
     is cautioned not to directly use \fBPANEL\fR fields.
    @@ -178,6 +176,15 @@ function to ensure compatibility with native panel libraries.
     In your library list, libpanel.a should be before libncurses.a; that is,
     you should say \*(``\-lpanel \-lncurses\*('', not the other way around
     (which would give a link-error with static libraries).
    +.SH PORTABILITY
    +.PP
    +The panel facility was documented in SVr4.2 in
    +\fICharacter User Interface Programming (UNIX SVR4.2)\fP.
    +.PP
    +It is not part of X/Open Curses.
    +.PP
    +Aside from ncurses, only systems based on SVr4 source code,
    +e.g., Solaris provide this library.
     .SH FILES
     .P
     panel.h
    diff --git a/man/scr_dump.5 b/man/scr_dump.5
    index fe3bd56c..b9e9bacd 100644
    --- a/man/scr_dump.5
    +++ b/man/scr_dump.5
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: scr_dump.5,v 1.11 2017/11/18 23:51:59 tom Exp $
    +.\" $Id: scr_dump.5,v 1.12 2017/11/25 20:12:55 tom Exp $
     .TH scr_dump 5
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -49,8 +49,6 @@
     .ie n  .IP \(bu 4
     .el    .IP \(bu 2
     ..
    -.ds n 5
    -.ds d @TERMINFO@
     .SH NAME
     scr_dump \- format of curses screen-dumps.
     .SH SYNOPSIS
    diff --git a/man/tput.1 b/man/tput.1
    index 72e08311..ad7e81a4 100644
    --- a/man/tput.1
    +++ b/man/tput.1
    @@ -27,7 +27,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: tput.1,v 1.56 2017/11/18 23:51:17 tom Exp $
    +.\" $Id: tput.1,v 1.57 2017/11/20 01:07:02 tom Exp $
     .TH @TPUT@ 1 ""
     .ds d @TERMINFO@
     .ds n 1
    @@ -155,7 +155,7 @@ standard output,
     .bP
     standard input and
     .bP
    -ultimately \*(lq/dev/tty\*(rq
    +ultimately \*(``/dev/tty\*(''
     .RE
     .IP
     to obtain terminal settings.
    @@ -283,7 +283,7 @@ terminal in the environmental variable \fBTERM\fR.
     .TP 5
     \fB@TPUT@ cup 0 0\fR
     Send the sequence to move the cursor to row \fB0\fR, column \fB0\fR
    -(the upper left corner of the screen, usually known as the \*(lqhome\*(rq
    +(the upper left corner of the screen, usually known as the \*(``home\*(''
     cursor position).
     .TP 5
     \fB@TPUT@ clear\fR
    @@ -423,11 +423,11 @@ it accepted \fItermcap names\fP for other capabilities.
     Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes
     as the earlier BSD \fBtset\fP had done.
     .PP
    -At the same time, Bostic added a shell script named \*(lqclear\*(rq,
    +At the same time, Bostic added a shell script named \*(``clear\*('',
     which used \fBtput\fP to clear the screen.
     .PP
     Both of these appeared in 4.4BSD,
    -becoming the \*(lqmodern\*(rq BSD implementation of \fBtput\fP.
    +becoming the \*(``modern\*('' BSD implementation of \fBtput\fP.
     .PP
     This implementation of \fBtput\fP began from a different source than
     AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on
    @@ -453,7 +453,7 @@ may not use the standard output.
     The AT&T implementation's \fBinit\fP and \fBreset\fP commands
     use the BSD (4.1c) \fBtset\fP source, which manipulates terminal modes.
     It successively tries standard output, standard error, standard input
    -before falling back to \*(lq/dev/tty\*(rq and finally just assumes
    +before falling back to \*(``/dev/tty\*('' and finally just assumes
     a 1200Bd terminal.
     When updating terminal modes, it ignores errors.
     .IP
    diff --git a/man/tset.1 b/man/tset.1
    index 1c27efa4..14290f92 100644
    --- a/man/tset.1
    +++ b/man/tset.1
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: tset.1,v 1.50 2017/11/18 23:51:17 tom Exp $
    +.\" $Id: tset.1,v 1.52 2017/11/20 01:27:53 tom Exp $
     .TH @TSET@ 1 ""
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -56,7 +56,7 @@ standard output,
     .bP
     standard input and
     .bP
    -ultimately \*(lq/dev/tty\*(rq
    +ultimately \*(``/dev/tty\*(''
     .PP
     to obtain terminal settings.
     Having retrieved these settings, \fB@TSET@\fP remembers which
    @@ -297,7 +297,7 @@ that he began work in October 1977,
     continuing development over the next few years.
     .PP
     In September 1980, Eric Allman modified \fBtset\fP,
    -adding the code from the existing \*(lqreset\*(rq
    +adding the code from the existing \*(``reset\*(''
     feature when \fBtset\fP was invoked as \fBreset\fP.
     Rather than simply copying the existing program,
     in this merged version, \fBtset\fP used the termcap database
    @@ -325,7 +325,7 @@ In fact, the commonly-used \fBreset\fP utility
     is always an alias for \fBtset\fP.
     .PP
     The \fB@TSET@\fR utility provides for backward-compatibility with BSD
    -environments (under most modern UNIXes, \fB/etc/inittab\fR and \fIgetty\fR(1)
    +environments (under most modern UNIXes, \fB/etc/inittab\fR and \fBgetty\fR(1)
     can set \fBTERM\fR appropriately for each dial-up line; this obviates what was
     \fB@TSET@\fR's most important use).  This implementation behaves like 4.4BSD
     \fBtset\fP, with a few exceptions specified here.
    diff --git a/man/user_caps.5 b/man/user_caps.5
    index 21e079fe..fc2e0c3b 100644
    --- a/man/user_caps.5
    +++ b/man/user_caps.5
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: user_caps.5,v 1.3 2017/11/18 23:51:59 tom Exp $
    +.\" $Id: user_caps.5,v 1.4 2017/11/25 20:13:12 tom Exp $
     .TH user_caps 5
     .ie \n(.g .ds `` \(lq
     .el       .ds `` ``
    @@ -49,7 +49,6 @@
     .ie n  .IP \(bu 4
     .el    .IP \(bu 2
     ..
    -.ds n 5
     .SH NAME
     user_caps \- user-defined terminfo capabilities
     .SH SYNOPSIS
    diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
    index 830e4dc0..643a53d4 100755
    --- a/ncurses/base/MKlib_gen.sh
    +++ b/ncurses/base/MKlib_gen.sh
    @@ -2,7 +2,7 @@
     #
     # MKlib_gen.sh -- generate sources from curses.h macro definitions
     #
    -# ($Id: MKlib_gen.sh,v 1.57 2017/08/12 12:22:06 tom Exp $)
    +# ($Id: MKlib_gen.sh,v 1.59 2017/11/25 23:05:56 tom Exp $)
     #
     ##############################################################################
     # Copyright (c) 1998-2017,2017 Free Software Foundation, Inc.                #
    @@ -274,6 +274,11 @@ $0 !~ /^P_/ {
     		dotrace = 0;
     	}
     
    +	do_getstr = 0;
    +	if ($myfunc ~ /get[n]?str/) {
    +		do_getstr = 1;
    +	}
    +
     	call = "@@T((T_CALLED(\""
     	args = ""
     	comma = ""
    @@ -310,7 +315,11 @@ $0 !~ /^P_/ {
     				call = call "%s"
     			} else if (pointer) {
     				if ( argtype == "char" ) {
    -					call = call "%s"
    +					if (do_getstr) {
    +						call = call "%p"
    +					} else {
    +						call = call "%s"
    +					}
     					comma = comma "_nc_visbuf2(" num ","
     					pointer = 0;
     				} else {
    @@ -360,7 +369,7 @@ $0 !~ /^P_/ {
     	call = call ")); "
     
     	if (dotrace)
    -		printf "%s", call
    +		printf "%s\n\t@@", call
     
     	if (match($0, "^void")) {
     		call = ""
    diff --git a/ncurses/base/lib_touch.c b/ncurses/base/lib_touch.c
    index 8d4a8803..45160648 100644
    --- a/ncurses/base/lib_touch.c
    +++ b/ncurses/base/lib_touch.c
    @@ -1,5 +1,5 @@
     /****************************************************************************
    - * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
    + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
      *                                                                          *
      * Permission is hereby granted, free of charge, to any person obtaining a  *
      * copy of this software and associated documentation files (the            *
    @@ -43,16 +43,19 @@
     
     #include 
     
    -MODULE_ID("$Id: lib_touch.c,v 1.13 2016/05/28 23:11:26 tom Exp $")
    +MODULE_ID("$Id: lib_touch.c,v 1.15 2017/11/21 00:14:26 tom Exp $")
    +
    +#undef is_linetouched
     
     NCURSES_EXPORT(bool)
     is_linetouched(WINDOW *win, int line)
     {
         T((T_CALLED("is_linetouched(%p,%d)"), (void *) win, line));
     
    -    /* XSI doesn't define any error */
    -    if (!win || (line > win->_maxy) || (line < 0))
    -	returnCode((bool) ERR);
    +    /* XSI doesn't define any error, and gcc ultimately made it impossible */
    +    if (!win || (line > win->_maxy) || (line < 0)) {
    +	returnCode(FALSE);
    +    }
     
         returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
     }
    diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
    index e0a72670..f480e199 100644
    --- a/ncurses/tinfo/write_entry.c
    +++ b/ncurses/tinfo/write_entry.c
    @@ -47,7 +47,7 @@
     #define TRACE_OUT(p)		/*nothing */
     #endif
     
    -MODULE_ID("$Id: write_entry.c,v 1.99 2017/04/09 23:35:01 tom Exp $")
    +MODULE_ID("$Id: write_entry.c,v 1.100 2017/11/25 02:06:43 tom Exp $")
     
     static int total_written;
     static int total_parts;
    @@ -269,6 +269,9 @@ _nc_write_entry(TERMTYPE2 *const tp)
     #endif
     #endif /* USE_SYMLINKS */
     
    +    unsigned limit2 = sizeof(filename) - (2 + LEAF_LEN);
    +    char saved = '\0';
    +
         static int call_count;
         static time_t start_time;	/* time at start of writes */
     
    @@ -371,12 +374,18 @@ _nc_write_entry(TERMTYPE2 *const tp)
     	start_time = 0;
         }
     
    -    if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
    +    if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN)) {
     	_nc_warning("terminal name too long.");
    +	saved = first_name[limit2];
    +	first_name[limit2] = '\0';
    +    }
     
         _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
     		LEAF_FMT "/%s", first_name[0], first_name);
     
    +    if (saved)
    +	first_name[limit2] = saved;
    +
         /*
          * Has this primary name been written since the first call to
          * write_entry()?  If so, the newer write will step on the older,
    diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
    index 7f1788f6..54817303 100644
    --- a/package/debian-mingw/changelog
    +++ b/package/debian-mingw/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20171118) unstable; urgency=low
    +ncurses6 (6.0+20171125) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sun, 12 Nov 2017 10:22:04 -0500
    + -- Thomas E. Dickey   Sun, 19 Nov 2017 15:12:11 -0500
     
     ncurses6 (5.9-20131005) unstable; urgency=low
     
    diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
    index 7f1788f6..54817303 100644
    --- a/package/debian-mingw64/changelog
    +++ b/package/debian-mingw64/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20171118) unstable; urgency=low
    +ncurses6 (6.0+20171125) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sun, 12 Nov 2017 10:22:04 -0500
    + -- Thomas E. Dickey   Sun, 19 Nov 2017 15:12:11 -0500
     
     ncurses6 (5.9-20131005) unstable; urgency=low
     
    diff --git a/package/debian/changelog b/package/debian/changelog
    index 618ac697..cde1ffc8 100644
    --- a/package/debian/changelog
    +++ b/package/debian/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20171118) unstable; urgency=low
    +ncurses6 (6.0+20171125) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sun, 12 Nov 2017 10:22:04 -0500
    + -- Thomas E. Dickey   Sun, 19 Nov 2017 15:12:11 -0500
     
     ncurses6 (5.9-20120608) unstable; urgency=low
     
    diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
    index a80963a5..14e334b2 100644
    --- a/package/mingw-ncurses.nsi
    +++ b/package/mingw-ncurses.nsi
    @@ -1,4 +1,4 @@
    -; $Id: mingw-ncurses.nsi,v 1.240 2017/11/12 15:22:04 tom Exp $
    +; $Id: mingw-ncurses.nsi,v 1.241 2017/11/19 20:12:11 tom Exp $
     
     ; TODO add examples
     ; TODO bump ABI to 6
    @@ -10,7 +10,7 @@
     !define VERSION_MAJOR "6"
     !define VERSION_MINOR "0"
     !define VERSION_YYYY  "2017"
    -!define VERSION_MMDD  "1118"
    +!define VERSION_MMDD  "1125"
     !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
     
     !define MY_ABI   "5"
    diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
    index 89436cf5..108e48ca 100644
    --- a/package/mingw-ncurses.spec
    +++ b/package/mingw-ncurses.spec
    @@ -3,7 +3,7 @@
     Summary: shared libraries for terminal handling
     Name: mingw32-ncurses6
     Version: 6.0
    -Release: 20171118
    +Release: 20171125
     License: X11
     Group: Development/Libraries
     Source: ncurses-%{version}-%{release}.tgz
    diff --git a/package/ncurses.spec b/package/ncurses.spec
    index 5800b562..b7d1786f 100644
    --- a/package/ncurses.spec
    +++ b/package/ncurses.spec
    @@ -1,7 +1,7 @@
     Summary: shared libraries for terminal handling
     Name: ncurses6
     Version: 6.0
    -Release: 20171118
    +Release: 20171125
     License: X11
     Group: Development/Libraries
     Source: ncurses-%{version}-%{release}.tgz
    diff --git a/test/aclocal.m4 b/test/aclocal.m4
    index 304da8fa..4253d6b4 100644
    --- a/test/aclocal.m4
    +++ b/test/aclocal.m4
    @@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
     dnl authorization.                                                           *
     dnl***************************************************************************
     dnl
    -dnl $Id: aclocal.m4,v 1.146 2017/09/30 19:41:21 tom Exp $
    +dnl $Id: aclocal.m4,v 1.148 2017/11/25 22:34:41 tom Exp $
     dnl
     dnl Author: Thomas E. Dickey
     dnl
    @@ -3461,6 +3461,92 @@ CF_NO_LEAKS_OPTION(valgrind,
     	[USE_VALGRIND])
     ])dnl
     dnl ---------------------------------------------------------------------------
    +dnl CF_WITH_X11_RGB version: 1 updated: 2017/11/25 17:32:16
    +dnl ---------------
    +dnl Handle configure option "--with-x11-rgb", setting these shell
    +dnl variables:
    +dnl
    +dnl $RGB_PATH is the option value, used for finding the X11 rgb file.
    +dnl $no_x11_rgb is a "#" (comment) if "--without-x11-rgb" is given.
    +dnl
    +dnl Most Linux's use this:
    +dnl 	/usr/share/X11/rgb.txt
    +dnl Debian uses this:
    +dnl 	/etc/X11/rgb.txt
    +dnl DragonFlyBSD ports uses this:
    +dnl 	/usr/pkg/lib/X11/rgb.txt
    +dnl FreeBSD ports use these:
    +dnl 	/usr/local/lib/X11/rgb.txt
    +dnl 	/usr/local/share/X11/rgb.txt
    +dnl Mandriva has these:
    +dnl 	/usr/lib/X11/rgb.txt
    +dnl 	/usr/lib64/X11/rgb.txt
    +dnl NetBSD has these
    +dnl 	/usr/X11R7/lib/X11/rgb.txt
    +dnl OpenSolaris uses
    +dnl 	32-bit:
    +dnl 	/usr/X11/etc/X11/rgb.txt
    +dnl 	/usr/X11/share/X11/rgb.txt
    +dnl 	/usr/X11/lib/X11/rgb.txt
    +dnl OSX uses
    +dnl		/opt/local/share/X11/rgb.txt (MacPorts)
    +dnl		/opt/X11/share/X11/rgb.txt (non-ports)
    +dnl	64-bit:
    +dnl 	/usr/X11/etc/X11/rgb.txt
    +dnl 	/usr/X11/share/X11/rgb.txt (perhaps)
    +dnl 	/usr/X11/lib/amd64/X11/rgb.txt
    +dnl Solaris10 uses (in this order):
    +dnl 	/usr/openwin/lib/X11/rgb.txt
    +dnl 	/usr/X11/lib/X11/rgb.txt
    +AC_DEFUN([CF_WITH_X11_RGB],[
    +AC_MSG_CHECKING(for X11 rgb file)
    +AC_ARG_WITH(x11-rgb,
    +	[  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
    +	[RGB_PATH=$withval],
    +	[RGB_PATH=auto])
    +
    +if test "x[$]RGB_PATH" = xauto
    +then
    +	RGB_PATH='${exec_prefix}/lib/X11/rgb.txt'
    +	for cf_path in \
    +		/opt/local/share/X11/rgb.txt \
    +		/opt/X11/share/X11/rgb.txt \
    +		/usr/share/X11/rgb.txt \
    +		/usr/X11/share/X11/rgb.txt \
    +		/usr/X11/lib/X11/rgb.txt \
    +		/usr/lib/X11/rgb.txt \
    +		/etc/X11/rgb.txt \
    +		/usr/pkg/lib/X11/rgb.txt \
    +		/usr/X11R7/lib/X11/rgb.txt \
    +		/usr/X11R6/lib/X11/rgb.txt \
    +		/usr/X11R5/lib/X11/rgb.txt \
    +		/usr/X11R4/lib/X11/rgb.txt \
    +		/usr/local/lib/X11/rgb.txt \
    +		/usr/local/share/X11/rgb.txt \
    +		/usr/lib64/X11/rgb.txt
    +	do
    +		if test -f "$cf_path" ; then
    +			RGB_PATH="$cf_path"
    +			break
    +		fi
    +	done
    +else
    +	cf_path=$RGB_PATH
    +	CF_PATH_SYNTAX(cf_path)
    +fi
    +
    +AC_MSG_RESULT($RGB_PATH)
    +AC_SUBST(RGB_PATH)
    +AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path")
    +
    +no_x11_rgb=
    +if test "$RGB_PATH" = no
    +then
    +	no_x11_rgb="#"
    +fi
    +AC_SUBST(no_x11_rgb)
    +])dnl
    +dnl ---------------------------------------------------------------------------
     dnl CF_XOPEN_CURSES version: 13 updated: 2015/12/12 20:59:52
     dnl ---------------
     dnl Test if we should define X/Open source for curses, needed on Digital Unix
    diff --git a/test/configure b/test/configure
    index 01f9a21a..db06cad1 100755
    --- a/test/configure
    +++ b/test/configure
    @@ -673,6 +673,7 @@ Curses Version-dependent Options:
       --with-neXtaw           link with neXT Athena library
       --with-XawPlus          link with Athena-Plus library
       --with-x                use the X Window System
    +  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
       --disable-panel         disable checks for panel functions
       --disable-menu          disable checks for menu functions
       --disable-form          disable checks for form functions
    @@ -876,7 +877,7 @@ if test -z "$CONFIG_SITE"; then
     fi
     for ac_site_file in $CONFIG_SITE; do
       if test -r "$ac_site_file"; then
    -    { echo "$as_me:879: loading site script $ac_site_file" >&5
    +    { echo "$as_me:880: loading site script $ac_site_file" >&5
     echo "$as_me: loading site script $ac_site_file" >&6;}
         cat "$ac_site_file" >&5
         . "$ac_site_file"
    @@ -887,7 +888,7 @@ if test -r "$cache_file"; then
       # Some versions of bash will fail to source /dev/null (special
       # files actually), so we avoid doing that.
       if test -f "$cache_file"; then
    -    { echo "$as_me:890: loading cache $cache_file" >&5
    +    { echo "$as_me:891: loading cache $cache_file" >&5
     echo "$as_me: loading cache $cache_file" >&6;}
         case $cache_file in
           [\\/]* | ?:[\\/]* ) . $cache_file;;
    @@ -895,7 +896,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
         esac
       fi
     else
    -  { echo "$as_me:898: creating cache $cache_file" >&5
    +  { echo "$as_me:899: creating cache $cache_file" >&5
     echo "$as_me: creating cache $cache_file" >&6;}
       >$cache_file
     fi
    @@ -911,21 +912,21 @@ for ac_var in `(set) 2>&1 |
       eval ac_new_val="\$ac_env_${ac_var}_value"
       case $ac_old_set,$ac_new_set in
         set,)
    -      { echo "$as_me:914: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    +      { echo "$as_me:915: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
           ac_cache_corrupted=: ;;
         ,set)
    -      { echo "$as_me:918: error: \`$ac_var' was not set in the previous run" >&5
    +      { echo "$as_me:919: error: \`$ac_var' was not set in the previous run" >&5
     echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
           ac_cache_corrupted=: ;;
         ,);;
         *)
           if test "x$ac_old_val" != "x$ac_new_val"; then
    -        { echo "$as_me:924: error: \`$ac_var' has changed since the previous run:" >&5
    +        { echo "$as_me:925: error: \`$ac_var' has changed since the previous run:" >&5
     echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    -        { echo "$as_me:926:   former value:  $ac_old_val" >&5
    +        { echo "$as_me:927:   former value:  $ac_old_val" >&5
     echo "$as_me:   former value:  $ac_old_val" >&2;}
    -        { echo "$as_me:928:   current value: $ac_new_val" >&5
    +        { echo "$as_me:929:   current value: $ac_new_val" >&5
     echo "$as_me:   current value: $ac_new_val" >&2;}
             ac_cache_corrupted=:
           fi;;
    @@ -944,9 +945,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
       fi
     done
     if $ac_cache_corrupted; then
    -  { echo "$as_me:947: error: changes in the environment can compromise the build" >&5
    +  { echo "$as_me:948: error: changes in the environment can compromise the build" >&5
     echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    -  { { echo "$as_me:949: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    +  { { echo "$as_me:950: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -967,10 +968,10 @@ esac
     echo "#! $SHELL" >conftest.sh
     echo  "exit 0"   >>conftest.sh
     chmod +x conftest.sh
    -if { (echo "$as_me:970: PATH=\".;.\"; conftest.sh") >&5
    +if { (echo "$as_me:971: PATH=\".;.\"; conftest.sh") >&5
       (PATH=".;."; conftest.sh) 2>&5
       ac_status=$?
    -  echo "$as_me:973: \$? = $ac_status" >&5
    +  echo "$as_me:974: \$? = $ac_status" >&5
       (exit $ac_status); }; then
       ac_path_separator=';'
     else
    @@ -1002,7 +1003,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
       fi
     done
     if test -z "$ac_aux_dir"; then
    -  { { echo "$as_me:1005: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    +  { { echo "$as_me:1006: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -1012,11 +1013,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
     
     # Make sure we can run config.sub.
     $ac_config_sub sun4 >/dev/null 2>&1 ||
    -  { { echo "$as_me:1015: error: cannot run $ac_config_sub" >&5
    +  { { echo "$as_me:1016: error: cannot run $ac_config_sub" >&5
     echo "$as_me: error: cannot run $ac_config_sub" >&2;}
        { (exit 1); exit 1; }; }
     
    -echo "$as_me:1019: checking build system type" >&5
    +echo "$as_me:1020: checking build system type" >&5
     echo $ECHO_N "checking build system type... $ECHO_C" >&6
     if test "${ac_cv_build+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1025,16 +1026,16 @@ else
     test -z "$ac_cv_build_alias" &&
       ac_cv_build_alias=`$ac_config_guess`
     test -z "$ac_cv_build_alias" &&
    -  { { echo "$as_me:1028: error: cannot guess build type; you must specify one" >&5
    +  { { echo "$as_me:1029: error: cannot guess build type; you must specify one" >&5
     echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
        { (exit 1); exit 1; }; }
     ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    -  { { echo "$as_me:1032: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    +  { { echo "$as_me:1033: error: $ac_config_sub $ac_cv_build_alias failed." >&5
     echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
        { (exit 1); exit 1; }; }
     
     fi
    -echo "$as_me:1037: result: $ac_cv_build" >&5
    +echo "$as_me:1038: result: $ac_cv_build" >&5
     echo "${ECHO_T}$ac_cv_build" >&6
     build=$ac_cv_build
     build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    @@ -1042,7 +1043,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
     build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
     
     if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    -	echo "$as_me:1045: checking host system type" >&5
    +	echo "$as_me:1046: checking host system type" >&5
     echo $ECHO_N "checking host system type... $ECHO_C" >&6
     if test "${ac_cv_host+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1051,12 +1052,12 @@ else
     test -z "$ac_cv_host_alias" &&
       ac_cv_host_alias=$ac_cv_build_alias
     ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    -  { { echo "$as_me:1054: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    +  { { echo "$as_me:1055: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
        { (exit 1); exit 1; }; }
     
     fi
    -echo "$as_me:1059: result: $ac_cv_host" >&5
    +echo "$as_me:1060: result: $ac_cv_host" >&5
     echo "${ECHO_T}$ac_cv_host" >&6
     host=$ac_cv_host
     host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    @@ -1082,13 +1083,13 @@ else
     fi
     
     test -z "$system_name" && system_name="$cf_cv_system_name"
    -test -n "$cf_cv_system_name" && echo "$as_me:1085: result: Configuring for $cf_cv_system_name" >&5
    +test -n "$cf_cv_system_name" && echo "$as_me:1086: result: Configuring for $cf_cv_system_name" >&5
     echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
     
     if test ".$system_name" != ".$cf_cv_system_name" ; then
    -	echo "$as_me:1089: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    +	echo "$as_me:1090: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
     echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    -	{ { echo "$as_me:1091: error: \"Please remove config.cache and try again.\"" >&5
    +	{ { echo "$as_me:1092: error: \"Please remove config.cache and try again.\"" >&5
     echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -1106,7 +1107,7 @@ _ACEOF
     program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
     rm conftest.sed
     
    -echo "$as_me:1109: checking whether ${MAKE-make} sets \${MAKE}" >&5
    +echo "$as_me:1110: checking whether ${MAKE-make} sets \${MAKE}" >&5
     echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
     set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
     if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    @@ -1126,11 +1127,11 @@ fi
     rm -f conftest.make
     fi
     if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    -  echo "$as_me:1129: result: yes" >&5
    +  echo "$as_me:1130: result: yes" >&5
     echo "${ECHO_T}yes" >&6
       SET_MAKE=
     else
    -  echo "$as_me:1133: result: no" >&5
    +  echo "$as_me:1134: result: no" >&5
     echo "${ECHO_T}no" >&6
       SET_MAKE="MAKE=${MAKE-make}"
     fi
    @@ -1144,7 +1145,7 @@ ac_main_return=return
     if test -n "$ac_tool_prefix"; then
       # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
     set dummy ${ac_tool_prefix}gcc; ac_word=$2
    -echo "$as_me:1147: checking for $ac_word" >&5
    +echo "$as_me:1148: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1159,7 +1160,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
    -echo "$as_me:1162: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1163: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1167,10 +1168,10 @@ fi
     fi
     CC=$ac_cv_prog_CC
     if test -n "$CC"; then
    -  echo "$as_me:1170: result: $CC" >&5
    +  echo "$as_me:1171: result: $CC" >&5
     echo "${ECHO_T}$CC" >&6
     else
    -  echo "$as_me:1173: result: no" >&5
    +  echo "$as_me:1174: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1179,7 +1180,7 @@ if test -z "$ac_cv_prog_CC"; then
       ac_ct_CC=$CC
       # Extract the first word of "gcc", so it can be a program name with args.
     set dummy gcc; ac_word=$2
    -echo "$as_me:1182: checking for $ac_word" >&5
    +echo "$as_me:1183: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1194,7 +1195,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_CC="gcc"
    -echo "$as_me:1197: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1198: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1202,10 +1203,10 @@ fi
     fi
     ac_ct_CC=$ac_cv_prog_ac_ct_CC
     if test -n "$ac_ct_CC"; then
    -  echo "$as_me:1205: result: $ac_ct_CC" >&5
    +  echo "$as_me:1206: result: $ac_ct_CC" >&5
     echo "${ECHO_T}$ac_ct_CC" >&6
     else
    -  echo "$as_me:1208: result: no" >&5
    +  echo "$as_me:1209: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1218,7 +1219,7 @@ if test -z "$CC"; then
       if test -n "$ac_tool_prefix"; then
       # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
     set dummy ${ac_tool_prefix}cc; ac_word=$2
    -echo "$as_me:1221: checking for $ac_word" >&5
    +echo "$as_me:1222: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1233,7 +1234,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_CC="${ac_tool_prefix}cc"
    -echo "$as_me:1236: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1237: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1241,10 +1242,10 @@ fi
     fi
     CC=$ac_cv_prog_CC
     if test -n "$CC"; then
    -  echo "$as_me:1244: result: $CC" >&5
    +  echo "$as_me:1245: result: $CC" >&5
     echo "${ECHO_T}$CC" >&6
     else
    -  echo "$as_me:1247: result: no" >&5
    +  echo "$as_me:1248: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1253,7 +1254,7 @@ if test -z "$ac_cv_prog_CC"; then
       ac_ct_CC=$CC
       # Extract the first word of "cc", so it can be a program name with args.
     set dummy cc; ac_word=$2
    -echo "$as_me:1256: checking for $ac_word" >&5
    +echo "$as_me:1257: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1268,7 +1269,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_CC="cc"
    -echo "$as_me:1271: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1272: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1276,10 +1277,10 @@ fi
     fi
     ac_ct_CC=$ac_cv_prog_ac_ct_CC
     if test -n "$ac_ct_CC"; then
    -  echo "$as_me:1279: result: $ac_ct_CC" >&5
    +  echo "$as_me:1280: result: $ac_ct_CC" >&5
     echo "${ECHO_T}$ac_ct_CC" >&6
     else
    -  echo "$as_me:1282: result: no" >&5
    +  echo "$as_me:1283: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1292,7 +1293,7 @@ fi
     if test -z "$CC"; then
       # Extract the first word of "cc", so it can be a program name with args.
     set dummy cc; ac_word=$2
    -echo "$as_me:1295: checking for $ac_word" >&5
    +echo "$as_me:1296: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1312,7 +1313,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
       continue
     fi
     ac_cv_prog_CC="cc"
    -echo "$as_me:1315: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1316: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1334,10 +1335,10 @@ fi
     fi
     CC=$ac_cv_prog_CC
     if test -n "$CC"; then
    -  echo "$as_me:1337: result: $CC" >&5
    +  echo "$as_me:1338: result: $CC" >&5
     echo "${ECHO_T}$CC" >&6
     else
    -  echo "$as_me:1340: result: no" >&5
    +  echo "$as_me:1341: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1348,7 +1349,7 @@ if test -z "$CC"; then
       do
         # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    -echo "$as_me:1351: checking for $ac_word" >&5
    +echo "$as_me:1352: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1363,7 +1364,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    -echo "$as_me:1366: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1367: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1371,10 +1372,10 @@ fi
     fi
     CC=$ac_cv_prog_CC
     if test -n "$CC"; then
    -  echo "$as_me:1374: result: $CC" >&5
    +  echo "$as_me:1375: result: $CC" >&5
     echo "${ECHO_T}$CC" >&6
     else
    -  echo "$as_me:1377: result: no" >&5
    +  echo "$as_me:1378: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1387,7 +1388,7 @@ if test -z "$CC"; then
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:1390: checking for $ac_word" >&5
    +echo "$as_me:1391: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1402,7 +1403,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_CC="$ac_prog"
    -echo "$as_me:1405: found $ac_dir/$ac_word" >&5
    +echo "$as_me:1406: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -1410,10 +1411,10 @@ fi
     fi
     ac_ct_CC=$ac_cv_prog_ac_ct_CC
     if test -n "$ac_ct_CC"; then
    -  echo "$as_me:1413: result: $ac_ct_CC" >&5
    +  echo "$as_me:1414: result: $ac_ct_CC" >&5
     echo "${ECHO_T}$ac_ct_CC" >&6
     else
    -  echo "$as_me:1416: result: no" >&5
    +  echo "$as_me:1417: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -1425,32 +1426,32 @@ fi
     
     fi
     
    -test -z "$CC" && { { echo "$as_me:1428: error: no acceptable cc found in \$PATH" >&5
    +test -z "$CC" && { { echo "$as_me:1429: error: no acceptable cc found in \$PATH" >&5
     echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
        { (exit 1); exit 1; }; }
     
     # Provide some information about the compiler.
    -echo "$as_me:1433:" \
    +echo "$as_me:1434:" \
          "checking for C compiler version" >&5
     ac_compiler=`set X $ac_compile; echo $2`
    -{ (eval echo "$as_me:1436: \"$ac_compiler --version &5\"") >&5
    +{ (eval echo "$as_me:1437: \"$ac_compiler --version &5\"") >&5
       (eval $ac_compiler --version &5) 2>&5
       ac_status=$?
    -  echo "$as_me:1439: \$? = $ac_status" >&5
    +  echo "$as_me:1440: \$? = $ac_status" >&5
       (exit $ac_status); }
    -{ (eval echo "$as_me:1441: \"$ac_compiler -v &5\"") >&5
    +{ (eval echo "$as_me:1442: \"$ac_compiler -v &5\"") >&5
       (eval $ac_compiler -v &5) 2>&5
       ac_status=$?
    -  echo "$as_me:1444: \$? = $ac_status" >&5
    +  echo "$as_me:1445: \$? = $ac_status" >&5
       (exit $ac_status); }
    -{ (eval echo "$as_me:1446: \"$ac_compiler -V &5\"") >&5
    +{ (eval echo "$as_me:1447: \"$ac_compiler -V &5\"") >&5
       (eval $ac_compiler -V &5) 2>&5
       ac_status=$?
    -  echo "$as_me:1449: \$? = $ac_status" >&5
    +  echo "$as_me:1450: \$? = $ac_status" >&5
       (exit $ac_status); }
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 1453 "configure"
    +#line 1454 "configure"
     #include "confdefs.h"
     
     int
    @@ -1466,13 +1467,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
     # Try to create an executable without -o first, disregard a.out.
     # It will help us diagnose broken compilers, and finding out an intuition
     # of exeext.
    -echo "$as_me:1469: checking for C compiler default output" >&5
    +echo "$as_me:1470: checking for C compiler default output" >&5
     echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
     ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    -if { (eval echo "$as_me:1472: \"$ac_link_default\"") >&5
    +if { (eval echo "$as_me:1473: \"$ac_link_default\"") >&5
       (eval $ac_link_default) 2>&5
       ac_status=$?
    -  echo "$as_me:1475: \$? = $ac_status" >&5
    +  echo "$as_me:1476: \$? = $ac_status" >&5
       (exit $ac_status); }; then
       # Find the output, starting from the most likely.  This scheme is
     # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    @@ -1495,34 +1496,34 @@ done
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -{ { echo "$as_me:1498: error: C compiler cannot create executables" >&5
    +{ { echo "$as_me:1499: error: C compiler cannot create executables" >&5
     echo "$as_me: error: C compiler cannot create executables" >&2;}
        { (exit 77); exit 77; }; }
     fi
     
     ac_exeext=$ac_cv_exeext
    -echo "$as_me:1504: result: $ac_file" >&5
    +echo "$as_me:1505: result: $ac_file" >&5
     echo "${ECHO_T}$ac_file" >&6
     
     # Check the compiler produces executables we can run.  If not, either
     # the compiler is broken, or we cross compile.
    -echo "$as_me:1509: checking whether the C compiler works" >&5
    +echo "$as_me:1510: checking whether the C compiler works" >&5
     echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
     # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
     # If not cross compiling, check that we can run a simple program.
     if test "$cross_compiling" != yes; then
       if { ac_try='./$ac_file'
    -  { (eval echo "$as_me:1515: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1516: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1518: \$? = $ac_status" >&5
    +  echo "$as_me:1519: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
         cross_compiling=no
       else
         if test "$cross_compiling" = maybe; then
     	cross_compiling=yes
         else
    -	{ { echo "$as_me:1525: error: cannot run C compiled programs.
    +	{ { echo "$as_me:1526: error: cannot run C compiled programs.
     If you meant to cross compile, use \`--host'." >&5
     echo "$as_me: error: cannot run C compiled programs.
     If you meant to cross compile, use \`--host'." >&2;}
    @@ -1530,24 +1531,24 @@ If you meant to cross compile, use \`--host'." >&2;}
         fi
       fi
     fi
    -echo "$as_me:1533: result: yes" >&5
    +echo "$as_me:1534: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     
     rm -f a.out a.exe conftest$ac_cv_exeext
     ac_clean_files=$ac_clean_files_save
     # Check the compiler produces executables we can run.  If not, either
     # the compiler is broken, or we cross compile.
    -echo "$as_me:1540: checking whether we are cross compiling" >&5
    +echo "$as_me:1541: checking whether we are cross compiling" >&5
     echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    -echo "$as_me:1542: result: $cross_compiling" >&5
    +echo "$as_me:1543: result: $cross_compiling" >&5
     echo "${ECHO_T}$cross_compiling" >&6
     
    -echo "$as_me:1545: checking for executable suffix" >&5
    +echo "$as_me:1546: checking for executable suffix" >&5
     echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    -if { (eval echo "$as_me:1547: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:1548: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:1550: \$? = $ac_status" >&5
    +  echo "$as_me:1551: \$? = $ac_status" >&5
       (exit $ac_status); }; then
       # If both `conftest.exe' and `conftest' are `present' (well, observable)
     # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    @@ -1563,25 +1564,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
       esac
     done
     else
    -  { { echo "$as_me:1566: error: cannot compute EXEEXT: cannot compile and link" >&5
    +  { { echo "$as_me:1567: error: cannot compute EXEEXT: cannot compile and link" >&5
     echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
        { (exit 1); exit 1; }; }
     fi
     
     rm -f conftest$ac_cv_exeext
    -echo "$as_me:1572: result: $ac_cv_exeext" >&5
    +echo "$as_me:1573: result: $ac_cv_exeext" >&5
     echo "${ECHO_T}$ac_cv_exeext" >&6
     
     rm -f conftest.$ac_ext
     EXEEXT=$ac_cv_exeext
     ac_exeext=$EXEEXT
    -echo "$as_me:1578: checking for object suffix" >&5
    +echo "$as_me:1579: checking for object suffix" >&5
     echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
     if test "${ac_cv_objext+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 1584 "configure"
    +#line 1585 "configure"
     #include "confdefs.h"
     
     int
    @@ -1593,10 +1594,10 @@ main (void)
     }
     _ACEOF
     rm -f conftest.o conftest.obj
    -if { (eval echo "$as_me:1596: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1597: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1599: \$? = $ac_status" >&5
    +  echo "$as_me:1600: \$? = $ac_status" >&5
       (exit $ac_status); }; then
       for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
       case $ac_file in
    @@ -1608,24 +1609,24 @@ done
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -{ { echo "$as_me:1611: error: cannot compute OBJEXT: cannot compile" >&5
    +{ { echo "$as_me:1612: error: cannot compute OBJEXT: cannot compile" >&5
     echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
        { (exit 1); exit 1; }; }
     fi
     
     rm -f conftest.$ac_cv_objext conftest.$ac_ext
     fi
    -echo "$as_me:1618: result: $ac_cv_objext" >&5
    +echo "$as_me:1619: result: $ac_cv_objext" >&5
     echo "${ECHO_T}$ac_cv_objext" >&6
     OBJEXT=$ac_cv_objext
     ac_objext=$OBJEXT
    -echo "$as_me:1622: checking whether we are using the GNU C compiler" >&5
    +echo "$as_me:1623: checking whether we are using the GNU C compiler" >&5
     echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
     if test "${ac_cv_c_compiler_gnu+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 1628 "configure"
    +#line 1629 "configure"
     #include "confdefs.h"
     
     int
    @@ -1640,16 +1641,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1643: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1644: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1646: \$? = $ac_status" >&5
    +  echo "$as_me:1647: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1649: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1650: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1652: \$? = $ac_status" >&5
    +  echo "$as_me:1653: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_compiler_gnu=yes
     else
    @@ -1661,19 +1662,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     ac_cv_c_compiler_gnu=$ac_compiler_gnu
     
     fi
    -echo "$as_me:1664: result: $ac_cv_c_compiler_gnu" >&5
    +echo "$as_me:1665: result: $ac_cv_c_compiler_gnu" >&5
     echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
     GCC=`test $ac_compiler_gnu = yes && echo yes`
     ac_test_CFLAGS=${CFLAGS+set}
     ac_save_CFLAGS=$CFLAGS
     CFLAGS="-g"
    -echo "$as_me:1670: checking whether $CC accepts -g" >&5
    +echo "$as_me:1671: checking whether $CC accepts -g" >&5
     echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
     if test "${ac_cv_prog_cc_g+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 1676 "configure"
    +#line 1677 "configure"
     #include "confdefs.h"
     
     int
    @@ -1685,16 +1686,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1691: \$? = $ac_status" >&5
    +  echo "$as_me:1692: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1694: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1695: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1697: \$? = $ac_status" >&5
    +  echo "$as_me:1698: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_prog_cc_g=yes
     else
    @@ -1704,7 +1705,7 @@ ac_cv_prog_cc_g=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     fi
    -echo "$as_me:1707: result: $ac_cv_prog_cc_g" >&5
    +echo "$as_me:1708: result: $ac_cv_prog_cc_g" >&5
     echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
     if test "$ac_test_CFLAGS" = set; then
       CFLAGS=$ac_save_CFLAGS
    @@ -1731,16 +1732,16 @@ cat >conftest.$ac_ext <<_ACEOF
     #endif
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1737: \$? = $ac_status" >&5
    +  echo "$as_me:1738: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1741: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1743: \$? = $ac_status" >&5
    +  echo "$as_me:1744: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       for ac_declaration in \
        ''\
    @@ -1752,7 +1753,7 @@ if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
        'void exit (int);'
     do
       cat >conftest.$ac_ext <<_ACEOF
    -#line 1755 "configure"
    +#line 1756 "configure"
     #include "confdefs.h"
     #include 
     $ac_declaration
    @@ -1765,16 +1766,16 @@ exit (42);
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1768: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1769: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1771: \$? = $ac_status" >&5
    +  echo "$as_me:1772: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1775: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1777: \$? = $ac_status" >&5
    +  echo "$as_me:1778: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -1784,7 +1785,7 @@ continue
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
       cat >conftest.$ac_ext <<_ACEOF
    -#line 1787 "configure"
    +#line 1788 "configure"
     #include "confdefs.h"
     $ac_declaration
     int
    @@ -1796,16 +1797,16 @@ exit (42);
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1802: \$? = $ac_status" >&5
    +  echo "$as_me:1803: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1806: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1808: \$? = $ac_status" >&5
    +  echo "$as_me:1809: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       break
     else
    @@ -1835,15 +1836,15 @@ ac_main_return=return
     
     GCC_VERSION=none
     if test "$GCC" = yes ; then
    -	echo "$as_me:1838: checking version of $CC" >&5
    +	echo "$as_me:1839: checking version of $CC" >&5
     echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
     	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
     	test -z "$GCC_VERSION" && GCC_VERSION=unknown
    -	echo "$as_me:1842: result: $GCC_VERSION" >&5
    +	echo "$as_me:1843: result: $GCC_VERSION" >&5
     echo "${ECHO_T}$GCC_VERSION" >&6
     fi
     
    -echo "$as_me:1846: checking for $CC option to accept ANSI C" >&5
    +echo "$as_me:1847: checking for $CC option to accept ANSI C" >&5
     echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
     if test "${ac_cv_prog_cc_stdc+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -1851,7 +1852,7 @@ else
       ac_cv_prog_cc_stdc=no
     ac_save_CC=$CC
     cat >conftest.$ac_ext <<_ACEOF
    -#line 1854 "configure"
    +#line 1855 "configure"
     #include "confdefs.h"
     #include 
     #include 
    @@ -1900,16 +1901,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
     do
       CC="$ac_save_CC $ac_arg"
       rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:1903: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:1904: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:1906: \$? = $ac_status" >&5
    +  echo "$as_me:1907: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:1909: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:1910: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:1912: \$? = $ac_status" >&5
    +  echo "$as_me:1913: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_prog_cc_stdc=$ac_arg
     break
    @@ -1926,10 +1927,10 @@ fi
     
     case "x$ac_cv_prog_cc_stdc" in
       x|xno)
    -    echo "$as_me:1929: result: none needed" >&5
    +    echo "$as_me:1930: result: none needed" >&5
     echo "${ECHO_T}none needed" >&6 ;;
       *)
    -    echo "$as_me:1932: result: $ac_cv_prog_cc_stdc" >&5
    +    echo "$as_me:1933: result: $ac_cv_prog_cc_stdc" >&5
     echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
         CC="$CC $ac_cv_prog_cc_stdc" ;;
     esac
    @@ -1937,13 +1938,13 @@ esac
     # This should have been defined by AC_PROG_CC
     : ${CC:=cc}
     
    -echo "$as_me:1940: checking \$CC variable" >&5
    +echo "$as_me:1941: checking \$CC variable" >&5
     echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
     case "$CC" in
     (*[\ \	]-*)
    -	echo "$as_me:1944: result: broken" >&5
    +	echo "$as_me:1945: result: broken" >&5
     echo "${ECHO_T}broken" >&6
    -	{ echo "$as_me:1946: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
    +	{ echo "$as_me:1947: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
     echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
     	# humor him...
     	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
    @@ -2060,24 +2061,24 @@ fi
     	done
     	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
     
    -echo "${as_me:-configure}:2063: testing resulting CC: '$CC' ..." 1>&5
    +echo "${as_me:-configure}:2064: testing resulting CC: '$CC' ..." 1>&5
     
     	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
     
    -echo "${as_me:-configure}:2067: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
    +echo "${as_me:-configure}:2068: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
     
     	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
     
    -echo "${as_me:-configure}:2071: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
    +echo "${as_me:-configure}:2072: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
     
     	;;
     (*)
    -	echo "$as_me:2075: result: ok" >&5
    +	echo "$as_me:2076: result: ok" >&5
     echo "${ECHO_T}ok" >&6
     	;;
     esac
     
    -echo "$as_me:2080: checking for inline" >&5
    +echo "$as_me:2081: 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
    @@ -2085,7 +2086,7 @@ else
       ac_cv_c_inline=no
     for ac_kw in inline __inline__ __inline; do
       cat >conftest.$ac_ext <<_ACEOF
    -#line 2088 "configure"
    +#line 2089 "configure"
     #include "confdefs.h"
     #ifndef __cplusplus
     static $ac_kw int static_foo () {return 0; }
    @@ -2094,16 +2095,16 @@ $ac_kw int foo () {return 0; }
     
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:2097: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:2098: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:2100: \$? = $ac_status" >&5
    +  echo "$as_me:2101: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:2103: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:2104: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:2106: \$? = $ac_status" >&5
    +  echo "$as_me:2107: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_c_inline=$ac_kw; break
     else
    @@ -2114,7 +2115,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:2117: result: $ac_cv_c_inline" >&5
    +echo "$as_me:2118: result: $ac_cv_c_inline" >&5
     echo "${ECHO_T}$ac_cv_c_inline" >&6
     case $ac_cv_c_inline in
       inline | yes) ;;
    @@ -2135,7 +2136,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     ac_compiler_gnu=$ac_cv_c_compiler_gnu
     ac_main_return=return
    -echo "$as_me:2138: checking how to run the C preprocessor" >&5
    +echo "$as_me:2139: checking how to run the C preprocessor" >&5
     echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
     # On Suns, sometimes $CPP names a directory.
     if test -n "$CPP" && test -d "$CPP"; then
    @@ -2156,18 +2157,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 2159 "configure"
    +#line 2160 "configure"
     #include "confdefs.h"
     #include 
                          Syntax error
     _ACEOF
    -if { (eval echo "$as_me:2164: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:2165: \"$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:2170: \$? = $ac_status" >&5
    +  echo "$as_me:2171: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -2190,17 +2191,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 2193 "configure"
    +#line 2194 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:2197: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:2198: \"$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:2203: \$? = $ac_status" >&5
    +  echo "$as_me:2204: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -2237,7 +2238,7 @@ fi
     else
       ac_cv_prog_CPP=$CPP
     fi
    -echo "$as_me:2240: result: $CPP" >&5
    +echo "$as_me:2241: result: $CPP" >&5
     echo "${ECHO_T}$CPP" >&6
     ac_preproc_ok=false
     for ac_c_preproc_warn_flag in '' yes
    @@ -2247,18 +2248,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 2250 "configure"
    +#line 2251 "configure"
     #include "confdefs.h"
     #include 
                          Syntax error
     _ACEOF
    -if { (eval echo "$as_me:2255: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:2256: \"$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:2261: \$? = $ac_status" >&5
    +  echo "$as_me:2262: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -2281,17 +2282,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 2284 "configure"
    +#line 2285 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:2288: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:2289: \"$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:2294: \$? = $ac_status" >&5
    +  echo "$as_me:2295: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -2319,7 +2320,7 @@ rm -f conftest.err conftest.$ac_ext
     if $ac_preproc_ok; then
       :
     else
    -  { { echo "$as_me:2322: error: C preprocessor \"$CPP\" fails sanity check" >&5
    +  { { echo "$as_me:2323: error: C preprocessor \"$CPP\" fails sanity check" >&5
     echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -2335,7 +2336,7 @@ for ac_prog in mawk gawk nawk awk
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:2338: checking for $ac_word" >&5
    +echo "$as_me:2339: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_AWK+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2350,7 +2351,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_AWK="$ac_prog"
    -echo "$as_me:2353: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2354: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2358,10 +2359,10 @@ fi
     fi
     AWK=$ac_cv_prog_AWK
     if test -n "$AWK"; then
    -  echo "$as_me:2361: result: $AWK" >&5
    +  echo "$as_me:2362: result: $AWK" >&5
     echo "${ECHO_T}$AWK" >&6
     else
    -  echo "$as_me:2364: result: no" >&5
    +  echo "$as_me:2365: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -2380,7 +2381,7 @@ done
     # AFS /usr/afsws/bin/install, which mishandles nonexistent args
     # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
     # ./install, which can be erroneously created by make from ./install.sh.
    -echo "$as_me:2383: checking for a BSD compatible install" >&5
    +echo "$as_me:2384: checking for a BSD compatible install" >&5
     echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
     if test -z "$INSTALL"; then
     if test "${ac_cv_path_install+set}" = set; then
    @@ -2429,7 +2430,7 @@ fi
         INSTALL=$ac_install_sh
       fi
     fi
    -echo "$as_me:2432: result: $INSTALL" >&5
    +echo "$as_me:2433: result: $INSTALL" >&5
     echo "${ECHO_T}$INSTALL" >&6
     
     # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    @@ -2454,7 +2455,7 @@ for ac_prog in lint cppcheck splint
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:2457: checking for $ac_word" >&5
    +echo "$as_me:2458: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_LINT+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2469,7 +2470,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_LINT="$ac_prog"
    -echo "$as_me:2472: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2473: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2477,17 +2478,17 @@ fi
     fi
     LINT=$ac_cv_prog_LINT
     if test -n "$LINT"; then
    -  echo "$as_me:2480: result: $LINT" >&5
    +  echo "$as_me:2481: result: $LINT" >&5
     echo "${ECHO_T}$LINT" >&6
     else
    -  echo "$as_me:2483: result: no" >&5
    +  echo "$as_me:2484: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
       test -n "$LINT" && break
     done
     
    -echo "$as_me:2490: checking if filesystem supports mixed-case filenames" >&5
    +echo "$as_me:2491: checking if filesystem supports mixed-case filenames" >&5
     echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
     if test "${cf_cv_mixedcase+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2514,7 +2515,7 @@ else
     fi
     
     fi
    -echo "$as_me:2517: result: $cf_cv_mixedcase" >&5
    +echo "$as_me:2518: result: $cf_cv_mixedcase" >&5
     echo "${ECHO_T}$cf_cv_mixedcase" >&6
     test "$cf_cv_mixedcase" = yes &&
     cat >>confdefs.h <<\EOF
    @@ -2525,7 +2526,7 @@ for ac_prog in exctags ctags
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:2528: checking for $ac_word" >&5
    +echo "$as_me:2529: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_CTAGS+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2540,7 +2541,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_CTAGS="$ac_prog"
    -echo "$as_me:2543: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2544: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2548,10 +2549,10 @@ fi
     fi
     CTAGS=$ac_cv_prog_CTAGS
     if test -n "$CTAGS"; then
    -  echo "$as_me:2551: result: $CTAGS" >&5
    +  echo "$as_me:2552: result: $CTAGS" >&5
     echo "${ECHO_T}$CTAGS" >&6
     else
    -  echo "$as_me:2554: result: no" >&5
    +  echo "$as_me:2555: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -2562,7 +2563,7 @@ for ac_prog in exetags etags
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:2565: checking for $ac_word" >&5
    +echo "$as_me:2566: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ETAGS+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2577,7 +2578,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ETAGS="$ac_prog"
    -echo "$as_me:2580: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2581: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2585,10 +2586,10 @@ fi
     fi
     ETAGS=$ac_cv_prog_ETAGS
     if test -n "$ETAGS"; then
    -  echo "$as_me:2588: result: $ETAGS" >&5
    +  echo "$as_me:2589: result: $ETAGS" >&5
     echo "${ECHO_T}$ETAGS" >&6
     else
    -  echo "$as_me:2591: result: no" >&5
    +  echo "$as_me:2592: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -2597,7 +2598,7 @@ done
     
     # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
     set dummy ${CTAGS:-ctags}; ac_word=$2
    -echo "$as_me:2600: checking for $ac_word" >&5
    +echo "$as_me:2601: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2612,7 +2613,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_MAKE_LOWER_TAGS="yes"
    -echo "$as_me:2615: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2616: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2621,17 +2622,17 @@ fi
     fi
     MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
     if test -n "$MAKE_LOWER_TAGS"; then
    -  echo "$as_me:2624: result: $MAKE_LOWER_TAGS" >&5
    +  echo "$as_me:2625: result: $MAKE_LOWER_TAGS" >&5
     echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
     else
    -  echo "$as_me:2627: result: no" >&5
    +  echo "$as_me:2628: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
     if test "$cf_cv_mixedcase" = yes ; then
     	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
     set dummy ${ETAGS:-etags}; ac_word=$2
    -echo "$as_me:2634: checking for $ac_word" >&5
    +echo "$as_me:2635: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -2646,7 +2647,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_MAKE_UPPER_TAGS="yes"
    -echo "$as_me:2649: found $ac_dir/$ac_word" >&5
    +echo "$as_me:2650: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -2655,10 +2656,10 @@ fi
     fi
     MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
     if test -n "$MAKE_UPPER_TAGS"; then
    -  echo "$as_me:2658: result: $MAKE_UPPER_TAGS" >&5
    +  echo "$as_me:2659: result: $MAKE_UPPER_TAGS" >&5
     echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
     else
    -  echo "$as_me:2661: result: no" >&5
    +  echo "$as_me:2662: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -2678,14 +2679,14 @@ else
     	MAKE_LOWER_TAGS="#"
     fi
     
    -echo "$as_me:2681: checking if -lm needed for math functions" >&5
    +echo "$as_me:2682: 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 2688 "configure"
    +#line 2689 "configure"
     #include "confdefs.h"
     
     	#include 
    @@ -2701,16 +2702,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:2704: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:2705: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:2707: \$? = $ac_status" >&5
    +  echo "$as_me:2708: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:2710: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:2713: \$? = $ac_status" >&5
    +  echo "$as_me:2714: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_need_libm=no
     else
    @@ -2720,7 +2721,7 @@ cf_cv_need_libm=yes
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:2723: result: $cf_cv_need_libm" >&5
    +echo "$as_me:2724: result: $cf_cv_need_libm" >&5
     echo "${ECHO_T}$cf_cv_need_libm" >&6
     if test "$cf_cv_need_libm" = yes
     then
    @@ -2779,10 +2780,10 @@ cat > conftest.i <&5
    +	{ echo "$as_me:2783: 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:2835: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:2837: \$? = $ac_status" >&5
    +  echo "$as_me:2838: \$? = $ac_status" >&5
       (exit $ac_status); }; then
    -			test -n "$verbose" && echo "$as_me:2839: result: ... $cf_attribute" >&5
    +			test -n "$verbose" && echo "$as_me:2840: result: ... $cf_attribute" >&5
     echo "${ECHO_T}... $cf_attribute" >&6
     			cat conftest.h >>confdefs.h
     			case $cf_attribute in
    @@ -2895,7 +2896,7 @@ fi
     rm -rf conftest*
     fi
     
    -echo "$as_me:2898: checking if you want to work around bogus compiler/loader warnings" >&5
    +echo "$as_me:2899: 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.
    @@ -2905,7 +2906,7 @@ if test "${enable_string_hacks+set}" = set; then
     else
       with_string_hacks=no
     fi;
    -echo "$as_me:2908: result: $with_string_hacks" >&5
    +echo "$as_me:2909: result: $with_string_hacks" >&5
     echo "${ECHO_T}$with_string_hacks" >&6
     
     if test "x$with_string_hacks" = "xyes"; then
    @@ -2914,15 +2915,15 @@ cat >>confdefs.h <<\EOF
     #define USE_STRING_HACKS 1
     EOF
     
    -	{ echo "$as_me:2917: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
    +	{ echo "$as_me:2918: 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:2919: checking for strlcat" >&5
    +	echo "$as_me:2920: 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 2925 "configure"
    +#line 2926 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char strlcat (); below.  */
    @@ -2953,16 +2954,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:2956: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:2957: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:2959: \$? = $ac_status" >&5
    +  echo "$as_me:2960: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:2962: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:2963: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:2965: \$? = $ac_status" >&5
    +  echo "$as_me:2966: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_strlcat=yes
     else
    @@ -2972,7 +2973,7 @@ ac_cv_func_strlcat=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:2975: result: $ac_cv_func_strlcat" >&5
    +echo "$as_me:2976: result: $ac_cv_func_strlcat" >&5
     echo "${ECHO_T}$ac_cv_func_strlcat" >&6
     if test $ac_cv_func_strlcat = yes; then
     
    @@ -2982,7 +2983,7 @@ EOF
     
     else
     
    -		echo "$as_me:2985: checking for strlcat in -lbsd" >&5
    +		echo "$as_me:2986: 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
    @@ -2990,7 +2991,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lbsd  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 2993 "configure"
    +#line 2994 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -3009,16 +3010,16 @@ strlcat ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:3012: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:3013: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:3015: \$? = $ac_status" >&5
    +  echo "$as_me:3016: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:3018: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3019: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3021: \$? = $ac_status" >&5
    +  echo "$as_me:3022: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_bsd_strlcat=yes
     else
    @@ -3029,7 +3030,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:3032: result: $ac_cv_lib_bsd_strlcat" >&5
    +echo "$as_me:3033: 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
     
    @@ -3052,23 +3053,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:3055: checking for $ac_header" >&5
    +echo "$as_me:3056: 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 3061 "configure"
    +#line 3062 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:3065: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:3066: \"$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:3071: \$? = $ac_status" >&5
    +  echo "$as_me:3072: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -3087,7 +3088,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:3090: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:3091: 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:3112: 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 3117 "configure"
    +#line 3118 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char $ac_func (); below.  */
    @@ -3145,16 +3146,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:3148: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:3149: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:3151: \$? = $ac_status" >&5
    +  echo "$as_me:3152: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:3154: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3155: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3157: \$? = $ac_status" >&5
    +  echo "$as_me:3158: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_var=yes"
     else
    @@ -3164,7 +3165,7 @@ eval "$as_ac_var=no"
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:3167: result: `eval echo '${'$as_ac_var'}'`" >&5
    +echo "$as_me:3168: 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:3218: checking if we must define _GNU_SOURCE" >&5
     echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_gnu_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 3224 "configure"
    +#line 3225 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3236,16 +3237,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3239: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3240: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3242: \$? = $ac_status" >&5
    +  echo "$as_me:3243: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3245: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3246: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3248: \$? = $ac_status" >&5
    +  echo "$as_me:3249: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_gnu_source=no
     else
    @@ -3254,7 +3255,7 @@ cat conftest.$ac_ext >&5
     cf_save="$CPPFLAGS"
     	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
     	 cat >conftest.$ac_ext <<_ACEOF
    -#line 3257 "configure"
    +#line 3258 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3269,16 +3270,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3272: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3273: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3275: \$? = $ac_status" >&5
    +  echo "$as_me:3276: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3278: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3279: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3281: \$? = $ac_status" >&5
    +  echo "$as_me:3282: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_gnu_source=no
     else
    @@ -3293,12 +3294,12 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:3296: result: $cf_cv_gnu_source" >&5
    +echo "$as_me:3297: result: $cf_cv_gnu_source" >&5
     echo "${ECHO_T}$cf_cv_gnu_source" >&6
     
     if test "$cf_cv_gnu_source" = yes
     then
    -echo "$as_me:3301: checking if we should also define _DEFAULT_SOURCE" >&5
    +echo "$as_me:3302: checking if we should also define _DEFAULT_SOURCE" >&5
     echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_default_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -3306,7 +3307,7 @@ else
     
     CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 3309 "configure"
    +#line 3310 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3321,16 +3322,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3324: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3325: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3327: \$? = $ac_status" >&5
    +  echo "$as_me:3328: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3330: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3331: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3333: \$? = $ac_status" >&5
    +  echo "$as_me:3334: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_default_source=no
     else
    @@ -3341,7 +3342,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:3344: result: $cf_cv_default_source" >&5
    +echo "$as_me:3345: result: $cf_cv_default_source" >&5
     echo "${ECHO_T}$cf_cv_default_source" >&6
     test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
     fi
    @@ -3367,16 +3368,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
     	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
     		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
     
    -echo "$as_me:3370: checking if we should define _POSIX_C_SOURCE" >&5
    +echo "$as_me:3371: checking if we should define _POSIX_C_SOURCE" >&5
     echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_posix_c_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
    -echo "${as_me:-configure}:3376: testing if the symbol is already defined go no further ..." 1>&5
    +echo "${as_me:-configure}:3377: testing if the symbol is already defined go no further ..." 1>&5
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 3379 "configure"
    +#line 3380 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3391,16 +3392,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3394: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3395: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3397: \$? = $ac_status" >&5
    +  echo "$as_me:3398: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3400: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3401: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3403: \$? = $ac_status" >&5
    +  echo "$as_me:3404: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_posix_c_source=no
     else
    @@ -3421,7 +3422,7 @@ cf_want_posix_source=no
     	 esac
     	 if test "$cf_want_posix_source" = yes ; then
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 3424 "configure"
    +#line 3425 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3436,16 +3437,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3439: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3442: \$? = $ac_status" >&5
    +  echo "$as_me:3443: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3445: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3446: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3448: \$? = $ac_status" >&5
    +  echo "$as_me:3449: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -3456,15 +3457,15 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     	 fi
     
    -echo "${as_me:-configure}:3459: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    +echo "${as_me:-configure}:3460: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
     
     	 CFLAGS="$cf_trim_CFLAGS"
     	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
     
    -echo "${as_me:-configure}:3464: testing if the second compile does not leave our definition intact error ..." 1>&5
    +echo "${as_me:-configure}:3465: testing if the second compile does not leave our definition intact error ..." 1>&5
     
     	 cat >conftest.$ac_ext <<_ACEOF
    -#line 3467 "configure"
    +#line 3468 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3479,16 +3480,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3482: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3485: \$? = $ac_status" >&5
    +  echo "$as_me:3486: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3488: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3489: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3491: \$? = $ac_status" >&5
    +  echo "$as_me:3492: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -3504,7 +3505,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:3507: result: $cf_cv_posix_c_source" >&5
    +echo "$as_me:3508: result: $cf_cv_posix_c_source" >&5
     echo "${ECHO_T}$cf_cv_posix_c_source" >&6
     
     if test "$cf_cv_posix_c_source" != no ; then
    @@ -3642,14 +3643,14 @@ fi
     	;;
     (*)
     
    -echo "$as_me:3645: checking if we should define _XOPEN_SOURCE" >&5
    +echo "$as_me:3646: checking if we should define _XOPEN_SOURCE" >&5
     echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_xopen_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 3652 "configure"
    +#line 3653 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -3668,16 +3669,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3672: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3674: \$? = $ac_status" >&5
    +  echo "$as_me:3675: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3677: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3678: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3680: \$? = $ac_status" >&5
    +  echo "$as_me:3681: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xopen_source=no
     else
    @@ -3686,7 +3687,7 @@ cat conftest.$ac_ext >&5
     cf_save="$CPPFLAGS"
     	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
     	 cat >conftest.$ac_ext <<_ACEOF
    -#line 3689 "configure"
    +#line 3690 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -3705,16 +3706,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3708: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3709: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3711: \$? = $ac_status" >&5
    +  echo "$as_me:3712: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3714: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3715: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3717: \$? = $ac_status" >&5
    +  echo "$as_me:3718: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xopen_source=no
     else
    @@ -3729,7 +3730,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:3732: result: $cf_cv_xopen_source" >&5
    +echo "$as_me:3733: result: $cf_cv_xopen_source" >&5
     echo "${ECHO_T}$cf_cv_xopen_source" >&6
     
     if test "$cf_cv_xopen_source" != no ; then
    @@ -3857,16 +3858,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
     	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
     		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
     
    -echo "$as_me:3860: checking if we should define _POSIX_C_SOURCE" >&5
    +echo "$as_me:3861: checking if we should define _POSIX_C_SOURCE" >&5
     echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_posix_c_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
    -echo "${as_me:-configure}:3866: testing if the symbol is already defined go no further ..." 1>&5
    +echo "${as_me:-configure}:3867: testing if the symbol is already defined go no further ..." 1>&5
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 3869 "configure"
    +#line 3870 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3881,16 +3882,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3884: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3885: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3887: \$? = $ac_status" >&5
    +  echo "$as_me:3888: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3890: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3891: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3893: \$? = $ac_status" >&5
    +  echo "$as_me:3894: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_posix_c_source=no
     else
    @@ -3911,7 +3912,7 @@ cf_want_posix_source=no
     	 esac
     	 if test "$cf_want_posix_source" = yes ; then
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 3914 "configure"
    +#line 3915 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3926,16 +3927,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3929: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3930: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3932: \$? = $ac_status" >&5
    +  echo "$as_me:3933: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3935: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3936: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3938: \$? = $ac_status" >&5
    +  echo "$as_me:3939: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -3946,15 +3947,15 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     	 fi
     
    -echo "${as_me:-configure}:3949: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    +echo "${as_me:-configure}:3950: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
     
     	 CFLAGS="$cf_trim_CFLAGS"
     	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
     
    -echo "${as_me:-configure}:3954: testing if the second compile does not leave our definition intact error ..." 1>&5
    +echo "${as_me:-configure}:3955: testing if the second compile does not leave our definition intact error ..." 1>&5
     
     	 cat >conftest.$ac_ext <<_ACEOF
    -#line 3957 "configure"
    +#line 3958 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -3969,16 +3970,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:3972: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:3975: \$? = $ac_status" >&5
    +  echo "$as_me:3976: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:3978: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:3979: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:3981: \$? = $ac_status" >&5
    +  echo "$as_me:3982: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -3994,7 +3995,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:3997: result: $cf_cv_posix_c_source" >&5
    +echo "$as_me:3998: result: $cf_cv_posix_c_source" >&5
     echo "${ECHO_T}$cf_cv_posix_c_source" >&6
     
     if test "$cf_cv_posix_c_source" != no ; then
    @@ -4186,7 +4187,7 @@ done
     if test -n "$cf_new_cflags" ; then
     	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
     
    -echo "${as_me:-configure}:4189: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
    +echo "${as_me:-configure}:4190: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
     
     	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
     	CFLAGS="${CFLAGS}$cf_new_cflags"
    @@ -4196,7 +4197,7 @@ fi
     if test -n "$cf_new_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
     
    -echo "${as_me:-configure}:4199: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
    +echo "${as_me:-configure}:4200: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
     
     	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
     	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
    @@ -4206,7 +4207,7 @@ fi
     if test -n "$cf_new_extra_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
     
    -echo "${as_me:-configure}:4209: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
    +echo "${as_me:-configure}:4210: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
     
     	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
     	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
    @@ -4216,10 +4217,10 @@ fi
     fi
     
     if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
    -	echo "$as_me:4219: checking if _XOPEN_SOURCE really is set" >&5
    +	echo "$as_me:4220: checking if _XOPEN_SOURCE really is set" >&5
     echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 4222 "configure"
    +#line 4223 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -4234,16 +4235,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4237: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4240: \$? = $ac_status" >&5
    +  echo "$as_me:4241: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4243: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4244: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4246: \$? = $ac_status" >&5
    +  echo "$as_me:4247: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_XOPEN_SOURCE_set=yes
     else
    @@ -4252,12 +4253,12 @@ cat conftest.$ac_ext >&5
     cf_XOPEN_SOURCE_set=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -	echo "$as_me:4255: result: $cf_XOPEN_SOURCE_set" >&5
    +	echo "$as_me:4256: result: $cf_XOPEN_SOURCE_set" >&5
     echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
     	if test $cf_XOPEN_SOURCE_set = yes
     	then
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 4260 "configure"
    +#line 4261 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -4272,16 +4273,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4276: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4278: \$? = $ac_status" >&5
    +  echo "$as_me:4279: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4281: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4282: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4284: \$? = $ac_status" >&5
    +  echo "$as_me:4285: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_XOPEN_SOURCE_set_ok=yes
     else
    @@ -4292,19 +4293,19 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     		if test $cf_XOPEN_SOURCE_set_ok = no
     		then
    -			{ echo "$as_me:4295: WARNING: _XOPEN_SOURCE is lower than requested" >&5
    +			{ echo "$as_me:4296: WARNING: _XOPEN_SOURCE is lower than requested" >&5
     echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
     		fi
     	else
     
    -echo "$as_me:4300: checking if we should define _XOPEN_SOURCE" >&5
    +echo "$as_me:4301: checking if we should define _XOPEN_SOURCE" >&5
     echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
     if test "${cf_cv_xopen_source+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 4307 "configure"
    +#line 4308 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -4323,16 +4324,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4327: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4329: \$? = $ac_status" >&5
    +  echo "$as_me:4330: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4333: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4335: \$? = $ac_status" >&5
    +  echo "$as_me:4336: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xopen_source=no
     else
    @@ -4341,7 +4342,7 @@ cat conftest.$ac_ext >&5
     cf_save="$CPPFLAGS"
     	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
     	 cat >conftest.$ac_ext <<_ACEOF
    -#line 4344 "configure"
    +#line 4345 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -4360,16 +4361,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4363: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4364: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4366: \$? = $ac_status" >&5
    +  echo "$as_me:4367: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4369: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4370: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4372: \$? = $ac_status" >&5
    +  echo "$as_me:4373: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xopen_source=no
     else
    @@ -4384,7 +4385,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:4387: result: $cf_cv_xopen_source" >&5
    +echo "$as_me:4388: result: $cf_cv_xopen_source" >&5
     echo "${ECHO_T}$cf_cv_xopen_source" >&6
     
     if test "$cf_cv_xopen_source" != no ; then
    @@ -4502,7 +4503,7 @@ fi
     	fi
     fi
     
    -echo "$as_me:4505: checking for signal global datatype" >&5
    +echo "$as_me:4506: 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
    @@ -4514,7 +4515,7 @@ else
     		"int"
     	do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 4517 "configure"
    +#line 4518 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -4537,16 +4538,16 @@ signal(SIGINT, handler);
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4541: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4543: \$? = $ac_status" >&5
    +  echo "$as_me:4544: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4546: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4547: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4549: \$? = $ac_status" >&5
    +  echo "$as_me:4550: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_sig_atomic_t=$cf_type
     else
    @@ -4560,7 +4561,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
     
    -echo "$as_me:4563: result: $cf_cv_sig_atomic_t" >&5
    +echo "$as_me:4564: 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:4573: checking if SIGWINCH is defined" >&5
     echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
     if test "${cf_cv_define_sigwinch+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 4579 "configure"
    +#line 4580 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -4591,23 +4592,23 @@ int x = SIGWINCH
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4594: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4595: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4597: \$? = $ac_status" >&5
    +  echo "$as_me:4598: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4600: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4601: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4603: \$? = $ac_status" >&5
    +  echo "$as_me:4604: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_define_sigwinch=yes
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
     cat >conftest.$ac_ext <<_ACEOF
    -#line 4610 "configure"
    +#line 4611 "configure"
     #include "confdefs.h"
     
     #undef _XOPEN_SOURCE
    @@ -4625,16 +4626,16 @@ int x = SIGWINCH
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4628: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4629: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4631: \$? = $ac_status" >&5
    +  echo "$as_me:4632: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4634: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4635: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4637: \$? = $ac_status" >&5
    +  echo "$as_me:4638: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_define_sigwinch=maybe
     else
    @@ -4648,11 +4649,11 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:4651: result: $cf_cv_define_sigwinch" >&5
    +echo "$as_me:4652: result: $cf_cv_define_sigwinch" >&5
     echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
     
     if test "$cf_cv_define_sigwinch" = maybe ; then
    -echo "$as_me:4655: checking for actual SIGWINCH definition" >&5
    +echo "$as_me:4656: checking for actual SIGWINCH definition" >&5
     echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
     if test "${cf_cv_fixup_sigwinch+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -4663,7 +4664,7 @@ cf_sigwinch=32
     while test $cf_sigwinch != 1
     do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 4666 "configure"
    +#line 4667 "configure"
     #include "confdefs.h"
     
     #undef _XOPEN_SOURCE
    @@ -4685,16 +4686,16 @@ int x = SIGWINCH
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:4691: \$? = $ac_status" >&5
    +  echo "$as_me:4692: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:4694: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4695: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4697: \$? = $ac_status" >&5
    +  echo "$as_me:4698: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_fixup_sigwinch=$cf_sigwinch
     	 break
    @@ -4708,7 +4709,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
     done
     
     fi
    -echo "$as_me:4711: result: $cf_cv_fixup_sigwinch" >&5
    +echo "$as_me:4712: result: $cf_cv_fixup_sigwinch" >&5
     echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
     
     	if test "$cf_cv_fixup_sigwinch" != unknown ; then
    @@ -4718,13 +4719,13 @@ fi
     
     # Checks for CODESET support.
     
    -echo "$as_me:4721: checking for nl_langinfo and CODESET" >&5
    +echo "$as_me:4722: checking for nl_langinfo and CODESET" >&5
     echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
     if test "${am_cv_langinfo_codeset+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 4727 "configure"
    +#line 4728 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -4736,16 +4737,16 @@ char* cs = nl_langinfo(CODESET);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:4739: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:4740: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:4742: \$? = $ac_status" >&5
    +  echo "$as_me:4743: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:4745: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:4748: \$? = $ac_status" >&5
    +  echo "$as_me:4749: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       am_cv_langinfo_codeset=yes
     else
    @@ -4756,7 +4757,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
    -echo "$as_me:4759: result: $am_cv_langinfo_codeset" >&5
    +echo "$as_me:4760: result: $am_cv_langinfo_codeset" >&5
     echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
     	if test $am_cv_langinfo_codeset = yes; then
     
    @@ -4766,7 +4767,7 @@ EOF
     
     	fi
     
    -echo "$as_me:4769: checking if you want to use pkg-config" >&5
    +echo "$as_me:4770: checking if you want to use pkg-config" >&5
     echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
     
     # Check whether --with-pkg-config or --without-pkg-config was given.
    @@ -4776,7 +4777,7 @@ if test "${with_pkg_config+set}" = set; then
     else
       cf_pkg_config=yes
     fi;
    -echo "$as_me:4779: result: $cf_pkg_config" >&5
    +echo "$as_me:4780: result: $cf_pkg_config" >&5
     echo "${ECHO_T}$cf_pkg_config" >&6
     
     case $cf_pkg_config in
    @@ -4788,7 +4789,7 @@ case $cf_pkg_config in
     if test -n "$ac_tool_prefix"; then
       # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
     set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
    -echo "$as_me:4791: checking for $ac_word" >&5
    +echo "$as_me:4792: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -4805,7 +4806,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       if $as_executable_p "$ac_dir/$ac_word"; then
        ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    -   echo "$as_me:4808: found $ac_dir/$ac_word" >&5
    +   echo "$as_me:4809: found $ac_dir/$ac_word" >&5
        break
     fi
     done
    @@ -4816,10 +4817,10 @@ fi
     PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     
     if test -n "$PKG_CONFIG"; then
    -  echo "$as_me:4819: result: $PKG_CONFIG" >&5
    +  echo "$as_me:4820: result: $PKG_CONFIG" >&5
     echo "${ECHO_T}$PKG_CONFIG" >&6
     else
    -  echo "$as_me:4822: result: no" >&5
    +  echo "$as_me:4823: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -4828,7 +4829,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
       ac_pt_PKG_CONFIG=$PKG_CONFIG
       # Extract the first word of "pkg-config", so it can be a program name with args.
     set dummy pkg-config; ac_word=$2
    -echo "$as_me:4831: checking for $ac_word" >&5
    +echo "$as_me:4832: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -4845,7 +4846,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       if $as_executable_p "$ac_dir/$ac_word"; then
        ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
    -   echo "$as_me:4848: found $ac_dir/$ac_word" >&5
    +   echo "$as_me:4849: found $ac_dir/$ac_word" >&5
        break
     fi
     done
    @@ -4857,10 +4858,10 @@ fi
     ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
     
     if test -n "$ac_pt_PKG_CONFIG"; then
    -  echo "$as_me:4860: result: $ac_pt_PKG_CONFIG" >&5
    +  echo "$as_me:4861: result: $ac_pt_PKG_CONFIG" >&5
     echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
     else
    -  echo "$as_me:4863: result: no" >&5
    +  echo "$as_me:4864: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -4903,18 +4904,18 @@ case ".$PKG_CONFIG" in
     	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
     	;;
     (*)
    -	{ { echo "$as_me:4906: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    +	{ { echo "$as_me:4907: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
        { (exit 1); exit 1; }; }
     	;;
     esac
     
     elif test "x$cf_pkg_config" != xno ; then
    -	{ echo "$as_me:4913: WARNING: pkg-config is not installed" >&5
    +	{ echo "$as_me:4914: WARNING: pkg-config is not installed" >&5
     echo "$as_me: WARNING: pkg-config is not installed" >&2;}
     fi
     
    -echo "$as_me:4917: checking if you want to see long compiling messages" >&5
    +echo "$as_me:4918: 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.
    @@ -4948,10 +4949,10 @@ else
     	ECHO_CC=''
     
     fi;
    -echo "$as_me:4951: result: $enableval" >&5
    +echo "$as_me:4952: result: $enableval" >&5
     echo "${ECHO_T}$enableval" >&6
     
    -echo "$as_me:4954: checking for ncurses wrap-prefix" >&5
    +echo "$as_me:4955: checking for ncurses wrap-prefix" >&5
     echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
     
     # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
    @@ -4961,10 +4962,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
     else
       NCURSES_WRAP_PREFIX=_nc_
     fi;
    -echo "$as_me:4964: result: $NCURSES_WRAP_PREFIX" >&5
    +echo "$as_me:4965: result: $NCURSES_WRAP_PREFIX" >&5
     echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
     
    -echo "$as_me:4967: checking if you want to check for wide-character functions" >&5
    +echo "$as_me:4968: checking if you want to check for wide-character functions" >&5
     echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
     
     # Check whether --enable-widec or --disable-widec was given.
    @@ -4981,10 +4982,10 @@ else
     	cf_enable_widec=yes
     
     fi;
    -echo "$as_me:4984: result: $cf_enable_widec" >&5
    +echo "$as_me:4985: result: $cf_enable_widec" >&5
     echo "${ECHO_T}$cf_enable_widec" >&6
     
    -echo "$as_me:4987: checking for specific curses-directory" >&5
    +echo "$as_me:4988: checking for specific curses-directory" >&5
     echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
     
     # Check whether --with-curses-dir or --without-curses-dir was given.
    @@ -4994,7 +4995,7 @@ if test "${with_curses_dir+set}" = set; then
     else
       cf_cv_curses_dir=no
     fi;
    -echo "$as_me:4997: result: $cf_cv_curses_dir" >&5
    +echo "$as_me:4998: result: $cf_cv_curses_dir" >&5
     echo "${ECHO_T}$cf_cv_curses_dir" >&6
     
     if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
    @@ -5025,7 +5026,7 @@ case ".$withval" in
     	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
     	;;
     (*)
    -	{ { echo "$as_me:5028: error: expected a pathname, not \"$withval\"" >&5
    +	{ { echo "$as_me:5029: error: expected a pathname, not \"$withval\"" >&5
     echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
        { (exit 1); exit 1; }; }
     	;;
    @@ -5058,7 +5059,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 5061 "configure"
    +#line 5062 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -5070,16 +5071,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:5073: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:5074: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:5076: \$? = $ac_status" >&5
    +  echo "$as_me:5077: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:5079: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5080: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5082: \$? = $ac_status" >&5
    +  echo "$as_me:5083: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -5096,7 +5097,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}:5099: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:5100: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -5132,7 +5133,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:5135: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:5136: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -5145,7 +5146,7 @@ fi
     
     cf_cv_screen=curses
     
    -echo "$as_me:5148: checking for specified curses library type" >&5
    +echo "$as_me:5149: checking for specified curses library type" >&5
     echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
     
     # Check whether --with-screen or --without-screen was given.
    @@ -5189,13 +5190,13 @@ fi;
     fi;
     fi;
     
    -echo "$as_me:5192: result: $cf_cv_screen" >&5
    +echo "$as_me:5193: result: $cf_cv_screen" >&5
     echo "${ECHO_T}$cf_cv_screen" >&6
     
     case $cf_cv_screen in
     (curses|curses_*)
     
    -echo "$as_me:5198: checking for extra include directories" >&5
    +echo "$as_me:5199: checking for extra include directories" >&5
     echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
     if test "${cf_cv_curses_incdir+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5221,11 +5222,11 @@ case $host_os in
     esac
     
     fi
    -echo "$as_me:5224: result: $cf_cv_curses_incdir" >&5
    +echo "$as_me:5225: result: $cf_cv_curses_incdir" >&5
     echo "${ECHO_T}$cf_cv_curses_incdir" >&6
     test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
     
    -echo "$as_me:5228: checking if we have identified curses headers" >&5
    +echo "$as_me:5229: checking if we have identified curses headers" >&5
     echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
     if test "${cf_cv_ncurses_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5237,7 +5238,7 @@ for cf_header in \
     	curses.h  ncurses/ncurses.h ncurses/curses.h
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5240 "configure"
    +#line 5241 "configure"
     #include "confdefs.h"
     #include <${cf_header}>
     int
    @@ -5249,16 +5250,16 @@ initscr(); tgoto("?", 0,0)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:5252: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:5253: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:5255: \$? = $ac_status" >&5
    +  echo "$as_me:5256: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:5258: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5259: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5261: \$? = $ac_status" >&5
    +  echo "$as_me:5262: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_header=$cf_header; break
     else
    @@ -5269,11 +5270,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:5272: result: $cf_cv_ncurses_header" >&5
    +echo "$as_me:5273: result: $cf_cv_ncurses_header" >&5
     echo "${ECHO_T}$cf_cv_ncurses_header" >&6
     
     if test "$cf_cv_ncurses_header" = none ; then
    -	{ { echo "$as_me:5276: error: No curses header-files found" >&5
    +	{ { echo "$as_me:5277: error: No curses header-files found" >&5
     echo "$as_me: error: No curses header-files found" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -5283,23 +5284,23 @@ fi
     for ac_header in $cf_cv_ncurses_header
     do
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    -echo "$as_me:5286: checking for $ac_header" >&5
    +echo "$as_me:5287: 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 5292 "configure"
    +#line 5293 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:5296: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:5297: \"$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:5302: \$? = $ac_status" >&5
    +  echo "$as_me:5303: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -5318,7 +5319,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:5321: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:5322: 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:5332: checking for terminfo header" >&5
     echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5346,7 +5347,7 @@ esac
     for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5349 "configure"
    +#line 5350 "configure"
     #include "confdefs.h"
     #include 
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -5361,16 +5362,16 @@ int x = auto_left_margin
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:5364: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:5365: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:5367: \$? = $ac_status" >&5
    +  echo "$as_me:5368: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5373: \$? = $ac_status" >&5
    +  echo "$as_me:5374: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_term_header="$cf_test"
    @@ -5386,7 +5387,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:5389: result: $cf_cv_term_header" >&5
    +echo "$as_me:5390: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     # Set definitions to allow ifdef'ing to accommodate subdirectories
    @@ -5418,7 +5419,7 @@ EOF
     	;;
     esac
     
    -echo "$as_me:5421: checking for ncurses version" >&5
    +echo "$as_me:5422: checking for ncurses version" >&5
     echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
     if test "${cf_cv_ncurses_version+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5444,10 +5445,10 @@ Autoconf "old"
     #endif
     EOF
     	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
    -	{ (eval echo "$as_me:5447: \"$cf_try\"") >&5
    +	{ (eval echo "$as_me:5448: \"$cf_try\"") >&5
       (eval $cf_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5450: \$? = $ac_status" >&5
    +  echo "$as_me:5451: \$? = $ac_status" >&5
       (exit $ac_status); }
     	if test -f conftest.out ; then
     		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
    @@ -5457,7 +5458,7 @@ EOF
     
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 5460 "configure"
    +#line 5461 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -5482,15 +5483,15 @@ int main(void)
     }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:5485: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5486: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5488: \$? = $ac_status" >&5
    +  echo "$as_me:5489: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:5490: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5491: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5493: \$? = $ac_status" >&5
    +  echo "$as_me:5494: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_ncurses_version=`cat $cf_tempfile`
    @@ -5504,17 +5505,17 @@ fi
     	rm -f $cf_tempfile
     
     fi
    -echo "$as_me:5507: result: $cf_cv_ncurses_version" >&5
    +echo "$as_me:5508: result: $cf_cv_ncurses_version" >&5
     echo "${ECHO_T}$cf_cv_ncurses_version" >&6
     test "$cf_cv_ncurses_version" = no ||
     cat >>confdefs.h <<\EOF
     #define NCURSES 1
     EOF
     
    -echo "$as_me:5514: checking if we have identified curses libraries" >&5
    +echo "$as_me:5515: checking if we have identified curses libraries" >&5
     echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5517 "configure"
    +#line 5518 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -5526,16 +5527,16 @@ initscr(); tgoto("?", 0,0)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:5529: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5530: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5532: \$? = $ac_status" >&5
    +  echo "$as_me:5533: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5538: \$? = $ac_status" >&5
    +  echo "$as_me:5539: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -5544,13 +5545,13 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -echo "$as_me:5547: result: $cf_result" >&5
    +echo "$as_me:5548: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     
     if test "$cf_result" = no ; then
     case $host_os in
     (freebsd*)
    -	echo "$as_me:5553: checking for tgoto in -lmytinfo" >&5
    +	echo "$as_me:5554: checking for tgoto in -lmytinfo" >&5
     echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
     if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5558,7 +5559,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lmytinfo  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5561 "configure"
    +#line 5562 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -5577,16 +5578,16 @@ tgoto ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:5580: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5581: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5583: \$? = $ac_status" >&5
    +  echo "$as_me:5584: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:5586: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5587: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5589: \$? = $ac_status" >&5
    +  echo "$as_me:5590: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_mytinfo_tgoto=yes
     else
    @@ -5597,7 +5598,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:5600: result: $ac_cv_lib_mytinfo_tgoto" >&5
    +echo "$as_me:5601: result: $ac_cv_lib_mytinfo_tgoto" >&5
     echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
     if test $ac_cv_lib_mytinfo_tgoto = yes; then
     
    @@ -5627,7 +5628,7 @@ fi
     	# term.h) for cur_colr
     	if test "x$cf_cv_screen" = "xcurses_colr"
     	then
    -		echo "$as_me:5630: checking for initscr in -lcur_colr" >&5
    +		echo "$as_me:5631: checking for initscr in -lcur_colr" >&5
     echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
     if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5635,7 +5636,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lcur_colr  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5638 "configure"
    +#line 5639 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -5654,16 +5655,16 @@ initscr ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:5657: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5660: \$? = $ac_status" >&5
    +  echo "$as_me:5661: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5666: \$? = $ac_status" >&5
    +  echo "$as_me:5667: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_cur_colr_initscr=yes
     else
    @@ -5674,7 +5675,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:5677: result: $ac_cv_lib_cur_colr_initscr" >&5
    +echo "$as_me:5678: result: $ac_cv_lib_cur_colr_initscr" >&5
     echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
     if test $ac_cv_lib_cur_colr_initscr = yes; then
     
    @@ -5698,7 +5699,7 @@ LIBS="$cf_add_libs"
     
     else
     
    -		echo "$as_me:5701: checking for initscr in -lHcurses" >&5
    +		echo "$as_me:5702: checking for initscr in -lHcurses" >&5
     echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
     if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -5706,7 +5707,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lHcurses  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 5709 "configure"
    +#line 5710 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -5725,16 +5726,16 @@ initscr ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:5728: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5729: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5731: \$? = $ac_status" >&5
    +  echo "$as_me:5732: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:5734: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5735: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5737: \$? = $ac_status" >&5
    +  echo "$as_me:5738: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_Hcurses_initscr=yes
     else
    @@ -5745,7 +5746,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:5748: result: $ac_cv_lib_Hcurses_initscr" >&5
    +echo "$as_me:5749: result: $ac_cv_lib_Hcurses_initscr" >&5
     echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
     if test $ac_cv_lib_Hcurses_initscr = yes; then
     
    @@ -5801,7 +5802,7 @@ if test -n "/lib64" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:5804: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:5805: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -5830,7 +5831,7 @@ if test -n "/lib" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:5833: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:5834: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -5861,7 +5862,7 @@ if test -n "/lib" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:5864: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:5865: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -5896,7 +5897,7 @@ if test -n "/usr/5lib" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:5899: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:5900: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -5940,13 +5941,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     	# because it may be needed to link the test-case for initscr.
     	if test "x$cf_term_lib" = x
     	then
    -		echo "$as_me:5943: checking for tgoto" >&5
    +		echo "$as_me:5944: checking for tgoto" >&5
     echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
     if test "${ac_cv_func_tgoto+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 5949 "configure"
    +#line 5950 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char tgoto (); below.  */
    @@ -5977,16 +5978,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:5980: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:5981: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:5983: \$? = $ac_status" >&5
    +  echo "$as_me:5984: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:5986: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:5987: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:5989: \$? = $ac_status" >&5
    +  echo "$as_me:5990: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_tgoto=yes
     else
    @@ -5996,7 +5997,7 @@ ac_cv_func_tgoto=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:5999: result: $ac_cv_func_tgoto" >&5
    +echo "$as_me:6000: result: $ac_cv_func_tgoto" >&5
     echo "${ECHO_T}$ac_cv_func_tgoto" >&6
     if test $ac_cv_func_tgoto = yes; then
       cf_term_lib=predefined
    @@ -6005,7 +6006,7 @@ else
     			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
     			do
     				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
    -echo "$as_me:6008: checking for tgoto in -l$cf_term_lib" >&5
    +echo "$as_me:6009: checking for tgoto in -l$cf_term_lib" >&5
     echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
     if eval "test \"\${$as_ac_Lib+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -6013,7 +6014,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-l$cf_term_lib  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 6016 "configure"
    +#line 6017 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -6032,16 +6033,16 @@ tgoto ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6035: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6038: \$? = $ac_status" >&5
    +  echo "$as_me:6039: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6041: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6044: \$? = $ac_status" >&5
    +  echo "$as_me:6045: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_Lib=yes"
     else
    @@ -6052,7 +6053,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:6055: result: `eval echo '${'$as_ac_Lib'}'`" >&5
    +echo "$as_me:6056: result: `eval echo '${'$as_ac_Lib'}'`" >&5
     echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
     if test `eval echo '${'$as_ac_Lib'}'` = yes; then
       break
    @@ -6072,10 +6073,10 @@ fi
     		do
     			LIBS="-l$cf_curs_lib $cf_save_LIBS"
     			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
    -				echo "$as_me:6075: checking if we can link with $cf_curs_lib library" >&5
    +				echo "$as_me:6076: checking if we can link with $cf_curs_lib library" >&5
     echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
     				cat >conftest.$ac_ext <<_ACEOF
    -#line 6078 "configure"
    +#line 6079 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -6087,16 +6088,16 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6090: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6091: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6093: \$? = $ac_status" >&5
    +  echo "$as_me:6094: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6096: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6097: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6099: \$? = $ac_status" >&5
    +  echo "$as_me:6100: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -6105,16 +6106,16 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -				echo "$as_me:6108: result: $cf_result" >&5
    +				echo "$as_me:6109: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     				test $cf_result = yes && break
     			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
     				cf_result=no
     			elif test "$cf_term_lib" != predefined ; then
    -				echo "$as_me:6114: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
    +				echo "$as_me:6115: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
     echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
     				cat >conftest.$ac_ext <<_ACEOF
    -#line 6117 "configure"
    +#line 6118 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -6126,16 +6127,16 @@ initscr(); tgoto((char *)0, 0, 0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6129: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6132: \$? = $ac_status" >&5
    +  echo "$as_me:6133: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6138: \$? = $ac_status" >&5
    +  echo "$as_me:6139: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=no
     else
    @@ -6144,7 +6145,7 @@ cat conftest.$ac_ext >&5
     
     					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
     					cat >conftest.$ac_ext <<_ACEOF
    -#line 6147 "configure"
    +#line 6148 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -6156,16 +6157,16 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6159: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6160: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6162: \$? = $ac_status" >&5
    +  echo "$as_me:6163: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6165: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6166: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6168: \$? = $ac_status" >&5
    +  echo "$as_me:6169: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -6177,13 +6178,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -				echo "$as_me:6180: result: $cf_result" >&5
    +				echo "$as_me:6181: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     				test $cf_result != error && break
     			fi
     		done
     	fi
    -	test $cf_curs_lib = unknown && { { echo "$as_me:6186: error: no curses library found" >&5
    +	test $cf_curs_lib = unknown && { { echo "$as_me:6187: error: no curses library found" >&5
     echo "$as_me: error: no curses library found" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -6192,7 +6193,7 @@ fi
     	;;
     (ncursesw*)
     
    -echo "$as_me:6195: checking for multibyte character support" >&5
    +echo "$as_me:6196: checking for multibyte character support" >&5
     echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
     if test "${cf_cv_utf8_lib+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -6200,7 +6201,7 @@ else
     
     	cf_save_LIBS="$LIBS"
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 6203 "configure"
    +#line 6204 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -6213,16 +6214,16 @@ putwc(0,0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6216: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6217: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6219: \$? = $ac_status" >&5
    +  echo "$as_me:6220: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6222: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6223: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6225: \$? = $ac_status" >&5
    +  echo "$as_me:6226: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_utf8_lib=yes
     else
    @@ -6234,12 +6235,12 @@ cat conftest.$ac_ext >&5
     cf_cv_header_path_utf8=
     cf_cv_library_path_utf8=
     
    -echo "${as_me:-configure}:6237: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    +echo "${as_me:-configure}:6238: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
     
     cf_save_LIBS="$LIBS"
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 6242 "configure"
    +#line 6243 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -6252,16 +6253,16 @@ putwc(0,0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6255: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6256: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6258: \$? = $ac_status" >&5
    +  echo "$as_me:6259: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6261: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6262: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6264: \$? = $ac_status" >&5
    +  echo "$as_me:6265: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_find_linkage_utf8=yes
    @@ -6275,7 +6276,7 @@ cat conftest.$ac_ext >&5
     LIBS="-lutf8  $cf_save_LIBS"
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 6278 "configure"
    +#line 6279 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -6288,16 +6289,16 @@ putwc(0,0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6291: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6292: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6294: \$? = $ac_status" >&5
    +  echo "$as_me:6295: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6297: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6298: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6300: \$? = $ac_status" >&5
    +  echo "$as_me:6301: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_find_linkage_utf8=yes
    @@ -6314,9 +6315,9 @@ cat conftest.$ac_ext >&5
     
     	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
     
    -echo "${as_me:-configure}:6317: testing find linkage for utf8 library ..." 1>&5
    +echo "${as_me:-configure}:6318: testing find linkage for utf8 library ..." 1>&5
     
    -echo "${as_me:-configure}:6319: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    +echo "${as_me:-configure}:6320: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
     
     	cf_save_CPPFLAGS="$CPPFLAGS"
     	cf_test_CPPFLAGS="$CPPFLAGS"
    @@ -6407,11 +6408,11 @@ cf_search="$cf_search $cf_header_path_list"
     		if test -d $cf_cv_header_path_utf8 ; then
     			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
     
    -echo "${as_me:-configure}:6410: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    +echo "${as_me:-configure}:6411: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
     
     			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
     			cat >conftest.$ac_ext <<_ACEOF
    -#line 6414 "configure"
    +#line 6415 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -6424,21 +6425,21 @@ putwc(0,0);
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:6427: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:6430: \$? = $ac_status" >&5
    +  echo "$as_me:6431: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:6433: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6436: \$? = $ac_status" >&5
    +  echo "$as_me:6437: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
     
    -echo "${as_me:-configure}:6441: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    +echo "${as_me:-configure}:6442: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
     
     				cf_cv_find_linkage_utf8=maybe
     				cf_test_CPPFLAGS="$CPPFLAGS"
    @@ -6456,7 +6457,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     
     	if test "$cf_cv_find_linkage_utf8" = maybe ; then
     
    -echo "${as_me:-configure}:6459: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    +echo "${as_me:-configure}:6460: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
     
     		cf_save_LIBS="$LIBS"
     		cf_save_LDFLAGS="$LDFLAGS"
    @@ -6531,13 +6532,13 @@ cf_search="$cf_library_path_list $cf_search"
     				if test -d $cf_cv_library_path_utf8 ; then
     					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
     
    -echo "${as_me:-configure}:6534: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    +echo "${as_me:-configure}:6535: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
     
     					CPPFLAGS="$cf_test_CPPFLAGS"
     					LIBS="-lutf8  $cf_save_LIBS"
     					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
     					cat >conftest.$ac_ext <<_ACEOF
    -#line 6540 "configure"
    +#line 6541 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -6550,21 +6551,21 @@ putwc(0,0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6553: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6554: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6556: \$? = $ac_status" >&5
    +  echo "$as_me:6557: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6559: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6560: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6562: \$? = $ac_status" >&5
    +  echo "$as_me:6563: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
     
    -echo "${as_me:-configure}:6567: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    +echo "${as_me:-configure}:6568: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
     
     					cf_cv_find_linkage_utf8=yes
     					cf_cv_library_file_utf8="-lutf8"
    @@ -6606,7 +6607,7 @@ fi
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:6609: result: $cf_cv_utf8_lib" >&5
    +echo "$as_me:6610: result: $cf_cv_utf8_lib" >&5
     echo "${ECHO_T}$cf_cv_utf8_lib" >&6
     
     # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    @@ -6641,7 +6642,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 6644 "configure"
    +#line 6645 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -6653,16 +6654,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:6656: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:6657: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:6659: \$? = $ac_status" >&5
    +  echo "$as_me:6660: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:6662: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6663: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6665: \$? = $ac_status" >&5
    +  echo "$as_me:6666: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -6679,7 +6680,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}:6682: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:6683: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -6715,7 +6716,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
     			if test "$cf_have_libdir" = no ; then
     				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
     
    -echo "${as_me:-configure}:6718: testing adding $cf_add_libdir to library-path ..." 1>&5
    +echo "${as_me:-configure}:6719: testing adding $cf_add_libdir to library-path ..." 1>&5
     
     				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
     			fi
    @@ -6745,13 +6746,13 @@ cf_ncuconfig_root=$cf_cv_screen
     cf_have_ncuconfig=no
     
     if test "x${PKG_CONFIG:=none}" != xnone; then
    -	echo "$as_me:6748: checking pkg-config for $cf_ncuconfig_root" >&5
    +	echo "$as_me:6749: checking pkg-config for $cf_ncuconfig_root" >&5
     echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
     	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
    -		echo "$as_me:6751: result: yes" >&5
    +		echo "$as_me:6752: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     
    -		echo "$as_me:6754: checking if the $cf_ncuconfig_root package files work" >&5
    +		echo "$as_me:6755: checking if the $cf_ncuconfig_root package files work" >&5
     echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
     		cf_have_ncuconfig=unknown
     
    @@ -6777,7 +6778,7 @@ done
     LIBS="$cf_add_libs"
     
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 6780 "configure"
    +#line 6781 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -6789,37 +6790,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:6792: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6795: \$? = $ac_status" >&5
    +  echo "$as_me:6796: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:6798: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6799: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6801: \$? = $ac_status" >&5
    +  echo "$as_me:6802: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       if test "$cross_compiling" = yes; then
       cf_have_ncuconfig=maybe
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 6807 "configure"
    +#line 6808 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     				int main(void)
     				{ char *xx = curses_version(); return (xx == 0); }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:6814: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:6815: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:6817: \$? = $ac_status" >&5
    +  echo "$as_me:6818: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6820: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6822: \$? = $ac_status" >&5
    +  echo "$as_me:6823: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_have_ncuconfig=yes
     else
    @@ -6836,7 +6837,7 @@ cat conftest.$ac_ext >&5
     cf_have_ncuconfig=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -		echo "$as_me:6839: result: $cf_have_ncuconfig" >&5
    +		echo "$as_me:6840: result: $cf_have_ncuconfig" >&5
     echo "${ECHO_T}$cf_have_ncuconfig" >&6
     		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
     		if test "$cf_have_ncuconfig" != "yes"
    @@ -6853,7 +6854,7 @@ EOF
     			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
     		fi
     
    -echo "$as_me:6856: checking for terminfo header" >&5
    +echo "$as_me:6857: checking for terminfo header" >&5
     echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -6871,7 +6872,7 @@ esac
     for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 6874 "configure"
    +#line 6875 "configure"
     #include "confdefs.h"
     #include 
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -6886,16 +6887,16 @@ int x = auto_left_margin
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:6889: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:6890: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:6892: \$? = $ac_status" >&5
    +  echo "$as_me:6893: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:6895: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:6896: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:6898: \$? = $ac_status" >&5
    +  echo "$as_me:6899: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_term_header="$cf_test"
    @@ -6911,7 +6912,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:6914: result: $cf_cv_term_header" >&5
    +echo "$as_me:6915: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     # Set definitions to allow ifdef'ing to accommodate subdirectories
    @@ -6944,7 +6945,7 @@ EOF
     esac
     
     	else
    -		echo "$as_me:6947: result: no" >&5
    +		echo "$as_me:6948: result: no" >&5
     echo "${ECHO_T}no" >&6
     		NCURSES_CONFIG_PKG=none
     	fi
    @@ -6960,7 +6961,7 @@ if test -n "$ac_tool_prefix"; then
       do
         # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    -echo "$as_me:6963: checking for $ac_word" >&5
    +echo "$as_me:6964: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -6975,7 +6976,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
    -echo "$as_me:6978: found $ac_dir/$ac_word" >&5
    +echo "$as_me:6979: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -6983,10 +6984,10 @@ fi
     fi
     NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
     if test -n "$NCURSES_CONFIG"; then
    -  echo "$as_me:6986: result: $NCURSES_CONFIG" >&5
    +  echo "$as_me:6987: result: $NCURSES_CONFIG" >&5
     echo "${ECHO_T}$NCURSES_CONFIG" >&6
     else
    -  echo "$as_me:6989: result: no" >&5
    +  echo "$as_me:6990: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -6999,7 +7000,7 @@ if test -z "$NCURSES_CONFIG"; then
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:7002: checking for $ac_word" >&5
    +echo "$as_me:7003: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7014,7 +7015,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
    -echo "$as_me:7017: found $ac_dir/$ac_word" >&5
    +echo "$as_me:7018: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -7022,10 +7023,10 @@ fi
     fi
     ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
     if test -n "$ac_ct_NCURSES_CONFIG"; then
    -  echo "$as_me:7025: result: $ac_ct_NCURSES_CONFIG" >&5
    +  echo "$as_me:7026: result: $ac_ct_NCURSES_CONFIG" >&5
     echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
     else
    -  echo "$as_me:7028: result: no" >&5
    +  echo "$as_me:7029: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -7058,7 +7059,7 @@ LIBS="$cf_add_libs"
     
     		# even with config script, some packages use no-override for curses.h
     
    -echo "$as_me:7061: checking if we have identified curses headers" >&5
    +echo "$as_me:7062: checking if we have identified curses headers" >&5
     echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
     if test "${cf_cv_ncurses_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7070,7 +7071,7 @@ for cf_header in \
     	curses.h $cf_cv_screen/curses.h
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 7073 "configure"
    +#line 7074 "configure"
     #include "confdefs.h"
     #include <${cf_header}>
     int
    @@ -7082,16 +7083,16 @@ initscr(); tgoto("?", 0,0)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7085: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7086: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7088: \$? = $ac_status" >&5
    +  echo "$as_me:7089: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7092: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7094: \$? = $ac_status" >&5
    +  echo "$as_me:7095: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_header=$cf_header; break
     else
    @@ -7102,11 +7103,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:7105: result: $cf_cv_ncurses_header" >&5
    +echo "$as_me:7106: result: $cf_cv_ncurses_header" >&5
     echo "${ECHO_T}$cf_cv_ncurses_header" >&6
     
     if test "$cf_cv_ncurses_header" = none ; then
    -	{ { echo "$as_me:7109: error: No curses header-files found" >&5
    +	{ { echo "$as_me:7110: error: No curses header-files found" >&5
     echo "$as_me: error: No curses header-files found" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -7116,23 +7117,23 @@ fi
     for ac_header in $cf_cv_ncurses_header
     do
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    -echo "$as_me:7119: checking for $ac_header" >&5
    +echo "$as_me:7120: 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 7125 "configure"
    +#line 7126 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:7129: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:7130: \"$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:7135: \$? = $ac_status" >&5
    +  echo "$as_me:7136: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -7151,7 +7152,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:7154: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:7155: result: `eval echo '${'$as_ac_Header'}'`" >&5
     echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
     if test `eval echo '${'$as_ac_Header'}'` = yes; then
       cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
    -#line 7207 "configure"
    +#line 7208 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -7216,16 +7217,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7219: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7220: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7222: \$? = $ac_status" >&5
    +  echo "$as_me:7223: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7225: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7226: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7228: \$? = $ac_status" >&5
    +  echo "$as_me:7229: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -7242,7 +7243,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}:7245: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:7246: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -7261,7 +7262,7 @@ fi
     
     }
     
    -echo "$as_me:7264: checking for $cf_ncuhdr_root header in include-path" >&5
    +echo "$as_me:7265: checking for $cf_ncuhdr_root header in include-path" >&5
     echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
     if test "${cf_cv_ncurses_h+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7273,7 +7274,7 @@ else
     	do
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 7276 "configure"
    +#line 7277 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -7297,16 +7298,16 @@ printf("old\n");
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7300: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7301: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7303: \$? = $ac_status" >&5
    +  echo "$as_me:7304: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7306: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7309: \$? = $ac_status" >&5
    +  echo "$as_me:7310: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_h=$cf_header
     
    @@ -7321,14 +7322,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     	done
     
     fi
    -echo "$as_me:7324: result: $cf_cv_ncurses_h" >&5
    +echo "$as_me:7325: result: $cf_cv_ncurses_h" >&5
     echo "${ECHO_T}$cf_cv_ncurses_h" >&6
     
     if test "$cf_cv_ncurses_h" != no ; then
     	cf_cv_ncurses_header=$cf_cv_ncurses_h
     else
     
    -echo "$as_me:7331: checking for $cf_ncuhdr_root include-path" >&5
    +echo "$as_me:7332: checking for $cf_ncuhdr_root include-path" >&5
     echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
     if test "${cf_cv_ncurses_h2+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7446,7 +7447,7 @@ if test -n "$cf_incdir" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 7449 "configure"
    +#line 7450 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -7458,16 +7459,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7461: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7462: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7464: \$? = $ac_status" >&5
    +  echo "$as_me:7465: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7467: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7468: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7470: \$? = $ac_status" >&5
    +  echo "$as_me:7471: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -7484,7 +7485,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}:7487: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:7488: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -7507,7 +7508,7 @@ fi
     		do
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 7510 "configure"
    +#line 7511 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -7531,16 +7532,16 @@ printf("old\n");
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7535: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7537: \$? = $ac_status" >&5
    +  echo "$as_me:7538: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7540: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7541: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7543: \$? = $ac_status" >&5
    +  echo "$as_me:7544: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_h2=$cf_header
     
    @@ -7561,12 +7562,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     		CPPFLAGS="$cf_save2_CPPFLAGS"
     		test "$cf_cv_ncurses_h2" != no && break
     	done
    -	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7564: error: not found" >&5
    +	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7565: error: not found" >&5
     echo "$as_me: error: not found" >&2;}
        { (exit 1); exit 1; }; }
     
     fi
    -echo "$as_me:7569: result: $cf_cv_ncurses_h2" >&5
    +echo "$as_me:7570: result: $cf_cv_ncurses_h2" >&5
     echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
     
     	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
    @@ -7599,7 +7600,7 @@ if test -n "$cf_1st_incdir" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 7602 "configure"
    +#line 7603 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -7611,16 +7612,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7614: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7617: \$? = $ac_status" >&5
    +  echo "$as_me:7618: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7620: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7623: \$? = $ac_status" >&5
    +  echo "$as_me:7624: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -7637,7 +7638,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}:7640: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -7685,7 +7686,7 @@ EOF
     	;;
     esac
     
    -echo "$as_me:7688: checking for terminfo header" >&5
    +echo "$as_me:7689: checking for terminfo header" >&5
     echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7703,7 +7704,7 @@ esac
     for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 7706 "configure"
    +#line 7707 "configure"
     #include "confdefs.h"
     #include 
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -7718,16 +7719,16 @@ int x = auto_left_margin
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:7721: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:7722: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:7724: \$? = $ac_status" >&5
    +  echo "$as_me:7725: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:7727: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7728: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7730: \$? = $ac_status" >&5
    +  echo "$as_me:7731: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_term_header="$cf_test"
    @@ -7743,7 +7744,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:7746: result: $cf_cv_term_header" >&5
    +echo "$as_me:7747: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     # Set definitions to allow ifdef'ing to accommodate subdirectories
    @@ -7781,7 +7782,7 @@ cat >>confdefs.h <<\EOF
     #define NCURSES 1
     EOF
     
    -echo "$as_me:7784: checking for ncurses version" >&5
    +echo "$as_me:7785: checking for ncurses version" >&5
     echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
     if test "${cf_cv_ncurses_version+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7807,10 +7808,10 @@ Autoconf "old"
     #endif
     EOF
     	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
    -	{ (eval echo "$as_me:7810: \"$cf_try\"") >&5
    +	{ (eval echo "$as_me:7811: \"$cf_try\"") >&5
       (eval $cf_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7813: \$? = $ac_status" >&5
    +  echo "$as_me:7814: \$? = $ac_status" >&5
       (exit $ac_status); }
     	if test -f conftest.out ; then
     		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
    @@ -7820,7 +7821,7 @@ EOF
     
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 7823 "configure"
    +#line 7824 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -7845,15 +7846,15 @@ int main(void)
     }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:7848: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:7849: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:7851: \$? = $ac_status" >&5
    +  echo "$as_me:7852: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:7853: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7854: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7856: \$? = $ac_status" >&5
    +  echo "$as_me:7857: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_ncurses_version=`cat $cf_tempfile`
    @@ -7867,7 +7868,7 @@ fi
     	rm -f $cf_tempfile
     
     fi
    -echo "$as_me:7870: result: $cf_cv_ncurses_version" >&5
    +echo "$as_me:7871: result: $cf_cv_ncurses_version" >&5
     echo "${ECHO_T}$cf_cv_ncurses_version" >&6
     test "$cf_cv_ncurses_version" = no ||
     cat >>confdefs.h <<\EOF
    @@ -7880,7 +7881,7 @@ cf_nculib_root=$cf_cv_screen
     	# to link gpm.
     cf_ncurses_LIBS=""
     cf_ncurses_SAVE="$LIBS"
    -echo "$as_me:7883: checking for Gpm_Open in -lgpm" >&5
    +echo "$as_me:7884: checking for Gpm_Open in -lgpm" >&5
     echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
     if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7888,7 +7889,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lgpm  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 7891 "configure"
    +#line 7892 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -7907,16 +7908,16 @@ Gpm_Open ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:7910: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:7911: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:7913: \$? = $ac_status" >&5
    +  echo "$as_me:7914: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7917: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7919: \$? = $ac_status" >&5
    +  echo "$as_me:7920: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_gpm_Gpm_Open=yes
     else
    @@ -7927,10 +7928,10 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:7930: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    +echo "$as_me:7931: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
     if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    -  echo "$as_me:7933: checking for initscr in -lgpm" >&5
    +  echo "$as_me:7934: checking for initscr in -lgpm" >&5
     echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
     if test "${ac_cv_lib_gpm_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -7938,7 +7939,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lgpm  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 7941 "configure"
    +#line 7942 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -7957,16 +7958,16 @@ initscr ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:7961: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:7963: \$? = $ac_status" >&5
    +  echo "$as_me:7964: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:7967: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:7969: \$? = $ac_status" >&5
    +  echo "$as_me:7970: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_gpm_initscr=yes
     else
    @@ -7977,7 +7978,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:7980: result: $ac_cv_lib_gpm_initscr" >&5
    +echo "$as_me:7981: result: $ac_cv_lib_gpm_initscr" >&5
     echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
     if test $ac_cv_lib_gpm_initscr = yes; then
       LIBS="$cf_ncurses_SAVE"
    @@ -7992,7 +7993,7 @@ case $host_os in
     	# This is only necessary if you are linking against an obsolete
     	# version of ncurses (but it should do no harm, since it's static).
     	if test "$cf_nculib_root" = ncurses ; then
    -		echo "$as_me:7995: checking for tgoto in -lmytinfo" >&5
    +		echo "$as_me:7996: checking for tgoto in -lmytinfo" >&5
     echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
     if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8000,7 +8001,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lmytinfo  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 8003 "configure"
    +#line 8004 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -8019,16 +8020,16 @@ tgoto ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8022: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8023: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8025: \$? = $ac_status" >&5
    +  echo "$as_me:8026: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8028: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8029: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8031: \$? = $ac_status" >&5
    +  echo "$as_me:8032: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_mytinfo_tgoto=yes
     else
    @@ -8039,7 +8040,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:8042: result: $ac_cv_lib_mytinfo_tgoto" >&5
    +echo "$as_me:8043: result: $ac_cv_lib_mytinfo_tgoto" >&5
     echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
     if test $ac_cv_lib_mytinfo_tgoto = yes; then
       cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
    @@ -8088,13 +8089,13 @@ else
     
     	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
     	cf_libdir=""
    -	echo "$as_me:8091: checking for initscr" >&5
    +	echo "$as_me:8092: checking for initscr" >&5
     echo $ECHO_N "checking for initscr... $ECHO_C" >&6
     if test "${ac_cv_func_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 8097 "configure"
    +#line 8098 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char initscr (); below.  */
    @@ -8125,16 +8126,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8128: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8129: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8131: \$? = $ac_status" >&5
    +  echo "$as_me:8132: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8137: \$? = $ac_status" >&5
    +  echo "$as_me:8138: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_initscr=yes
     else
    @@ -8144,18 +8145,18 @@ ac_cv_func_initscr=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:8147: result: $ac_cv_func_initscr" >&5
    +echo "$as_me:8148: result: $ac_cv_func_initscr" >&5
     echo "${ECHO_T}$ac_cv_func_initscr" >&6
     if test $ac_cv_func_initscr = yes; then
       eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     else
     
     		cf_save_LIBS="$LIBS"
    -		echo "$as_me:8154: checking for initscr in -l$cf_nculib_root" >&5
    +		echo "$as_me:8155: checking for initscr in -l$cf_nculib_root" >&5
     echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
     		LIBS="-l$cf_nculib_root $LIBS"
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 8158 "configure"
    +#line 8159 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -8167,25 +8168,25 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8171: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8173: \$? = $ac_status" >&5
    +  echo "$as_me:8174: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8177: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8179: \$? = $ac_status" >&5
    +  echo "$as_me:8180: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:8181: result: yes" >&5
    +  echo "$as_me:8182: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:8188: result: no" >&5
    +echo "$as_me:8189: result: no" >&5
     echo "${ECHO_T}no" >&6
     
     cf_search=
    @@ -8253,11 +8254,11 @@ cf_search="$cf_library_path_list $cf_search"
     
     			for cf_libdir in $cf_search
     			do
    -				echo "$as_me:8256: checking for -l$cf_nculib_root in $cf_libdir" >&5
    +				echo "$as_me:8257: checking for -l$cf_nculib_root in $cf_libdir" >&5
     echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
     				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
     				cat >conftest.$ac_ext <<_ACEOF
    -#line 8260 "configure"
    +#line 8261 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -8269,25 +8270,25 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8272: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8273: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8275: \$? = $ac_status" >&5
    +  echo "$as_me:8276: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8278: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8279: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8281: \$? = $ac_status" >&5
    +  echo "$as_me:8282: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:8283: result: yes" >&5
    +  echo "$as_me:8284: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     					 break
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:8290: result: no" >&5
    +echo "$as_me:8291: result: no" >&5
     echo "${ECHO_T}no" >&6
     					 LIBS="$cf_save_LIBS"
     fi
    @@ -8302,7 +8303,7 @@ fi
     eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
     
     if test $cf_found_library = no ; then
    -	{ { echo "$as_me:8305: error: Cannot link $cf_nculib_root library" >&5
    +	{ { echo "$as_me:8306: error: Cannot link $cf_nculib_root library" >&5
     echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -8310,7 +8311,7 @@ fi
     fi
     
     if test -n "$cf_ncurses_LIBS" ; then
    -	echo "$as_me:8313: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
    +	echo "$as_me:8314: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
     echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
     	cf_ncurses_SAVE="$LIBS"
     	for p in $cf_ncurses_LIBS ; do
    @@ -8320,7 +8321,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
     		fi
     	done
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 8323 "configure"
    +#line 8324 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -8332,23 +8333,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8335: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8336: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8338: \$? = $ac_status" >&5
    +  echo "$as_me:8339: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8341: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8342: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8344: \$? = $ac_status" >&5
    +  echo "$as_me:8345: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:8346: result: yes" >&5
    +  echo "$as_me:8347: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:8351: result: no" >&5
    +echo "$as_me:8352: result: no" >&5
     echo "${ECHO_T}no" >&6
     		 LIBS="$cf_ncurses_SAVE"
     fi
    @@ -8373,13 +8374,13 @@ cf_ncuconfig_root=$cf_cv_screen
     cf_have_ncuconfig=no
     
     if test "x${PKG_CONFIG:=none}" != xnone; then
    -	echo "$as_me:8376: checking pkg-config for $cf_ncuconfig_root" >&5
    +	echo "$as_me:8377: checking pkg-config for $cf_ncuconfig_root" >&5
     echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
     	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
    -		echo "$as_me:8379: result: yes" >&5
    +		echo "$as_me:8380: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     
    -		echo "$as_me:8382: checking if the $cf_ncuconfig_root package files work" >&5
    +		echo "$as_me:8383: checking if the $cf_ncuconfig_root package files work" >&5
     echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
     		cf_have_ncuconfig=unknown
     
    @@ -8405,7 +8406,7 @@ done
     LIBS="$cf_add_libs"
     
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 8408 "configure"
    +#line 8409 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -8417,37 +8418,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:8420: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8421: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8423: \$? = $ac_status" >&5
    +  echo "$as_me:8424: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:8426: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8427: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8429: \$? = $ac_status" >&5
    +  echo "$as_me:8430: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       if test "$cross_compiling" = yes; then
       cf_have_ncuconfig=maybe
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 8435 "configure"
    +#line 8436 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     				int main(void)
     				{ char *xx = curses_version(); return (xx == 0); }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:8442: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:8443: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:8445: \$? = $ac_status" >&5
    +  echo "$as_me:8446: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8448: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8450: \$? = $ac_status" >&5
    +  echo "$as_me:8451: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_have_ncuconfig=yes
     else
    @@ -8464,7 +8465,7 @@ cat conftest.$ac_ext >&5
     cf_have_ncuconfig=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -		echo "$as_me:8467: result: $cf_have_ncuconfig" >&5
    +		echo "$as_me:8468: result: $cf_have_ncuconfig" >&5
     echo "${ECHO_T}$cf_have_ncuconfig" >&6
     		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
     		if test "$cf_have_ncuconfig" != "yes"
    @@ -8481,7 +8482,7 @@ EOF
     			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
     		fi
     
    -echo "$as_me:8484: checking for terminfo header" >&5
    +echo "$as_me:8485: checking for terminfo header" >&5
     echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8499,7 +8500,7 @@ esac
     for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 8502 "configure"
    +#line 8503 "configure"
     #include "confdefs.h"
     #include 
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -8514,16 +8515,16 @@ int x = auto_left_margin
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:8517: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:8520: \$? = $ac_status" >&5
    +  echo "$as_me:8521: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:8523: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8524: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8526: \$? = $ac_status" >&5
    +  echo "$as_me:8527: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_term_header="$cf_test"
    @@ -8539,7 +8540,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:8542: result: $cf_cv_term_header" >&5
    +echo "$as_me:8543: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     # Set definitions to allow ifdef'ing to accommodate subdirectories
    @@ -8572,7 +8573,7 @@ EOF
     esac
     
     	else
    -		echo "$as_me:8575: result: no" >&5
    +		echo "$as_me:8576: result: no" >&5
     echo "${ECHO_T}no" >&6
     		NCURSES_CONFIG_PKG=none
     	fi
    @@ -8588,7 +8589,7 @@ if test -n "$ac_tool_prefix"; then
       do
         # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    -echo "$as_me:8591: checking for $ac_word" >&5
    +echo "$as_me:8592: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8603,7 +8604,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
    -echo "$as_me:8606: found $ac_dir/$ac_word" >&5
    +echo "$as_me:8607: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -8611,10 +8612,10 @@ fi
     fi
     NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
     if test -n "$NCURSES_CONFIG"; then
    -  echo "$as_me:8614: result: $NCURSES_CONFIG" >&5
    +  echo "$as_me:8615: result: $NCURSES_CONFIG" >&5
     echo "${ECHO_T}$NCURSES_CONFIG" >&6
     else
    -  echo "$as_me:8617: result: no" >&5
    +  echo "$as_me:8618: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -8627,7 +8628,7 @@ if test -z "$NCURSES_CONFIG"; then
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:8630: checking for $ac_word" >&5
    +echo "$as_me:8631: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8642,7 +8643,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
    -echo "$as_me:8645: found $ac_dir/$ac_word" >&5
    +echo "$as_me:8646: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -8650,10 +8651,10 @@ fi
     fi
     ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
     if test -n "$ac_ct_NCURSES_CONFIG"; then
    -  echo "$as_me:8653: result: $ac_ct_NCURSES_CONFIG" >&5
    +  echo "$as_me:8654: result: $ac_ct_NCURSES_CONFIG" >&5
     echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
     else
    -  echo "$as_me:8656: result: no" >&5
    +  echo "$as_me:8657: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -8686,7 +8687,7 @@ LIBS="$cf_add_libs"
     
     		# even with config script, some packages use no-override for curses.h
     
    -echo "$as_me:8689: checking if we have identified curses headers" >&5
    +echo "$as_me:8690: checking if we have identified curses headers" >&5
     echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
     if test "${cf_cv_ncurses_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8698,7 +8699,7 @@ for cf_header in \
     	curses.h $cf_cv_screen/curses.h
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 8701 "configure"
    +#line 8702 "configure"
     #include "confdefs.h"
     #include <${cf_header}>
     int
    @@ -8710,16 +8711,16 @@ initscr(); tgoto("?", 0,0)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:8713: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:8714: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:8716: \$? = $ac_status" >&5
    +  echo "$as_me:8717: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:8719: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8722: \$? = $ac_status" >&5
    +  echo "$as_me:8723: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_header=$cf_header; break
     else
    @@ -8730,11 +8731,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:8733: result: $cf_cv_ncurses_header" >&5
    +echo "$as_me:8734: result: $cf_cv_ncurses_header" >&5
     echo "${ECHO_T}$cf_cv_ncurses_header" >&6
     
     if test "$cf_cv_ncurses_header" = none ; then
    -	{ { echo "$as_me:8737: error: No curses header-files found" >&5
    +	{ { echo "$as_me:8738: error: No curses header-files found" >&5
     echo "$as_me: error: No curses header-files found" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -8744,23 +8745,23 @@ fi
     for ac_header in $cf_cv_ncurses_header
     do
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    -echo "$as_me:8747: checking for $ac_header" >&5
    +echo "$as_me:8748: 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 8753 "configure"
    +#line 8754 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:8757: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:8758: \"$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:8763: \$? = $ac_status" >&5
    +  echo "$as_me:8764: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -8779,7 +8780,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:8782: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:8783: result: `eval echo '${'$as_ac_Header'}'`" >&5
     echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
     if test `eval echo '${'$as_ac_Header'}'` = yes; then
       cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
    -#line 8835 "configure"
    +#line 8836 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -8844,16 +8845,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:8848: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:8850: \$? = $ac_status" >&5
    +  echo "$as_me:8851: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8854: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8856: \$? = $ac_status" >&5
    +  echo "$as_me:8857: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -8870,7 +8871,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}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:8874: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -8889,7 +8890,7 @@ fi
     
     }
     
    -echo "$as_me:8892: checking for $cf_ncuhdr_root header in include-path" >&5
    +echo "$as_me:8893: checking for $cf_ncuhdr_root header in include-path" >&5
     echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
     if test "${cf_cv_ncurses_h+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -8901,7 +8902,7 @@ else
     	do
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 8904 "configure"
    +#line 8905 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -8925,16 +8926,16 @@ printf("old\n");
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:8928: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:8929: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:8931: \$? = $ac_status" >&5
    +  echo "$as_me:8932: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:8934: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:8935: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:8937: \$? = $ac_status" >&5
    +  echo "$as_me:8938: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_h=$cf_header
     
    @@ -8949,14 +8950,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     	done
     
     fi
    -echo "$as_me:8952: result: $cf_cv_ncurses_h" >&5
    +echo "$as_me:8953: result: $cf_cv_ncurses_h" >&5
     echo "${ECHO_T}$cf_cv_ncurses_h" >&6
     
     if test "$cf_cv_ncurses_h" != no ; then
     	cf_cv_ncurses_header=$cf_cv_ncurses_h
     else
     
    -echo "$as_me:8959: checking for $cf_ncuhdr_root include-path" >&5
    +echo "$as_me:8960: checking for $cf_ncuhdr_root include-path" >&5
     echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
     if test "${cf_cv_ncurses_h2+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9074,7 +9075,7 @@ if test -n "$cf_incdir" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 9077 "configure"
    +#line 9078 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -9086,16 +9087,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:9090: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:9092: \$? = $ac_status" >&5
    +  echo "$as_me:9093: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9096: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9098: \$? = $ac_status" >&5
    +  echo "$as_me:9099: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -9112,7 +9113,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}:9115: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:9116: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -9135,7 +9136,7 @@ fi
     		do
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 9138 "configure"
    +#line 9139 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -9159,16 +9160,16 @@ printf("old\n");
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:9162: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:9163: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:9165: \$? = $ac_status" >&5
    +  echo "$as_me:9166: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:9168: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9171: \$? = $ac_status" >&5
    +  echo "$as_me:9172: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_h2=$cf_header
     
    @@ -9189,12 +9190,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     		CPPFLAGS="$cf_save2_CPPFLAGS"
     		test "$cf_cv_ncurses_h2" != no && break
     	done
    -	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9192: error: not found" >&5
    +	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9193: error: not found" >&5
     echo "$as_me: error: not found" >&2;}
        { (exit 1); exit 1; }; }
     
     fi
    -echo "$as_me:9197: result: $cf_cv_ncurses_h2" >&5
    +echo "$as_me:9198: result: $cf_cv_ncurses_h2" >&5
     echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
     
     	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
    @@ -9227,7 +9228,7 @@ if test -n "$cf_1st_incdir" ; then
     			  cf_save_CPPFLAGS=$CPPFLAGS
     			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     			  cat >conftest.$ac_ext <<_ACEOF
    -#line 9230 "configure"
    +#line 9231 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -9239,16 +9240,16 @@ printf("Hello")
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:9242: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:9243: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:9245: \$? = $ac_status" >&5
    +  echo "$as_me:9246: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:9248: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9249: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9251: \$? = $ac_status" >&5
    +  echo "$as_me:9252: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -9265,7 +9266,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}:9268: testing adding $cf_add_incdir to include-path ..." 1>&5
    +echo "${as_me:-configure}:9269: testing adding $cf_add_incdir to include-path ..." 1>&5
     
     		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
     
    @@ -9313,7 +9314,7 @@ EOF
     	;;
     esac
     
    -echo "$as_me:9316: checking for terminfo header" >&5
    +echo "$as_me:9317: checking for terminfo header" >&5
     echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9331,7 +9332,7 @@ esac
     for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 9334 "configure"
    +#line 9335 "configure"
     #include "confdefs.h"
     #include 
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -9346,16 +9347,16 @@ int x = auto_left_margin
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:9349: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:9350: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:9352: \$? = $ac_status" >&5
    +  echo "$as_me:9353: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:9355: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9356: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9358: \$? = $ac_status" >&5
    +  echo "$as_me:9359: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_term_header="$cf_test"
    @@ -9371,7 +9372,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:9374: result: $cf_cv_term_header" >&5
    +echo "$as_me:9375: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     # Set definitions to allow ifdef'ing to accommodate subdirectories
    @@ -9409,7 +9410,7 @@ cat >>confdefs.h <<\EOF
     #define NCURSES 1
     EOF
     
    -echo "$as_me:9412: checking for ncurses version" >&5
    +echo "$as_me:9413: checking for ncurses version" >&5
     echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
     if test "${cf_cv_ncurses_version+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9435,10 +9436,10 @@ Autoconf "old"
     #endif
     EOF
     	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
    -	{ (eval echo "$as_me:9438: \"$cf_try\"") >&5
    +	{ (eval echo "$as_me:9439: \"$cf_try\"") >&5
       (eval $cf_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9441: \$? = $ac_status" >&5
    +  echo "$as_me:9442: \$? = $ac_status" >&5
       (exit $ac_status); }
     	if test -f conftest.out ; then
     		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
    @@ -9448,7 +9449,7 @@ EOF
     
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 9451 "configure"
    +#line 9452 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -9473,15 +9474,15 @@ int main(void)
     }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:9476: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9477: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9479: \$? = $ac_status" >&5
    +  echo "$as_me:9480: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:9481: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9482: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9484: \$? = $ac_status" >&5
    +  echo "$as_me:9485: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     	cf_cv_ncurses_version=`cat $cf_tempfile`
    @@ -9495,7 +9496,7 @@ fi
     	rm -f $cf_tempfile
     
     fi
    -echo "$as_me:9498: result: $cf_cv_ncurses_version" >&5
    +echo "$as_me:9499: result: $cf_cv_ncurses_version" >&5
     echo "${ECHO_T}$cf_cv_ncurses_version" >&6
     test "$cf_cv_ncurses_version" = no ||
     cat >>confdefs.h <<\EOF
    @@ -9508,7 +9509,7 @@ cf_nculib_root=$cf_cv_screen
     	# to link gpm.
     cf_ncurses_LIBS=""
     cf_ncurses_SAVE="$LIBS"
    -echo "$as_me:9511: checking for Gpm_Open in -lgpm" >&5
    +echo "$as_me:9512: checking for Gpm_Open in -lgpm" >&5
     echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
     if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9516,7 +9517,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lgpm  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 9519 "configure"
    +#line 9520 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -9535,16 +9536,16 @@ Gpm_Open ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9538: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9539: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9541: \$? = $ac_status" >&5
    +  echo "$as_me:9542: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9544: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9545: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9547: \$? = $ac_status" >&5
    +  echo "$as_me:9548: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_gpm_Gpm_Open=yes
     else
    @@ -9555,10 +9556,10 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:9558: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    +echo "$as_me:9559: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
     if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    -  echo "$as_me:9561: checking for initscr in -lgpm" >&5
    +  echo "$as_me:9562: checking for initscr in -lgpm" >&5
     echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
     if test "${ac_cv_lib_gpm_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9566,7 +9567,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lgpm  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 9569 "configure"
    +#line 9570 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -9585,16 +9586,16 @@ initscr ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9589: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9591: \$? = $ac_status" >&5
    +  echo "$as_me:9592: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9594: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9595: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9597: \$? = $ac_status" >&5
    +  echo "$as_me:9598: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_gpm_initscr=yes
     else
    @@ -9605,7 +9606,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:9608: result: $ac_cv_lib_gpm_initscr" >&5
    +echo "$as_me:9609: result: $ac_cv_lib_gpm_initscr" >&5
     echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
     if test $ac_cv_lib_gpm_initscr = yes; then
       LIBS="$cf_ncurses_SAVE"
    @@ -9620,7 +9621,7 @@ case $host_os in
     	# This is only necessary if you are linking against an obsolete
     	# version of ncurses (but it should do no harm, since it's static).
     	if test "$cf_nculib_root" = ncurses ; then
    -		echo "$as_me:9623: checking for tgoto in -lmytinfo" >&5
    +		echo "$as_me:9624: checking for tgoto in -lmytinfo" >&5
     echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
     if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -9628,7 +9629,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lmytinfo  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 9631 "configure"
    +#line 9632 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -9647,16 +9648,16 @@ tgoto ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9650: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9651: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9653: \$? = $ac_status" >&5
    +  echo "$as_me:9654: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9656: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9657: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9659: \$? = $ac_status" >&5
    +  echo "$as_me:9660: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_mytinfo_tgoto=yes
     else
    @@ -9667,7 +9668,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:9670: result: $ac_cv_lib_mytinfo_tgoto" >&5
    +echo "$as_me:9671: result: $ac_cv_lib_mytinfo_tgoto" >&5
     echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
     if test $ac_cv_lib_mytinfo_tgoto = yes; then
       cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
    @@ -9716,13 +9717,13 @@ else
     
     	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
     	cf_libdir=""
    -	echo "$as_me:9719: checking for initscr" >&5
    +	echo "$as_me:9720: checking for initscr" >&5
     echo $ECHO_N "checking for initscr... $ECHO_C" >&6
     if test "${ac_cv_func_initscr+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 9725 "configure"
    +#line 9726 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char initscr (); below.  */
    @@ -9753,16 +9754,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9756: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9757: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9759: \$? = $ac_status" >&5
    +  echo "$as_me:9760: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9762: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9763: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9765: \$? = $ac_status" >&5
    +  echo "$as_me:9766: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_initscr=yes
     else
    @@ -9772,18 +9773,18 @@ ac_cv_func_initscr=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:9775: result: $ac_cv_func_initscr" >&5
    +echo "$as_me:9776: result: $ac_cv_func_initscr" >&5
     echo "${ECHO_T}$ac_cv_func_initscr" >&6
     if test $ac_cv_func_initscr = yes; then
       eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     else
     
     		cf_save_LIBS="$LIBS"
    -		echo "$as_me:9782: checking for initscr in -l$cf_nculib_root" >&5
    +		echo "$as_me:9783: checking for initscr in -l$cf_nculib_root" >&5
     echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
     		LIBS="-l$cf_nculib_root $LIBS"
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 9786 "configure"
    +#line 9787 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -9795,25 +9796,25 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9798: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9799: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9801: \$? = $ac_status" >&5
    +  echo "$as_me:9802: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9804: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9805: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9807: \$? = $ac_status" >&5
    +  echo "$as_me:9808: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:9809: result: yes" >&5
    +  echo "$as_me:9810: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:9816: result: no" >&5
    +echo "$as_me:9817: result: no" >&5
     echo "${ECHO_T}no" >&6
     
     cf_search=
    @@ -9881,11 +9882,11 @@ cf_search="$cf_library_path_list $cf_search"
     
     			for cf_libdir in $cf_search
     			do
    -				echo "$as_me:9884: checking for -l$cf_nculib_root in $cf_libdir" >&5
    +				echo "$as_me:9885: checking for -l$cf_nculib_root in $cf_libdir" >&5
     echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
     				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
     				cat >conftest.$ac_ext <<_ACEOF
    -#line 9888 "configure"
    +#line 9889 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -9897,25 +9898,25 @@ initscr()
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9900: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9901: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9903: \$? = $ac_status" >&5
    +  echo "$as_me:9904: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9906: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9907: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9909: \$? = $ac_status" >&5
    +  echo "$as_me:9910: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:9911: result: yes" >&5
    +  echo "$as_me:9912: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     					 break
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:9918: result: no" >&5
    +echo "$as_me:9919: result: no" >&5
     echo "${ECHO_T}no" >&6
     					 LIBS="$cf_save_LIBS"
     fi
    @@ -9930,7 +9931,7 @@ fi
     eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
     
     if test $cf_found_library = no ; then
    -	{ { echo "$as_me:9933: error: Cannot link $cf_nculib_root library" >&5
    +	{ { echo "$as_me:9934: error: Cannot link $cf_nculib_root library" >&5
     echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -9938,7 +9939,7 @@ fi
     fi
     
     if test -n "$cf_ncurses_LIBS" ; then
    -	echo "$as_me:9941: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
    +	echo "$as_me:9942: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
     echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
     	cf_ncurses_SAVE="$LIBS"
     	for p in $cf_ncurses_LIBS ; do
    @@ -9948,7 +9949,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
     		fi
     	done
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 9951 "configure"
    +#line 9952 "configure"
     #include "confdefs.h"
     #include <${cf_cv_ncurses_header:-curses.h}>
     int
    @@ -9960,23 +9961,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:9963: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:9964: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:9966: \$? = $ac_status" >&5
    +  echo "$as_me:9967: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:9969: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:9970: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:9972: \$? = $ac_status" >&5
    +  echo "$as_me:9973: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
    -  echo "$as_me:9974: result: yes" >&5
    +  echo "$as_me:9975: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:9979: result: no" >&5
    +echo "$as_me:9980: result: no" >&5
     echo "${ECHO_T}no" >&6
     		 LIBS="$cf_ncurses_SAVE"
     fi
    @@ -9996,7 +9997,7 @@ fi
     
     	;;
     (pdcurses)
    -	echo "$as_me:9999: checking for X" >&5
    +	echo "$as_me:10000: checking for X" >&5
     echo $ECHO_N "checking for X... $ECHO_C" >&6
     
     # Check whether --with-x or --without-x was given.
    @@ -10093,17 +10094,17 @@ if test "$ac_x_includes" = no; then
       # Guess where to find include files, by looking for Intrinsic.h.
       # First, try using that file with no special directory specified.
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10096 "configure"
    +#line 10097 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:10100: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:10101: \"$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:10106: \$? = $ac_status" >&5
    +  echo "$as_me:10107: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -10136,7 +10137,7 @@ if test "$ac_x_libraries" = no; then
       ac_save_LIBS=$LIBS
       LIBS="-lXt $LIBS"
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10139 "configure"
    +#line 10140 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -10148,16 +10149,16 @@ XtMalloc (0)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10151: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10152: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10154: \$? = $ac_status" >&5
    +  echo "$as_me:10155: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10157: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10158: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10160: \$? = $ac_status" >&5
    +  echo "$as_me:10161: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       LIBS=$ac_save_LIBS
     # We can link X programs with no special library path.
    @@ -10195,7 +10196,7 @@ fi
     fi # $with_x != no
     
     if test "$have_x" != yes; then
    -  echo "$as_me:10198: result: $have_x" >&5
    +  echo "$as_me:10199: result: $have_x" >&5
     echo "${ECHO_T}$have_x" >&6
       no_x=yes
     else
    @@ -10205,7 +10206,7 @@ else
       # Update the cache value to reflect the command line values.
       ac_cv_have_x="have_x=yes \
     		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
    -  echo "$as_me:10208: result: libraries $x_libraries, headers $x_includes" >&5
    +  echo "$as_me:10209: result: libraries $x_libraries, headers $x_includes" >&5
     echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
     fi
     
    @@ -10229,11 +10230,11 @@ else
         # others require no space.  Words are not sufficient . . . .
         case `(uname -sr) 2>/dev/null` in
         "SunOS 5"*)
    -      echo "$as_me:10232: checking whether -R must be followed by a space" >&5
    +      echo "$as_me:10233: checking whether -R must be followed by a space" >&5
     echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
           ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
           cat >conftest.$ac_ext <<_ACEOF
    -#line 10236 "configure"
    +#line 10237 "configure"
     #include "confdefs.h"
     
     int
    @@ -10245,16 +10246,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10248: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10249: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10251: \$? = $ac_status" >&5
    +  echo "$as_me:10252: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10255: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10257: \$? = $ac_status" >&5
    +  echo "$as_me:10258: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_R_nospace=yes
     else
    @@ -10264,13 +10265,13 @@ ac_R_nospace=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
           if test $ac_R_nospace = yes; then
    -	echo "$as_me:10267: result: no" >&5
    +	echo "$as_me:10268: result: no" >&5
     echo "${ECHO_T}no" >&6
     	X_LIBS="$X_LIBS -R$x_libraries"
           else
     	LIBS="$ac_xsave_LIBS -R $x_libraries"
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 10273 "configure"
    +#line 10274 "configure"
     #include "confdefs.h"
     
     int
    @@ -10282,16 +10283,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10285: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10286: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10288: \$? = $ac_status" >&5
    +  echo "$as_me:10289: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10292: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10294: \$? = $ac_status" >&5
    +  echo "$as_me:10295: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_R_space=yes
     else
    @@ -10301,11 +10302,11 @@ ac_R_space=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     	if test $ac_R_space = yes; then
    -	  echo "$as_me:10304: result: yes" >&5
    +	  echo "$as_me:10305: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     	  X_LIBS="$X_LIBS -R $x_libraries"
     	else
    -	  echo "$as_me:10308: result: neither works" >&5
    +	  echo "$as_me:10309: result: neither works" >&5
     echo "${ECHO_T}neither works" >&6
     	fi
           fi
    @@ -10325,7 +10326,7 @@ echo "${ECHO_T}neither works" >&6
         # the Alpha needs dnet_stub (dnet does not exist).
         ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
         cat >conftest.$ac_ext <<_ACEOF
    -#line 10328 "configure"
    +#line 10329 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10344,22 +10345,22 @@ XOpenDisplay ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10347: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10350: \$? = $ac_status" >&5
    +  echo "$as_me:10351: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10356: \$? = $ac_status" >&5
    +  echo "$as_me:10357: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
    -echo "$as_me:10362: checking for dnet_ntoa in -ldnet" >&5
    +echo "$as_me:10363: checking for dnet_ntoa in -ldnet" >&5
     echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
     if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10367,7 +10368,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-ldnet  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10370 "configure"
    +#line 10371 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10386,16 +10387,16 @@ dnet_ntoa ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10389: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10390: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10392: \$? = $ac_status" >&5
    +  echo "$as_me:10393: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10395: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10396: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10398: \$? = $ac_status" >&5
    +  echo "$as_me:10399: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_dnet_dnet_ntoa=yes
     else
    @@ -10406,14 +10407,14 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10409: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
    +echo "$as_me:10410: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
     echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
     if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
     fi
     
         if test $ac_cv_lib_dnet_dnet_ntoa = no; then
    -      echo "$as_me:10416: checking for dnet_ntoa in -ldnet_stub" >&5
    +      echo "$as_me:10417: checking for dnet_ntoa in -ldnet_stub" >&5
     echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
     if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10421,7 +10422,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-ldnet_stub  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10424 "configure"
    +#line 10425 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10440,16 +10441,16 @@ dnet_ntoa ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10444: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10446: \$? = $ac_status" >&5
    +  echo "$as_me:10447: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10450: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10452: \$? = $ac_status" >&5
    +  echo "$as_me:10453: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_dnet_stub_dnet_ntoa=yes
     else
    @@ -10460,7 +10461,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10463: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
    +echo "$as_me:10464: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
     echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
     if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
    @@ -10479,13 +10480,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         # on Irix 5.2, according to T.E. Dickey.
         # The functions gethostbyname, getservbyname, and inet_addr are
         # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
    -    echo "$as_me:10482: checking for gethostbyname" >&5
    +    echo "$as_me:10483: checking for gethostbyname" >&5
     echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
     if test "${ac_cv_func_gethostbyname+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10488 "configure"
    +#line 10489 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char gethostbyname (); below.  */
    @@ -10516,16 +10517,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10519: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10520: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10522: \$? = $ac_status" >&5
    +  echo "$as_me:10523: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10525: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10526: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10528: \$? = $ac_status" >&5
    +  echo "$as_me:10529: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_gethostbyname=yes
     else
    @@ -10535,11 +10536,11 @@ ac_cv_func_gethostbyname=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:10538: result: $ac_cv_func_gethostbyname" >&5
    +echo "$as_me:10539: result: $ac_cv_func_gethostbyname" >&5
     echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
     
         if test $ac_cv_func_gethostbyname = no; then
    -      echo "$as_me:10542: checking for gethostbyname in -lnsl" >&5
    +      echo "$as_me:10543: checking for gethostbyname in -lnsl" >&5
     echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
     if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10547,7 +10548,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lnsl  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10550 "configure"
    +#line 10551 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10566,16 +10567,16 @@ gethostbyname ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10570: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10572: \$? = $ac_status" >&5
    +  echo "$as_me:10573: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10575: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10576: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10578: \$? = $ac_status" >&5
    +  echo "$as_me:10579: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_nsl_gethostbyname=yes
     else
    @@ -10586,14 +10587,14 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10589: result: $ac_cv_lib_nsl_gethostbyname" >&5
    +echo "$as_me:10590: result: $ac_cv_lib_nsl_gethostbyname" >&5
     echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
     if test $ac_cv_lib_nsl_gethostbyname = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
     fi
     
           if test $ac_cv_lib_nsl_gethostbyname = no; then
    -        echo "$as_me:10596: checking for gethostbyname in -lbsd" >&5
    +        echo "$as_me:10597: checking for gethostbyname in -lbsd" >&5
     echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
     if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10601,7 +10602,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lbsd  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10604 "configure"
    +#line 10605 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10620,16 +10621,16 @@ gethostbyname ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10623: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10624: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10626: \$? = $ac_status" >&5
    +  echo "$as_me:10627: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10630: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10632: \$? = $ac_status" >&5
    +  echo "$as_me:10633: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_bsd_gethostbyname=yes
     else
    @@ -10640,7 +10641,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10643: result: $ac_cv_lib_bsd_gethostbyname" >&5
    +echo "$as_me:10644: result: $ac_cv_lib_bsd_gethostbyname" >&5
     echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
     if test $ac_cv_lib_bsd_gethostbyname = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
    @@ -10656,13 +10657,13 @@ fi
         # variants that don't use the nameserver (or something).  -lsocket
         # must be given before -lnsl if both are needed.  We assume that
         # if connect needs -lnsl, so does gethostbyname.
    -    echo "$as_me:10659: checking for connect" >&5
    +    echo "$as_me:10660: checking for connect" >&5
     echo $ECHO_N "checking for connect... $ECHO_C" >&6
     if test "${ac_cv_func_connect+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10665 "configure"
    +#line 10666 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char connect (); below.  */
    @@ -10693,16 +10694,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10696: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10697: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10699: \$? = $ac_status" >&5
    +  echo "$as_me:10700: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10705: \$? = $ac_status" >&5
    +  echo "$as_me:10706: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_connect=yes
     else
    @@ -10712,11 +10713,11 @@ ac_cv_func_connect=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:10715: result: $ac_cv_func_connect" >&5
    +echo "$as_me:10716: result: $ac_cv_func_connect" >&5
     echo "${ECHO_T}$ac_cv_func_connect" >&6
     
         if test $ac_cv_func_connect = no; then
    -      echo "$as_me:10719: checking for connect in -lsocket" >&5
    +      echo "$as_me:10720: checking for connect in -lsocket" >&5
     echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
     if test "${ac_cv_lib_socket_connect+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10724,7 +10725,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10727 "configure"
    +#line 10728 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10743,16 +10744,16 @@ connect ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10746: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10747: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10749: \$? = $ac_status" >&5
    +  echo "$as_me:10750: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10752: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10755: \$? = $ac_status" >&5
    +  echo "$as_me:10756: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_socket_connect=yes
     else
    @@ -10763,7 +10764,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10766: result: $ac_cv_lib_socket_connect" >&5
    +echo "$as_me:10767: result: $ac_cv_lib_socket_connect" >&5
     echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
     if test $ac_cv_lib_socket_connect = yes; then
       X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
    @@ -10772,13 +10773,13 @@ fi
         fi
     
         # Guillermo Gomez says -lposix is necessary on A/UX.
    -    echo "$as_me:10775: checking for remove" >&5
    +    echo "$as_me:10776: checking for remove" >&5
     echo $ECHO_N "checking for remove... $ECHO_C" >&6
     if test "${ac_cv_func_remove+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10781 "configure"
    +#line 10782 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char remove (); below.  */
    @@ -10809,16 +10810,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10812: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10813: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10815: \$? = $ac_status" >&5
    +  echo "$as_me:10816: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10818: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10821: \$? = $ac_status" >&5
    +  echo "$as_me:10822: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_remove=yes
     else
    @@ -10828,11 +10829,11 @@ ac_cv_func_remove=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:10831: result: $ac_cv_func_remove" >&5
    +echo "$as_me:10832: result: $ac_cv_func_remove" >&5
     echo "${ECHO_T}$ac_cv_func_remove" >&6
     
         if test $ac_cv_func_remove = no; then
    -      echo "$as_me:10835: checking for remove in -lposix" >&5
    +      echo "$as_me:10836: checking for remove in -lposix" >&5
     echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
     if test "${ac_cv_lib_posix_remove+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10840,7 +10841,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lposix  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10843 "configure"
    +#line 10844 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10859,16 +10860,16 @@ remove ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10862: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10863: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10865: \$? = $ac_status" >&5
    +  echo "$as_me:10866: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10868: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10871: \$? = $ac_status" >&5
    +  echo "$as_me:10872: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_posix_remove=yes
     else
    @@ -10879,7 +10880,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10882: result: $ac_cv_lib_posix_remove" >&5
    +echo "$as_me:10883: result: $ac_cv_lib_posix_remove" >&5
     echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
     if test $ac_cv_lib_posix_remove = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
    @@ -10888,13 +10889,13 @@ fi
         fi
     
         # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
    -    echo "$as_me:10891: checking for shmat" >&5
    +    echo "$as_me:10892: checking for shmat" >&5
     echo $ECHO_N "checking for shmat... $ECHO_C" >&6
     if test "${ac_cv_func_shmat+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 10897 "configure"
    +#line 10898 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char shmat (); below.  */
    @@ -10925,16 +10926,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10928: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10929: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10931: \$? = $ac_status" >&5
    +  echo "$as_me:10932: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10934: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10935: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10937: \$? = $ac_status" >&5
    +  echo "$as_me:10938: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_shmat=yes
     else
    @@ -10944,11 +10945,11 @@ ac_cv_func_shmat=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:10947: result: $ac_cv_func_shmat" >&5
    +echo "$as_me:10948: result: $ac_cv_func_shmat" >&5
     echo "${ECHO_T}$ac_cv_func_shmat" >&6
     
         if test $ac_cv_func_shmat = no; then
    -      echo "$as_me:10951: checking for shmat in -lipc" >&5
    +      echo "$as_me:10952: checking for shmat in -lipc" >&5
     echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
     if test "${ac_cv_lib_ipc_shmat+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -10956,7 +10957,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lipc  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 10959 "configure"
    +#line 10960 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -10975,16 +10976,16 @@ shmat ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:10978: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:10979: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:10981: \$? = $ac_status" >&5
    +  echo "$as_me:10982: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:10984: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:10985: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:10987: \$? = $ac_status" >&5
    +  echo "$as_me:10988: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_ipc_shmat=yes
     else
    @@ -10995,7 +10996,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:10998: result: $ac_cv_lib_ipc_shmat" >&5
    +echo "$as_me:10999: result: $ac_cv_lib_ipc_shmat" >&5
     echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
     if test $ac_cv_lib_ipc_shmat = yes; then
       X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
    @@ -11013,7 +11014,7 @@ fi
       # These have to be linked with before -lX11, unlike the other
       # libraries we check for below, so use a different variable.
       # John Interrante, Karl Berry
    -  echo "$as_me:11016: checking for IceConnectionNumber in -lICE" >&5
    +  echo "$as_me:11017: checking for IceConnectionNumber in -lICE" >&5
     echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
     if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -11021,7 +11022,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lICE $X_EXTRA_LIBS $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 11024 "configure"
    +#line 11025 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -11040,16 +11041,16 @@ IceConnectionNumber ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:11043: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:11044: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:11046: \$? = $ac_status" >&5
    +  echo "$as_me:11047: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:11049: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:11050: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:11052: \$? = $ac_status" >&5
    +  echo "$as_me:11053: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_ICE_IceConnectionNumber=yes
     else
    @@ -11060,7 +11061,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:11063: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
    +echo "$as_me:11064: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
     echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
     if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
       X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
    @@ -11072,7 +11073,7 @@ fi
     
     cf_x_athena=${cf_x_athena:-Xaw}
     
    -echo "$as_me:11075: checking if you want to link with Xaw 3d library" >&5
    +echo "$as_me:11076: checking if you want to link with Xaw 3d library" >&5
     echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
     withval=
     
    @@ -11083,14 +11084,14 @@ if test "${with_Xaw3d+set}" = set; then
     fi;
     if test "$withval" = yes ; then
     	cf_x_athena=Xaw3d
    -	echo "$as_me:11086: result: yes" >&5
    +	echo "$as_me:11087: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
    -	echo "$as_me:11089: result: no" >&5
    +	echo "$as_me:11090: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    -echo "$as_me:11093: checking if you want to link with Xaw 3d xft library" >&5
    +echo "$as_me:11094: checking if you want to link with Xaw 3d xft library" >&5
     echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
     withval=
     
    @@ -11101,14 +11102,14 @@ if test "${with_Xaw3dxft+set}" = set; then
     fi;
     if test "$withval" = yes ; then
     	cf_x_athena=Xaw3dxft
    -	echo "$as_me:11104: result: yes" >&5
    +	echo "$as_me:11105: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
    -	echo "$as_me:11107: result: no" >&5
    +	echo "$as_me:11108: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    -echo "$as_me:11111: checking if you want to link with neXT Athena library" >&5
    +echo "$as_me:11112: checking if you want to link with neXT Athena library" >&5
     echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
     withval=
     
    @@ -11119,14 +11120,14 @@ if test "${with_neXtaw+set}" = set; then
     fi;
     if test "$withval" = yes ; then
     	cf_x_athena=neXtaw
    -	echo "$as_me:11122: result: yes" >&5
    +	echo "$as_me:11123: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
    -	echo "$as_me:11125: result: no" >&5
    +	echo "$as_me:11126: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    -echo "$as_me:11129: checking if you want to link with Athena-Plus library" >&5
    +echo "$as_me:11130: checking if you want to link with Athena-Plus library" >&5
     echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
     withval=
     
    @@ -11137,10 +11138,10 @@ if test "${with_XawPlus+set}" = set; then
     fi;
     if test "$withval" = yes ; then
     	cf_x_athena=XawPlus
    -	echo "$as_me:11140: result: yes" >&5
    +	echo "$as_me:11141: result: yes" >&5
     echo "${ECHO_T}yes" >&6
     else
    -	echo "$as_me:11143: result: no" >&5
    +	echo "$as_me:11144: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -11160,17 +11161,17 @@ if test "$PKG_CONFIG" != none ; then
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
     	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
     
    -echo "${as_me:-configure}:11163: testing found package $cf_athena_pkg ..." 1>&5
    +echo "${as_me:-configure}:11164: testing found package $cf_athena_pkg ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
     	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:11169: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:11170: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:11173: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:11174: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -11301,20 +11302,20 @@ EOF
     			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
     			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11304: testing ..trimmed $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11305: testing ..trimmed $LIBS ..." 1>&5
     
     			;;
     		esac
     	done
     
    -echo "$as_me:11310: checking for usable $cf_x_athena/Xmu package" >&5
    +echo "$as_me:11311: checking for usable $cf_x_athena/Xmu package" >&5
     echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
     if test "${cf_cv_xaw_compat+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 11317 "configure"
    +#line 11318 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -11330,16 +11331,16 @@ int check = XmuCompareISOLatin1("big", "small")
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:11333: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:11334: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:11336: \$? = $ac_status" >&5
    +  echo "$as_me:11337: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:11339: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:11342: \$? = $ac_status" >&5
    +  echo "$as_me:11343: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xaw_compat=yes
     else
    @@ -11349,7 +11350,7 @@ cf_cv_xaw_compat=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:11352: result: $cf_cv_xaw_compat" >&5
    +echo "$as_me:11353: result: $cf_cv_xaw_compat" >&5
     echo "${ECHO_T}$cf_cv_xaw_compat" >&6
     
     			if test "$cf_cv_xaw_compat" = no
    @@ -11361,7 +11362,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
     				(*)
     					test -n "$verbose" && echo "	work around broken package" 1>&6
     
    -echo "${as_me:-configure}:11364: testing work around broken package ..." 1>&5
    +echo "${as_me:-configure}:11365: testing work around broken package ..." 1>&5
     
     					cf_save_xmu="$LIBS"
     					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
    @@ -11369,17 +11370,17 @@ echo "${as_me:-configure}:11364: testing work around broken package ..." 1>&5
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
     	test -n "$verbose" && echo "	found package xmu" 1>&6
     
    -echo "${as_me:-configure}:11372: testing found package xmu ..." 1>&5
    +echo "${as_me:-configure}:11373: testing found package xmu ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
     	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:11378: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:11379: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:11382: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:11383: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -11499,12 +11500,12 @@ LIBS="$cf_add_libs"
     
     test -n "$verbose" && echo "	...before $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11502: testing ...before $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11503: testing ...before $LIBS ..." 1>&5
     
     LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
     test -n "$verbose" && echo "	...after  $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11507: testing ...after  $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11508: testing ...after  $LIBS ..." 1>&5
     
     else
     	cf_pkgconfig_incs=
    @@ -11512,12 +11513,12 @@ else
     
     test -n "$verbose" && echo "	...before $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11515: testing ...before $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11516: testing ...before $LIBS ..." 1>&5
     
     LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
     test -n "$verbose" && echo "	...after  $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11520: testing ...after  $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11521: testing ...after  $LIBS ..." 1>&5
     
     fi
     
    @@ -11528,7 +11529,7 @@ fi
     			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
     			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
     
    -echo "${as_me:-configure}:11531: testing ..trimmed $LIBS ..." 1>&5
    +echo "${as_me:-configure}:11532: testing ..trimmed $LIBS ..." 1>&5
     
     			;;
     		esac
    @@ -11553,17 +11554,17 @@ if test -z "$cf_x_athena_lib" ; then
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
     	test -n "$verbose" && echo "	found package Xext" 1>&6
     
    -echo "${as_me:-configure}:11556: testing found package Xext ..." 1>&5
    +echo "${as_me:-configure}:11557: testing found package Xext ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
     	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:11562: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:11563: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:11566: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:11567: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -11684,7 +11685,7 @@ else
     	cf_pkgconfig_incs=
     	cf_pkgconfig_libs=
     
    -	echo "$as_me:11687: checking for XextCreateExtension in -lXext" >&5
    +	echo "$as_me:11688: checking for XextCreateExtension in -lXext" >&5
     echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
     if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -11692,7 +11693,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lXext  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 11695 "configure"
    +#line 11696 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -11711,16 +11712,16 @@ XextCreateExtension ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:11714: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:11715: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:11717: \$? = $ac_status" >&5
    +  echo "$as_me:11718: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:11720: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:11721: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:11723: \$? = $ac_status" >&5
    +  echo "$as_me:11724: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_Xext_XextCreateExtension=yes
     else
    @@ -11731,7 +11732,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:11734: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
    +echo "$as_me:11735: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
     echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
     if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
     
    @@ -11767,17 +11768,17 @@ then
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
     	test -n "$verbose" && echo "	found package x11" 1>&6
     
    -echo "${as_me:-configure}:11770: testing found package x11 ..." 1>&5
    +echo "${as_me:-configure}:11771: testing found package x11 ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
     	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:11776: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:11777: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:11780: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:11781: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -11897,24 +11898,24 @@ LIBS="$cf_add_libs"
     else
     	cf_pkgconfig_incs=
     	cf_pkgconfig_libs=
    -	{ echo "$as_me:11900: WARNING: unable to find X11 library" >&5
    +	{ echo "$as_me:11901: WARNING: unable to find X11 library" >&5
     echo "$as_me: WARNING: unable to find X11 library" >&2;}
     fi
     
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
     	test -n "$verbose" && echo "	found package ice" 1>&6
     
    -echo "${as_me:-configure}:11907: testing found package ice ..." 1>&5
    +echo "${as_me:-configure}:11908: testing found package ice ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
     	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:11913: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:11914: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:11917: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:11918: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12034,24 +12035,24 @@ LIBS="$cf_add_libs"
     else
     	cf_pkgconfig_incs=
     	cf_pkgconfig_libs=
    -	{ echo "$as_me:12037: WARNING: unable to find ICE library" >&5
    +	{ echo "$as_me:12038: WARNING: unable to find ICE library" >&5
     echo "$as_me: WARNING: unable to find ICE library" >&2;}
     fi
     
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
     	test -n "$verbose" && echo "	found package sm" 1>&6
     
    -echo "${as_me:-configure}:12044: testing found package sm ..." 1>&5
    +echo "${as_me:-configure}:12045: testing found package sm ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
     	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12050: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12051: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12054: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12055: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12171,24 +12172,24 @@ LIBS="$cf_add_libs"
     else
     	cf_pkgconfig_incs=
     	cf_pkgconfig_libs=
    -	{ echo "$as_me:12174: WARNING: unable to find SM library" >&5
    +	{ echo "$as_me:12175: WARNING: unable to find SM library" >&5
     echo "$as_me: WARNING: unable to find SM library" >&2;}
     fi
     
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
     	test -n "$verbose" && echo "	found package xt" 1>&6
     
    -echo "${as_me:-configure}:12181: testing found package xt ..." 1>&5
    +echo "${as_me:-configure}:12182: testing found package xt ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
     	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12187: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12188: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12191: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12192: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12308,7 +12309,7 @@ LIBS="$cf_add_libs"
     else
     	cf_pkgconfig_incs=
     	cf_pkgconfig_libs=
    -	{ echo "$as_me:12311: WARNING: unable to find Xt library" >&5
    +	{ echo "$as_me:12312: WARNING: unable to find Xt library" >&5
     echo "$as_me: WARNING: unable to find Xt library" >&2;}
     fi
     
    @@ -12319,17 +12320,17 @@ cf_have_X_LIBS=no
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
     	test -n "$verbose" && echo "	found package xt" 1>&6
     
    -echo "${as_me:-configure}:12322: testing found package xt ..." 1>&5
    +echo "${as_me:-configure}:12323: testing found package xt ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
     	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12328: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12329: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12332: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12333: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12450,14 +12451,14 @@ LIBS="$cf_add_libs"
     		;;
     	(*)
     # we have an "xt" package, but it may omit Xt's dependency on X11
    -echo "$as_me:12453: checking for usable X dependency" >&5
    +echo "$as_me:12454: checking for usable X dependency" >&5
     echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
     if test "${cf_cv_xt_x11_compat+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 12460 "configure"
    +#line 12461 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -12476,16 +12477,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:12479: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:12482: \$? = $ac_status" >&5
    +  echo "$as_me:12483: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:12485: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:12488: \$? = $ac_status" >&5
    +  echo "$as_me:12489: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xt_x11_compat=yes
     else
    @@ -12495,30 +12496,30 @@ cf_cv_xt_x11_compat=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:12498: result: $cf_cv_xt_x11_compat" >&5
    +echo "$as_me:12499: result: $cf_cv_xt_x11_compat" >&5
     echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
     		if test "$cf_cv_xt_x11_compat" = no
     		then
     			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
     
    -echo "${as_me:-configure}:12504: testing work around broken X11 dependency ..." 1>&5
    +echo "${as_me:-configure}:12505: testing work around broken X11 dependency ..." 1>&5
     
     			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
     
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
     	test -n "$verbose" && echo "	found package x11" 1>&6
     
    -echo "${as_me:-configure}:12511: testing found package x11 ..." 1>&5
    +echo "${as_me:-configure}:12512: testing found package x11 ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
     	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12517: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12518: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12521: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12522: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12641,12 +12642,12 @@ else
     
     test -n "$verbose" && echo "	...before $LIBS" 1>&6
     
    -echo "${as_me:-configure}:12644: testing ...before $LIBS ..." 1>&5
    +echo "${as_me:-configure}:12645: testing ...before $LIBS ..." 1>&5
     
     LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
     test -n "$verbose" && echo "	...after  $LIBS" 1>&6
     
    -echo "${as_me:-configure}:12649: testing ...after  $LIBS ..." 1>&5
    +echo "${as_me:-configure}:12650: testing ...after  $LIBS ..." 1>&5
     
     fi
     
    @@ -12654,14 +12655,14 @@ fi
     		;;
     	esac
     
    -echo "$as_me:12657: checking for usable X Toolkit package" >&5
    +echo "$as_me:12658: checking for usable X Toolkit package" >&5
     echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
     if test "${cf_cv_xt_ice_compat+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 12664 "configure"
    +#line 12665 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -12676,16 +12677,16 @@ int num = IceConnectionNumber(0)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:12679: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:12680: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:12682: \$? = $ac_status" >&5
    +  echo "$as_me:12683: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:12686: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:12688: \$? = $ac_status" >&5
    +  echo "$as_me:12689: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_xt_ice_compat=yes
     else
    @@ -12695,7 +12696,7 @@ cf_cv_xt_ice_compat=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:12698: result: $cf_cv_xt_ice_compat" >&5
    +echo "$as_me:12699: result: $cf_cv_xt_ice_compat" >&5
     echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
     
     	if test "$cf_cv_xt_ice_compat" = no
    @@ -12709,22 +12710,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
     			(*)
     				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
     
    -echo "${as_me:-configure}:12712: testing work around broken ICE dependency ..." 1>&5
    +echo "${as_me:-configure}:12713: testing work around broken ICE dependency ..." 1>&5
     
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
     	test -n "$verbose" && echo "	found package ice" 1>&6
     
    -echo "${as_me:-configure}:12717: testing found package ice ..." 1>&5
    +echo "${as_me:-configure}:12718: testing found package ice ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
     	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12723: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12724: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12727: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12728: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12843,17 +12844,17 @@ LIBS="$cf_add_libs"
     if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
     	test -n "$verbose" && echo "	found package sm" 1>&6
     
    -echo "${as_me:-configure}:12846: testing found package sm ..." 1>&5
    +echo "${as_me:-configure}:12847: testing found package sm ..." 1>&5
     
     	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
     	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
     	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
     
    -echo "${as_me:-configure}:12852: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
    +echo "${as_me:-configure}:12853: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
     
     	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
     
    -echo "${as_me:-configure}:12856: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
    +echo "${as_me:-configure}:12857: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
     
     cf_fix_cppflags=no
     cf_new_cflags=
    @@ -12982,12 +12983,12 @@ else
     
     test -n "$verbose" && echo "	...before $LIBS" 1>&6
     
    -echo "${as_me:-configure}:12985: testing ...before $LIBS ..." 1>&5
    +echo "${as_me:-configure}:12986: testing ...before $LIBS ..." 1>&5
     
     LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
     test -n "$verbose" && echo "	...after  $LIBS" 1>&6
     
    -echo "${as_me:-configure}:12990: testing ...after  $LIBS ..." 1>&5
    +echo "${as_me:-configure}:12991: testing ...after  $LIBS ..." 1>&5
     
     fi
     
    @@ -13007,7 +13008,7 @@ else
     
     test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13010: testing checking additions to CFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13011: testing checking additions to CFLAGS ..." 1>&5
     
     cf_check_cflags="$CFLAGS"
     cf_check_cppflags="$CPPFLAGS"
    @@ -13092,7 +13093,7 @@ done
     if test -n "$cf_new_cflags" ; then
     	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
     
    -echo "${as_me:-configure}:13095: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
    +echo "${as_me:-configure}:13096: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
     
     	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
     	CFLAGS="${CFLAGS}$cf_new_cflags"
    @@ -13102,7 +13103,7 @@ fi
     if test -n "$cf_new_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
     
    -echo "${as_me:-configure}:13105: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
    +echo "${as_me:-configure}:13106: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
     
     	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
     	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
    @@ -13112,7 +13113,7 @@ fi
     if test -n "$cf_new_extra_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
     
    -echo "${as_me:-configure}:13115: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
    +echo "${as_me:-configure}:13116: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
     
     	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
     	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
    @@ -13121,7 +13122,7 @@ fi
     
     if test "x$cf_check_cflags" != "x$CFLAGS" ; then
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13124 "configure"
    +#line 13125 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -13133,16 +13134,16 @@ printf("Hello world");
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13139: \$? = $ac_status" >&5
    +  echo "$as_me:13140: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13142: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13145: \$? = $ac_status" >&5
    +  echo "$as_me:13146: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -13150,12 +13151,12 @@ else
     cat conftest.$ac_ext >&5
     test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13153: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13154: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
     
     	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
     		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13158: testing but keeping change to \$CPPFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13159: testing but keeping change to \$CPPFLAGS ..." 1>&5
     
     	 fi
     	 CFLAGS="$cf_check_flags"
    @@ -13163,13 +13164,13 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
     
    -	echo "$as_me:13166: checking for XOpenDisplay" >&5
    +	echo "$as_me:13167: checking for XOpenDisplay" >&5
     echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
     if test "${ac_cv_func_XOpenDisplay+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 13172 "configure"
    +#line 13173 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char XOpenDisplay (); below.  */
    @@ -13200,16 +13201,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13203: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13206: \$? = $ac_status" >&5
    +  echo "$as_me:13207: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13209: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13212: \$? = $ac_status" >&5
    +  echo "$as_me:13213: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_XOpenDisplay=yes
     else
    @@ -13219,13 +13220,13 @@ ac_cv_func_XOpenDisplay=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:13222: result: $ac_cv_func_XOpenDisplay" >&5
    +echo "$as_me:13223: result: $ac_cv_func_XOpenDisplay" >&5
     echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
     if test $ac_cv_func_XOpenDisplay = yes; then
       :
     else
     
    -	echo "$as_me:13228: checking for XOpenDisplay in -lX11" >&5
    +	echo "$as_me:13229: checking for XOpenDisplay in -lX11" >&5
     echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
     if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13233,7 +13234,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13236 "configure"
    +#line 13237 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -13252,16 +13253,16 @@ XOpenDisplay ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13255: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13258: \$? = $ac_status" >&5
    +  echo "$as_me:13259: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13261: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13264: \$? = $ac_status" >&5
    +  echo "$as_me:13265: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_X11_XOpenDisplay=yes
     else
    @@ -13272,7 +13273,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:13275: result: $ac_cv_lib_X11_XOpenDisplay" >&5
    +echo "$as_me:13276: result: $ac_cv_lib_X11_XOpenDisplay" >&5
     echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
     if test $ac_cv_lib_X11_XOpenDisplay = yes; then
     
    @@ -13296,13 +13297,13 @@ fi
     
     fi
     
    -	echo "$as_me:13299: checking for XtAppInitialize" >&5
    +	echo "$as_me:13300: checking for XtAppInitialize" >&5
     echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
     if test "${ac_cv_func_XtAppInitialize+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 13305 "configure"
    +#line 13306 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char XtAppInitialize (); below.  */
    @@ -13333,16 +13334,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13336: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13337: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13339: \$? = $ac_status" >&5
    +  echo "$as_me:13340: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13342: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13343: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13345: \$? = $ac_status" >&5
    +  echo "$as_me:13346: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_func_XtAppInitialize=yes
     else
    @@ -13352,13 +13353,13 @@ ac_cv_func_XtAppInitialize=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:13355: result: $ac_cv_func_XtAppInitialize" >&5
    +echo "$as_me:13356: result: $ac_cv_func_XtAppInitialize" >&5
     echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
     if test $ac_cv_func_XtAppInitialize = yes; then
       :
     else
     
    -	echo "$as_me:13361: checking for XtAppInitialize in -lXt" >&5
    +	echo "$as_me:13362: checking for XtAppInitialize in -lXt" >&5
     echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
     if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13366,7 +13367,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13369 "configure"
    +#line 13370 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -13385,16 +13386,16 @@ XtAppInitialize ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13388: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13389: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13391: \$? = $ac_status" >&5
    +  echo "$as_me:13392: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13394: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13395: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13397: \$? = $ac_status" >&5
    +  echo "$as_me:13398: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_Xt_XtAppInitialize=yes
     else
    @@ -13405,7 +13406,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:13408: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
    +echo "$as_me:13409: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
     echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
     if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
     
    @@ -13422,7 +13423,7 @@ fi
     fi
     
     if test $cf_have_X_LIBS = no ; then
    -	{ echo "$as_me:13425: WARNING: Unable to successfully link X Toolkit library (-lXt) with
    +	{ echo "$as_me:13426: WARNING: Unable to successfully link X Toolkit library (-lXt) with
     test program.  You will have to check and add the proper libraries by hand
     to makefile." >&5
     echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
    @@ -13444,14 +13445,14 @@ do
     		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
     		if test $cf_path != default ; then
     			CPPFLAGS="$cf_save -I$cf_path/include"
    -			echo "$as_me:13447: checking for $cf_test in $cf_path" >&5
    +			echo "$as_me:13448: checking for $cf_test in $cf_path" >&5
     echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
     		else
    -			echo "$as_me:13450: checking for $cf_test" >&5
    +			echo "$as_me:13451: checking for $cf_test" >&5
     echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
     		fi
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 13454 "configure"
    +#line 13455 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -13465,16 +13466,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:13468: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:13469: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:13471: \$? = $ac_status" >&5
    +  echo "$as_me:13472: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:13474: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13475: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13477: \$? = $ac_status" >&5
    +  echo "$as_me:13478: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -13483,7 +13484,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -		echo "$as_me:13486: result: $cf_result" >&5
    +		echo "$as_me:13487: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     		if test "$cf_result" = yes ; then
     			cf_x_athena_inc=$cf_path
    @@ -13495,7 +13496,7 @@ echo "${ECHO_T}$cf_result" >&6
     done
     
     if test -z "$cf_x_athena_inc" ; then
    -	{ echo "$as_me:13498: WARNING: Unable to successfully find Athena header files with test program" >&5
    +	{ echo "$as_me:13499: WARNING: Unable to successfully find Athena header files with test program" >&5
     echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
     elif test "$cf_x_athena_inc" != default ; then
     	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
    @@ -13541,7 +13542,7 @@ do
     done
     LIBS="$cf_add_libs"
     
    -				echo "$as_me:13544: checking for $cf_libs in $cf_path" >&5
    +				echo "$as_me:13545: checking for $cf_libs in $cf_path" >&5
     echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
     			else
     
    @@ -13561,11 +13562,11 @@ do
     done
     LIBS="$cf_add_libs"
     
    -				echo "$as_me:13564: checking for $cf_test in $cf_libs" >&5
    +				echo "$as_me:13565: checking for $cf_test in $cf_libs" >&5
     echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
     			fi
     			cat >conftest.$ac_ext <<_ACEOF
    -#line 13568 "configure"
    +#line 13569 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -13581,16 +13582,16 @@ $cf_test((XtAppContext) 0)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13584: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13585: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13587: \$? = $ac_status" >&5
    +  echo "$as_me:13588: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13590: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13591: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13593: \$? = $ac_status" >&5
    +  echo "$as_me:13594: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -13599,7 +13600,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    -			echo "$as_me:13602: result: $cf_result" >&5
    +			echo "$as_me:13603: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     			if test "$cf_result" = yes ; then
     				cf_x_athena_lib="$cf_libs"
    @@ -13613,7 +13614,7 @@ echo "${ECHO_T}$cf_result" >&6
     done
     
     if test -z "$cf_x_athena_lib" ; then
    -	{ { echo "$as_me:13616: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
    +	{ { echo "$as_me:13617: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
     echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -13631,7 +13632,7 @@ if test -n "$ac_tool_prefix"; then
       do
         # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    -echo "$as_me:13634: checking for $ac_word" >&5
    +echo "$as_me:13635: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13646,7 +13647,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
    -echo "$as_me:13649: found $ac_dir/$ac_word" >&5
    +echo "$as_me:13650: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -13654,10 +13655,10 @@ fi
     fi
     XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
     if test -n "$XCURSES_CONFIG"; then
    -  echo "$as_me:13657: result: $XCURSES_CONFIG" >&5
    +  echo "$as_me:13658: result: $XCURSES_CONFIG" >&5
     echo "${ECHO_T}$XCURSES_CONFIG" >&6
     else
    -  echo "$as_me:13660: result: no" >&5
    +  echo "$as_me:13661: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -13670,7 +13671,7 @@ if test -z "$XCURSES_CONFIG"; then
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:13673: checking for $ac_word" >&5
    +echo "$as_me:13674: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13685,7 +13686,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
    -echo "$as_me:13688: found $ac_dir/$ac_word" >&5
    +echo "$as_me:13689: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -13693,10 +13694,10 @@ fi
     fi
     ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
     if test -n "$ac_ct_XCURSES_CONFIG"; then
    -  echo "$as_me:13696: result: $ac_ct_XCURSES_CONFIG" >&5
    +  echo "$as_me:13697: result: $ac_ct_XCURSES_CONFIG" >&5
     echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
     else
    -  echo "$as_me:13699: result: no" >&5
    +  echo "$as_me:13700: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -13735,7 +13736,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
     
     test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13738: testing checking additions to CFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13739: testing checking additions to CFLAGS ..." 1>&5
     
     cf_check_cflags="$CFLAGS"
     cf_check_cppflags="$CPPFLAGS"
    @@ -13820,7 +13821,7 @@ done
     if test -n "$cf_new_cflags" ; then
     	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
     
    -echo "${as_me:-configure}:13823: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
    +echo "${as_me:-configure}:13824: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
     
     	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
     	CFLAGS="${CFLAGS}$cf_new_cflags"
    @@ -13830,7 +13831,7 @@ fi
     if test -n "$cf_new_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
     
    -echo "${as_me:-configure}:13833: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
    +echo "${as_me:-configure}:13834: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
     
     	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
     	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
    @@ -13840,7 +13841,7 @@ fi
     if test -n "$cf_new_extra_cppflags" ; then
     	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
     
    -echo "${as_me:-configure}:13843: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
    +echo "${as_me:-configure}:13844: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
     
     	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
     	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
    @@ -13849,7 +13850,7 @@ fi
     
     if test "x$cf_check_cflags" != "x$CFLAGS" ; then
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13852 "configure"
    +#line 13853 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -13861,16 +13862,16 @@ printf("Hello world");
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13864: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13865: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13867: \$? = $ac_status" >&5
    +  echo "$as_me:13868: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13870: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13871: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13873: \$? = $ac_status" >&5
    +  echo "$as_me:13874: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -13878,12 +13879,12 @@ else
     cat conftest.$ac_ext >&5
     test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13881: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13882: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
     
     	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
     		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
     
    -echo "${as_me:-configure}:13886: testing but keeping change to \$CPPFLAGS ..." 1>&5
    +echo "${as_me:-configure}:13887: testing but keeping change to \$CPPFLAGS ..." 1>&5
     
     	 fi
     	 CFLAGS="$cf_check_flags"
    @@ -13891,7 +13892,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
     
    -echo "$as_me:13894: checking for XOpenDisplay in -lX11" >&5
    +echo "$as_me:13895: checking for XOpenDisplay in -lX11" >&5
     echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
     if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13899,7 +13900,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13902 "configure"
    +#line 13903 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -13918,16 +13919,16 @@ XOpenDisplay ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:13921: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:13922: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:13924: \$? = $ac_status" >&5
    +  echo "$as_me:13925: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:13927: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:13928: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:13930: \$? = $ac_status" >&5
    +  echo "$as_me:13931: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_X11_XOpenDisplay=yes
     else
    @@ -13938,7 +13939,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:13941: result: $ac_cv_lib_X11_XOpenDisplay" >&5
    +echo "$as_me:13942: result: $ac_cv_lib_X11_XOpenDisplay" >&5
     echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
     if test $ac_cv_lib_X11_XOpenDisplay = yes; then
     
    @@ -13960,7 +13961,7 @@ LIBS="$cf_add_libs"
     
     fi
     
    -echo "$as_me:13963: checking for XCurses library" >&5
    +echo "$as_me:13964: checking for XCurses library" >&5
     echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
     if test "${cf_cv_lib_XCurses+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -13983,7 +13984,7 @@ done
     LIBS="$cf_add_libs"
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 13986 "configure"
    +#line 13987 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -13998,16 +13999,16 @@ XCursesExit();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:14001: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14002: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14004: \$? = $ac_status" >&5
    +  echo "$as_me:14005: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:14007: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14010: \$? = $ac_status" >&5
    +  echo "$as_me:14011: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_lib_XCurses=yes
     else
    @@ -14018,7 +14019,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
    -echo "$as_me:14021: result: $cf_cv_lib_XCurses" >&5
    +echo "$as_me:14022: result: $cf_cv_lib_XCurses" >&5
     echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
     
     fi
    @@ -14033,23 +14034,23 @@ cat >>confdefs.h <<\EOF
     #define XCURSES 1
     EOF
     
    -	echo "$as_me:14036: checking for xcurses.h" >&5
    +	echo "$as_me:14037: checking for xcurses.h" >&5
     echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
     if test "${ac_cv_header_xcurses_h+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 14042 "configure"
    +#line 14043 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:14046: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:14047: \"$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:14052: \$? = $ac_status" >&5
    +  echo "$as_me:14053: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -14068,7 +14069,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:14071: result: $ac_cv_header_xcurses_h" >&5
    +echo "$as_me:14072: result: $ac_cv_header_xcurses_h" >&5
     echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
     if test $ac_cv_header_xcurses_h = yes; then
     
    @@ -14079,14 +14080,14 @@ EOF
     fi
     
     else
    -	{ { echo "$as_me:14082: error: Cannot link with XCurses" >&5
    +	{ { echo "$as_me:14083: error: Cannot link with XCurses" >&5
     echo "$as_me: error: Cannot link with XCurses" >&2;}
        { (exit 1); exit 1; }; }
     fi
     
     	;;
     (*)
    -	{ { echo "$as_me:14089: error: unexpected screen-value: $cf_cv_screen" >&5
    +	{ { echo "$as_me:14090: error: unexpected screen-value: $cf_cv_screen" >&5
     echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
        { (exit 1); exit 1; }; }
     	;;
    @@ -14094,7 +14095,7 @@ esac
     
     : ${cf_nculib_root:=$cf_cv_screen}
     as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
    -echo "$as_me:14097: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
    +echo "$as_me:14098: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
     echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
     if eval "test \"\${$as_ac_Lib+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -14102,7 +14103,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-l$cf_nculib_root  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14105 "configure"
    +#line 14106 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -14121,16 +14122,16 @@ _nc_init_pthreads ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:14124: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14127: \$? = $ac_status" >&5
    +  echo "$as_me:14128: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:14130: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14133: \$? = $ac_status" >&5
    +  echo "$as_me:14134: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_Lib=yes"
     else
    @@ -14141,7 +14142,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:14144: result: `eval echo '${'$as_ac_Lib'}'`" >&5
    +echo "$as_me:14145: result: `eval echo '${'$as_ac_Lib'}'`" >&5
     echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
     if test `eval echo '${'$as_ac_Lib'}'` = yes; then
       cf_cv_ncurses_pthreads=yes
    @@ -14176,6 +14177,91 @@ case $cf_cv_screen in
     	;;
     esac
     
    +echo "$as_me:14180: checking for X11 rgb file" >&5
    +echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
    +
    +# Check whether --with-x11-rgb or --without-x11-rgb was given.
    +if test "${with_x11_rgb+set}" = set; then
    +  withval="$with_x11_rgb"
    +  RGB_PATH=$withval
    +else
    +  RGB_PATH=auto
    +fi;
    +
    +if test "x$RGB_PATH" = xauto
    +then
    +	RGB_PATH='${exec_prefix}/lib/X11/rgb.txt'
    +	for cf_path in \
    +		/opt/local/share/X11/rgb.txt \
    +		/opt/X11/share/X11/rgb.txt \
    +		/usr/share/X11/rgb.txt \
    +		/usr/X11/share/X11/rgb.txt \
    +		/usr/X11/lib/X11/rgb.txt \
    +		/usr/lib/X11/rgb.txt \
    +		/etc/X11/rgb.txt \
    +		/usr/pkg/lib/X11/rgb.txt \
    +		/usr/X11R7/lib/X11/rgb.txt \
    +		/usr/X11R6/lib/X11/rgb.txt \
    +		/usr/X11R5/lib/X11/rgb.txt \
    +		/usr/X11R4/lib/X11/rgb.txt \
    +		/usr/local/lib/X11/rgb.txt \
    +		/usr/local/share/X11/rgb.txt \
    +		/usr/lib64/X11/rgb.txt
    +	do
    +		if test -f "$cf_path" ; then
    +			RGB_PATH="$cf_path"
    +			break
    +		fi
    +	done
    +else
    +	cf_path=$RGB_PATH
    +
    +if test "x$prefix" != xNONE; then
    +	cf_path_syntax="$prefix"
    +else
    +	cf_path_syntax="$ac_default_prefix"
    +fi
    +
    +case ".$cf_path" in
    +(.\$\(*\)*|.\'*\'*)
    +	;;
    +(..|./*|.\\*)
    +	;;
    +(.[a-zA-Z]:[\\/]*) # OS/2 EMX
    +	;;
    +(.\${*prefix}*|.\${*dir}*)
    +	eval cf_path="$cf_path"
    +	case ".$cf_path" in
    +	(.NONE/*)
    +		cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
    +		;;
    +	esac
    +	;;
    +(.no|.NONE/*)
    +	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
    +	;;
    +(*)
    +	{ { echo "$as_me:14244: error: expected a pathname, not \"$cf_path\"" >&5
    +echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    +   { (exit 1); exit 1; }; }
    +	;;
    +esac
    +
    +fi
    +
    +echo "$as_me:14252: result: $RGB_PATH" >&5
    +echo "${ECHO_T}$RGB_PATH" >&6
    +
    +cat >>confdefs.h <&5
    +echo "$as_me:14293: checking if you want to check for panel functions" >&5
     echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
     
     # Check whether --enable-panel or --disable-panel was given.
    @@ -14221,13 +14307,13 @@ else
     	cf_enable_panel=$cf_default_panel
     
     fi;
    -echo "$as_me:14224: result: $cf_enable_panel" >&5
    +echo "$as_me:14310: result: $cf_enable_panel" >&5
     echo "${ECHO_T}$cf_enable_panel" >&6
     if test $cf_enable_panel = yes
     then
     
     as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
    -echo "$as_me:14230: checking for new_panel in -lpanel$cf_cv_libtype" >&5
    +echo "$as_me:14316: checking for new_panel in -lpanel$cf_cv_libtype" >&5
     echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
     if eval "test \"\${$as_ac_Lib+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -14235,7 +14321,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lpanel$cf_cv_libtype  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14238 "configure"
    +#line 14324 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -14254,16 +14340,16 @@ new_panel ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:14257: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14343: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14260: \$? = $ac_status" >&5
    +  echo "$as_me:14346: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:14263: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14349: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14266: \$? = $ac_status" >&5
    +  echo "$as_me:14352: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_Lib=yes"
     else
    @@ -14274,7 +14360,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:14277: result: `eval echo '${'$as_ac_Lib'}'`" >&5
    +echo "$as_me:14363: 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
     
    @@ -14305,7 +14391,7 @@ fi
     	cf_curses_headers="$cf_curses_headers panel.h"
     fi
     
    -echo "$as_me:14308: checking if you want to check for menu functions" >&5
    +echo "$as_me:14394: checking if you want to check for menu functions" >&5
     echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
     
     # Check whether --enable-menu or --disable-menu was given.
    @@ -14322,7 +14408,7 @@ else
     	cf_enable_menu=$cf_default_menu
     
     fi;
    -echo "$as_me:14325: result: $cf_enable_menu" >&5
    +echo "$as_me:14411: result: $cf_enable_menu" >&5
     echo "${ECHO_T}$cf_enable_menu" >&6
     if test $cf_enable_menu = yes
     then
    @@ -14331,14 +14417,14 @@ then
     		;;
     	(curses*)
     
    -echo "$as_me:14334: checking for NetBSD menu.h" >&5
    +echo "$as_me:14420: checking for NetBSD menu.h" >&5
     echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
     if test "${cf_cv_netbsd_menu_h+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14341 "configure"
    +#line 14427 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -14356,16 +14442,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:14359: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:14445: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:14362: \$? = $ac_status" >&5
    +  echo "$as_me:14448: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14451: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14368: \$? = $ac_status" >&5
    +  echo "$as_me:14454: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_netbsd_menu_h=yes
     
    @@ -14377,7 +14463,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:14380: result: $cf_cv_netbsd_menu_h" >&5
    +echo "$as_me:14466: result: $cf_cv_netbsd_menu_h" >&5
     echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
     
     test "$cf_cv_netbsd_menu_h" = yes &&
    @@ -14389,7 +14475,7 @@ EOF
     	esac
     
     as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
    -echo "$as_me:14392: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
    +echo "$as_me:14478: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
     echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
     if eval "test \"\${$as_ac_Lib+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -14397,7 +14483,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lmenu$cf_cv_libtype  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14400 "configure"
    +#line 14486 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -14416,16 +14502,16 @@ menu_driver ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:14419: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14505: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14422: \$? = $ac_status" >&5
    +  echo "$as_me:14508: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:14425: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14511: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14428: \$? = $ac_status" >&5
    +  echo "$as_me:14514: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_Lib=yes"
     else
    @@ -14436,7 +14522,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:14439: result: `eval echo '${'$as_ac_Lib'}'`" >&5
    +echo "$as_me:14525: 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
     
    @@ -14467,7 +14553,7 @@ fi
     	cf_curses_headers="$cf_curses_headers menu.h"
     fi
     
    -echo "$as_me:14470: checking if you want to check for form functions" >&5
    +echo "$as_me:14556: checking if you want to check for form functions" >&5
     echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
     
     # Check whether --enable-form or --disable-form was given.
    @@ -14484,7 +14570,7 @@ else
     	cf_enable_form=$cf_default_form
     
     fi;
    -echo "$as_me:14487: result: $cf_enable_form" >&5
    +echo "$as_me:14573: result: $cf_enable_form" >&5
     echo "${ECHO_T}$cf_enable_form" >&6
     if test $cf_enable_form = yes
     then
    @@ -14493,14 +14579,14 @@ then
     		;;
     	(curses*)
     
    -echo "$as_me:14496: checking for NetBSD form.h" >&5
    +echo "$as_me:14582: checking for NetBSD form.h" >&5
     echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
     if test "${cf_cv_netbsd_form_h+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14503 "configure"
    +#line 14589 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -14519,16 +14605,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:14522: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:14608: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:14525: \$? = $ac_status" >&5
    +  echo "$as_me:14611: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:14528: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14614: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14531: \$? = $ac_status" >&5
    +  echo "$as_me:14617: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_netbsd_form_h=yes
     
    @@ -14540,7 +14626,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:14543: result: $cf_cv_netbsd_form_h" >&5
    +echo "$as_me:14629: result: $cf_cv_netbsd_form_h" >&5
     echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
     
     test "$cf_cv_netbsd_form_h" = yes &&
    @@ -14552,7 +14638,7 @@ EOF
     	esac
     
     as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
    -echo "$as_me:14555: checking for form_driver in -lform$cf_cv_libtype" >&5
    +echo "$as_me:14641: checking for form_driver in -lform$cf_cv_libtype" >&5
     echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
     if eval "test \"\${$as_ac_Lib+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -14560,7 +14646,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lform$cf_cv_libtype  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 14563 "configure"
    +#line 14649 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -14579,16 +14665,16 @@ form_driver ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:14582: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14668: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14585: \$? = $ac_status" >&5
    +  echo "$as_me:14671: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14674: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14591: \$? = $ac_status" >&5
    +  echo "$as_me:14677: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_Lib=yes"
     else
    @@ -14599,7 +14685,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:14602: result: `eval echo '${'$as_ac_Lib'}'`" >&5
    +echo "$as_me:14688: 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
     
    @@ -14635,23 +14721,23 @@ fi
     for ac_header in $cf_curses_headers
     do
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    -echo "$as_me:14638: checking for $ac_header" >&5
    +echo "$as_me:14724: 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 14644 "configure"
    +#line 14730 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:14648: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:14734: \"$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:14654: \$? = $ac_status" >&5
    +  echo "$as_me:14740: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -14670,7 +14756,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:14673: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:14759: 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:14769: 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 14689 "configure"
    +#line 14775 "configure"
     #include "confdefs.h"
     #include 
     #include 
    @@ -14694,13 +14780,13 @@ else
     #include 
     
     _ACEOF
    -if { (eval echo "$as_me:14697: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:14783: \"$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:14703: \$? = $ac_status" >&5
    +  echo "$as_me:14789: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -14722,7 +14808,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 14725 "configure"
    +#line 14811 "configure"
     #include "confdefs.h"
     #include 
     
    @@ -14740,7 +14826,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 14743 "configure"
    +#line 14829 "configure"
     #include "confdefs.h"
     #include 
     
    @@ -14761,7 +14847,7 @@ if test $ac_cv_header_stdc = yes; then
       :
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 14764 "configure"
    +#line 14850 "configure"
     #include "confdefs.h"
     #include 
     #if ((' ' & 0x0FF) == 0x020)
    @@ -14787,15 +14873,15 @@ main (void)
     }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:14790: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:14876: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:14793: \$? = $ac_status" >&5
    +  echo "$as_me:14879: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:14795: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14881: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14798: \$? = $ac_status" >&5
    +  echo "$as_me:14884: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -14808,7 +14894,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     fi
     fi
     fi
    -echo "$as_me:14811: result: $ac_cv_header_stdc" >&5
    +echo "$as_me:14897: result: $ac_cv_header_stdc" >&5
     echo "${ECHO_T}$ac_cv_header_stdc" >&6
     if test $ac_cv_header_stdc = yes; then
     
    @@ -14818,13 +14904,13 @@ EOF
     
     fi
     
    -echo "$as_me:14821: checking whether time.h and sys/time.h may both be included" >&5
    +echo "$as_me:14907: 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 14827 "configure"
    +#line 14913 "configure"
     #include "confdefs.h"
     #include 
     #include 
    @@ -14840,16 +14926,16 @@ return 0;
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:14843: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:14929: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:14846: \$? = $ac_status" >&5
    +  echo "$as_me:14932: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:14849: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:14935: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:14852: \$? = $ac_status" >&5
    +  echo "$as_me:14938: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_header_time=yes
     else
    @@ -14859,7 +14945,7 @@ ac_cv_header_time=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     fi
    -echo "$as_me:14862: result: $ac_cv_header_time" >&5
    +echo "$as_me:14948: result: $ac_cv_header_time" >&5
     echo "${ECHO_T}$ac_cv_header_time" >&6
     if test $ac_cv_header_time = yes; then
     
    @@ -14883,23 +14969,23 @@ unistd.h \
     
     do
     as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    -echo "$as_me:14886: checking for $ac_header" >&5
    +echo "$as_me:14972: 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 14892 "configure"
    +#line 14978 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:14896: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:14982: \"$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:14902: \$? = $ac_status" >&5
    +  echo "$as_me:14988: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -14918,7 +15004,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:14921: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:15007: 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:15020: 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 14940 "configure"
    +#line 15026 "configure"
     #include "confdefs.h"
     #include <$ac_header>
     _ACEOF
    -if { (eval echo "$as_me:14944: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:15030: \"$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:14950: \$? = $ac_status" >&5
    +  echo "$as_me:15036: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -14966,7 +15052,7 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:14969: result: `eval echo '${'$as_ac_Header'}'`" >&5
    +echo "$as_me:15055: 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:15065: 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
    @@ -14986,7 +15072,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 14989 "configure"
    +#line 15075 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -14999,16 +15085,16 @@ int x = optind; char *y = optarg
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15088: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15005: \$? = $ac_status" >&5
    +  echo "$as_me:15091: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15094: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15011: \$? = $ac_status" >&5
    +  echo "$as_me:15097: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_getopt_header=$cf_header
      break
    @@ -15020,7 +15106,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:15023: result: $cf_cv_getopt_header" >&5
    +echo "$as_me:15109: result: $cf_cv_getopt_header" >&5
     echo "${ECHO_T}$cf_cv_getopt_header" >&6
     if test $cf_cv_getopt_header != none ; then
     
    @@ -15045,13 +15131,13 @@ tsearch \
     
     do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    -echo "$as_me:15048: checking for $ac_func" >&5
    +echo "$as_me:15134: checking for $ac_func" >&5
     echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
     if eval "test \"\${$as_ac_var+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 15054 "configure"
    +#line 15140 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char $ac_func (); below.  */
    @@ -15082,16 +15168,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15085: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15171: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15088: \$? = $ac_status" >&5
    +  echo "$as_me:15174: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15091: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15177: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15094: \$? = $ac_status" >&5
    +  echo "$as_me:15180: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_var=yes"
     else
    @@ -15101,7 +15187,7 @@ eval "$as_ac_var=no"
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:15104: result: `eval echo '${'$as_ac_var'}'`" >&5
    +echo "$as_me:15190: result: `eval echo '${'$as_ac_var'}'`" >&5
     echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
     if test `eval echo '${'$as_ac_var'}'` = yes; then
       cat >>confdefs.h <&5
    +	{ { echo "$as_me:15201: error: getopt is required for building programs" >&5
     echo "$as_me: error: getopt is required for building programs" >&2;}
        { (exit 1); exit 1; }; }
     fi
    @@ -15131,13 +15217,13 @@ wcstombs \
     
     do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    -echo "$as_me:15134: checking for $ac_func" >&5
    +echo "$as_me:15220: 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 15140 "configure"
    +#line 15226 "configure"
     #include "confdefs.h"
     /* System header to define __stub macros and hopefully few prototypes,
         which can conflict with char $ac_func (); below.  */
    @@ -15168,16 +15254,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15171: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15174: \$? = $ac_status" >&5
    +  echo "$as_me:15260: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15177: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15263: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15180: \$? = $ac_status" >&5
    +  echo "$as_me:15266: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       eval "$as_ac_var=yes"
     else
    @@ -15187,7 +15273,7 @@ eval "$as_ac_var=no"
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
    -echo "$as_me:15190: result: `eval echo '${'$as_ac_var'}'`" >&5
    +echo "$as_me:15276: 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:15288: checking definition to turn on extended curses functions" >&5
     echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
     if test "${cf_cv_need_xopen_extension+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -15207,7 +15293,7 @@ else
     
     cf_cv_need_xopen_extension=unknown
     cat >conftest.$ac_ext <<_ACEOF
    -#line 15210 "configure"
    +#line 15296 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -15233,16 +15319,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15322: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15239: \$? = $ac_status" >&5
    +  echo "$as_me:15325: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15328: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15245: \$? = $ac_status" >&5
    +  echo "$as_me:15331: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_need_xopen_extension=none
     else
    @@ -15252,7 +15338,7 @@ cat conftest.$ac_ext >&5
     	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
     	do
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 15255 "configure"
    +#line 15341 "configure"
     #include "confdefs.h"
     
     #define $cf_try_xopen_extension 1
    @@ -15274,16 +15360,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15277: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15363: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15280: \$? = $ac_status" >&5
    +  echo "$as_me:15366: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15283: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15369: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15286: \$? = $ac_status" >&5
    +  echo "$as_me:15372: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
     else
    @@ -15297,7 +15383,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
    -echo "$as_me:15300: result: $cf_cv_need_xopen_extension" >&5
    +echo "$as_me:15386: result: $cf_cv_need_xopen_extension" >&5
     echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
     
     case $cf_cv_need_xopen_extension in
    @@ -15306,7 +15392,7 @@ case $cf_cv_need_xopen_extension in
     	;;
     esac
     
    -echo "$as_me:15309: checking for term.h" >&5
    +echo "$as_me:15395: checking for term.h" >&5
     echo $ECHO_N "checking for term.h... $ECHO_C" >&6
     if test "${cf_cv_term_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -15327,7 +15413,7 @@ esac
     for cf_header in $cf_header_list
     do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 15330 "configure"
    +#line 15416 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15341,16 +15427,16 @@ WINDOW *x
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15430: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15347: \$? = $ac_status" >&5
    +  echo "$as_me:15433: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15350: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15436: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15353: \$? = $ac_status" >&5
    +  echo "$as_me:15439: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_term_header=$cf_header
     	 break
    @@ -15369,7 +15455,7 @@ case $cf_cv_term_header in
     	for cf_header in ncurses/term.h ncursesw/term.h
     	do
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 15372 "configure"
    +#line 15458 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15387,16 +15473,16 @@ WINDOW *x
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15390: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15476: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15393: \$? = $ac_status" >&5
    +  echo "$as_me:15479: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15482: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15399: \$? = $ac_status" >&5
    +  echo "$as_me:15485: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_term_header=$cf_header
     			 break
    @@ -15411,7 +15497,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     esac
     
     fi
    -echo "$as_me:15414: result: $cf_cv_term_header" >&5
    +echo "$as_me:15500: result: $cf_cv_term_header" >&5
     echo "${ECHO_T}$cf_cv_term_header" >&6
     
     case $cf_cv_term_header in
    @@ -15438,7 +15524,7 @@ EOF
     	;;
     esac
     
    -echo "$as_me:15441: checking for unctrl.h" >&5
    +echo "$as_me:15527: checking for unctrl.h" >&5
     echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
     if test "${cf_cv_unctrl_header+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -15459,7 +15545,7 @@ esac
     for cf_header in $cf_header_list
     do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 15462 "configure"
    +#line 15548 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15473,16 +15559,16 @@ WINDOW *x
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15476: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15479: \$? = $ac_status" >&5
    +  echo "$as_me:15565: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15482: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15485: \$? = $ac_status" >&5
    +  echo "$as_me:15571: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_unctrl_header=$cf_header
     	 break
    @@ -15495,12 +15581,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:15498: result: $cf_cv_unctrl_header" >&5
    +echo "$as_me:15584: result: $cf_cv_unctrl_header" >&5
     echo "${ECHO_T}$cf_cv_unctrl_header" >&6
     
     case $cf_cv_unctrl_header in
     (no)
    -	{ echo "$as_me:15503: WARNING: unctrl.h header not found" >&5
    +	{ echo "$as_me:15589: WARNING: unctrl.h header not found" >&5
     echo "$as_me: WARNING: unctrl.h header not found" >&2;}
     	;;
     esac
    @@ -15588,10 +15674,10 @@ do
     
     cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
     
    -	echo "$as_me:15591: checking for ${cf_func}" >&5
    +	echo "$as_me:15677: checking for ${cf_func}" >&5
     echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
     
    -echo "${as_me:-configure}:15594: testing ${cf_func} ..." 1>&5
    +echo "${as_me:-configure}:15680: testing ${cf_func} ..." 1>&5
     
     	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -15600,7 +15686,7 @@ else
     		eval cf_result='$ac_cv_func_'$cf_func
     		if test ".$cf_result" != ".no"; then
     			cat >conftest.$ac_ext <<_ACEOF
    -#line 15603 "configure"
    +#line 15689 "configure"
     #include "confdefs.h"
     
     #ifdef HAVE_XCURSES
    @@ -15633,16 +15719,16 @@ if (foo + 1234 > 5678)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15636: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15722: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15639: \$? = $ac_status" >&5
    +  echo "$as_me:15725: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15642: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15728: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15645: \$? = $ac_status" >&5
    +  echo "$as_me:15731: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -15658,7 +15744,7 @@ fi
     
     	# use the computed/retrieved cache-value:
     	eval 'cf_result=$cf_cv_func_'$cf_func
    -	echo "$as_me:15661: result: $cf_result" >&5
    +	echo "$as_me:15747: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     	if test $cf_result != no; then
     		cat >>confdefs.h <&5
    +	echo "$as_me:15762: checking for ${cf_func}" >&5
     echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
     
    -echo "${as_me:-configure}:15679: testing ${cf_func} ..." 1>&5
    +echo "${as_me:-configure}:15765: testing ${cf_func} ..." 1>&5
     
     	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -15685,7 +15771,7 @@ else
     		eval cf_result='$ac_cv_func_'$cf_func
     		if test ".$cf_result" != ".no"; then
     			cat >conftest.$ac_ext <<_ACEOF
    -#line 15688 "configure"
    +#line 15774 "configure"
     #include "confdefs.h"
     
     #ifdef HAVE_XCURSES
    @@ -15718,16 +15804,16 @@ if (foo + 1234 > 5678)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15721: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15807: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15724: \$? = $ac_status" >&5
    +  echo "$as_me:15810: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15727: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15813: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15730: \$? = $ac_status" >&5
    +  echo "$as_me:15816: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -15743,7 +15829,7 @@ fi
     
     	# use the computed/retrieved cache-value:
     	eval 'cf_result=$cf_cv_func_'$cf_func
    -	echo "$as_me:15746: result: $cf_result" >&5
    +	echo "$as_me:15832: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     	if test $cf_result != no; then
     		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
    -#line 15770 "configure"
    +#line 15856 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15787,21 +15873,21 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15790: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15876: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15793: \$? = $ac_status" >&5
    +  echo "$as_me:15879: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15796: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15882: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15799: \$? = $ac_status" >&5
    +  echo "$as_me:15885: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
     
    -echo "${as_me:-configure}:15804: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
    +echo "${as_me:-configure}:15890: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
     
     		cat >>confdefs.h <&5
    +echo "$as_me:15910: checking for ncurses extended functions" >&5
     echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
     if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 15831 "configure"
    +#line 15917 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15843,16 +15929,16 @@ int x = NCURSES_EXT_FUNCS
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15846: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:15932: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15849: \$? = $ac_status" >&5
    +  echo "$as_me:15935: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15852: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15938: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15855: \$? = $ac_status" >&5
    +  echo "$as_me:15941: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_ext_funcs=defined
     else
    @@ -15860,7 +15946,7 @@ else
     cat conftest.$ac_ext >&5
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 15863 "configure"
    +#line 15949 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15885,16 +15971,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:15888: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:15974: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:15891: \$? = $ac_status" >&5
    +  echo "$as_me:15977: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:15980: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15897: \$? = $ac_status" >&5
    +  echo "$as_me:15983: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_ncurses_ext_funcs=yes
     else
    @@ -15908,7 +15994,7 @@ fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
    -echo "$as_me:15911: result: $cf_cv_ncurses_ext_funcs" >&5
    +echo "$as_me:15997: result: $cf_cv_ncurses_ext_funcs" >&5
     echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
     test "$cf_cv_ncurses_ext_funcs" = yes &&
     cat >>confdefs.h <<\EOF
    @@ -15922,11 +16008,11 @@ then
     	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
     	then
     		cf_define_xpg5=no
    -		echo "$as_me:15925: checking if _XPG5 should be defined to enable wide-characters" >&5
    +		echo "$as_me:16011: checking if _XPG5 should be defined to enable wide-characters" >&5
     echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
     
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 15929 "configure"
    +#line 16015 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15939,16 +16025,16 @@ int x = _XPG5
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15942: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15945: \$? = $ac_status" >&5
    +  echo "$as_me:16031: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15948: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15951: \$? = $ac_status" >&5
    +  echo "$as_me:16037: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       :
     else
    @@ -15957,7 +16043,7 @@ cat conftest.$ac_ext >&5
     cf_save_cppflags="$CPPFLAGS"
     			 CPPFLAGS="$CPPFLAGS -D_XPG5"
     			 cat >conftest.$ac_ext <<_ACEOF
    -#line 15960 "configure"
    +#line 16046 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -15970,16 +16056,16 @@ int x = _XPG5
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:15973: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16059: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:15976: \$? = $ac_status" >&5
    +  echo "$as_me:16062: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:15979: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16065: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:15982: \$? = $ac_status" >&5
    +  echo "$as_me:16068: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_define_xpg5=yes
     else
    @@ -15990,7 +16076,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     			 CPPFLAGS="$cf_save_cppflags"
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -		echo "$as_me:15993: result: $cf_define_xpg5" >&5
    +		echo "$as_me:16079: result: $cf_define_xpg5" >&5
     echo "${ECHO_T}$cf_define_xpg5" >&6
     
     		if test "$cf_define_xpg5" = yes
    @@ -15999,14 +16085,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
     		fi
     	fi
     
    -	echo "$as_me:16002: checking for wide-character functions" >&5
    +	echo "$as_me:16088: checking for wide-character functions" >&5
     echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
     if test "${cf_cv_widechar_funcs+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 16009 "configure"
    +#line 16095 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -16023,16 +16109,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16026: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16112: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16029: \$? = $ac_status" >&5
    +  echo "$as_me:16115: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16032: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16118: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16035: \$? = $ac_status" >&5
    +  echo "$as_me:16121: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_widechar_funcs=yes
     else
    @@ -16043,7 +16129,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
    -echo "$as_me:16046: result: $cf_cv_widechar_funcs" >&5
    +echo "$as_me:16132: result: $cf_cv_widechar_funcs" >&5
     echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
     	if test "$cf_cv_widechar_funcs" != no ; then
     
    @@ -16064,14 +16150,14 @@ EOF
     
     fi
     
    -echo "$as_me:16067: checking if $cf_cv_screen library uses pthreads" >&5
    +echo "$as_me:16153: checking if $cf_cv_screen library uses pthreads" >&5
     echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
     if test "${cf_cv_use_pthreads+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16074 "configure"
    +#line 16160 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -16089,16 +16175,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16092: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16095: \$? = $ac_status" >&5
    +  echo "$as_me:16181: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16098: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16101: \$? = $ac_status" >&5
    +  echo "$as_me:16187: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_use_pthreads=yes
     else
    @@ -16109,20 +16195,20 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     fi
    -echo "$as_me:16112: result: $cf_cv_use_pthreads" >&5
    +echo "$as_me:16198: result: $cf_cv_use_pthreads" >&5
     echo "${ECHO_T}$cf_cv_use_pthreads" >&6
     test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
     #define USE_PTHREADS 1
     EOF
     
    -echo "$as_me:16118: checking if sys/time.h works with sys/select.h" >&5
    +echo "$as_me:16204: 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 16125 "configure"
    +#line 16211 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16142,16 +16228,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16145: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16231: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16148: \$? = $ac_status" >&5
    +  echo "$as_me:16234: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16151: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16237: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16154: \$? = $ac_status" >&5
    +  echo "$as_me:16240: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_sys_time_select=yes
     else
    @@ -16163,7 +16249,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     
     fi
     
    -echo "$as_me:16166: result: $cf_cv_sys_time_select" >&5
    +echo "$as_me:16252: 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
    @@ -16172,7 +16258,7 @@ EOF
     
     # special check for test/ditto.c
     
    -echo "$as_me:16175: checking for openpty in -lutil" >&5
    +echo "$as_me:16261: 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
    @@ -16180,7 +16266,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-lutil  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16183 "configure"
    +#line 16269 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -16199,16 +16285,16 @@ openpty ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16202: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16205: \$? = $ac_status" >&5
    +  echo "$as_me:16291: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16211: \$? = $ac_status" >&5
    +  echo "$as_me:16297: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_util_openpty=yes
     else
    @@ -16219,7 +16305,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:16222: result: $ac_cv_lib_util_openpty" >&5
    +echo "$as_me:16308: 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
    @@ -16227,7 +16313,7 @@ else
       cf_cv_lib_util=no
     fi
     
    -echo "$as_me:16230: checking for openpty header" >&5
    +echo "$as_me:16316: 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
    @@ -16254,7 +16340,7 @@ LIBS="$cf_add_libs"
     	for cf_header in pty.h libutil.h util.h
     	do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 16257 "configure"
    +#line 16343 "configure"
     #include "confdefs.h"
     
     #include <$cf_header>
    @@ -16271,16 +16357,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16274: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16360: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16277: \$? = $ac_status" >&5
    +  echo "$as_me:16363: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16366: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16283: \$? = $ac_status" >&5
    +  echo "$as_me:16369: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
     
     		cf_cv_func_openpty=$cf_header
    @@ -16298,7 +16384,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     	LIBS="$cf_save_LIBS"
     
     fi
    -echo "$as_me:16301: result: $cf_cv_func_openpty" >&5
    +echo "$as_me:16387: result: $cf_cv_func_openpty" >&5
     echo "${ECHO_T}$cf_cv_func_openpty" >&6
     
     if test "$cf_cv_func_openpty" != no ; then
    @@ -16332,7 +16418,7 @@ TEST_LIBS="$cf_add_libs"
     	fi
     fi
     
    -echo "$as_me:16335: checking for function curses_version" >&5
    +echo "$as_me:16421: checking for function curses_version" >&5
     echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
     if test "${cf_cv_func_curses_version+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -16342,7 +16428,7 @@ if test "$cross_compiling" = yes; then
       cf_cv_func_curses_version=unknown
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 16345 "configure"
    +#line 16431 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -16355,15 +16441,15 @@ int main(void)
     
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:16358: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16444: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16361: \$? = $ac_status" >&5
    +  echo "$as_me:16447: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:16363: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16449: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16366: \$? = $ac_status" >&5
    +  echo "$as_me:16452: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_func_curses_version=yes
     
    @@ -16378,14 +16464,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     fi
     rm -f core
     fi
    -echo "$as_me:16381: result: $cf_cv_func_curses_version" >&5
    +echo "$as_me:16467: result: $cf_cv_func_curses_version" >&5
     echo "${ECHO_T}$cf_cv_func_curses_version" >&6
     test "$cf_cv_func_curses_version" = yes &&
     cat >>confdefs.h <<\EOF
     #define HAVE_CURSES_VERSION 1
     EOF
     
    -echo "$as_me:16388: checking for alternate character set array" >&5
    +echo "$as_me:16474: checking for alternate character set array" >&5
     echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
     if test "${cf_cv_curses_acs_map+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -16395,7 +16481,7 @@ cf_cv_curses_acs_map=unknown
     for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
     do
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16398 "configure"
    +#line 16484 "configure"
     #include "confdefs.h"
     
     #include <${cf_cv_ncurses_header:-curses.h}>
    @@ -16411,16 +16497,16 @@ $name['k'] = ACS_PLUS
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16414: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16500: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16417: \$? = $ac_status" >&5
    +  echo "$as_me:16503: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16420: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16506: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16423: \$? = $ac_status" >&5
    +  echo "$as_me:16509: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_curses_acs_map=$name; break
     else
    @@ -16431,7 +16517,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     done
     
     fi
    -echo "$as_me:16434: result: $cf_cv_curses_acs_map" >&5
    +echo "$as_me:16520: result: $cf_cv_curses_acs_map" >&5
     echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
     
     test "$cf_cv_curses_acs_map" != unknown &&
    @@ -16441,7 +16527,7 @@ EOF
     
     if test "$cf_enable_widec" = yes; then
     
    -echo "$as_me:16444: checking for wide alternate character set array" >&5
    +echo "$as_me:16530: checking for wide alternate character set array" >&5
     echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
     if test "${cf_cv_curses_wacs_map+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -16451,7 +16537,7 @@ else
     	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
     	do
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 16454 "configure"
    +#line 16540 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -16467,16 +16553,16 @@ void *foo = &($name['k'])
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16470: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16556: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16473: \$? = $ac_status" >&5
    +  echo "$as_me:16559: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16476: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16562: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16479: \$? = $ac_status" >&5
    +  echo "$as_me:16565: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_curses_wacs_map=$name
     	 break
    @@ -16487,7 +16573,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     	done
     fi
    -echo "$as_me:16490: result: $cf_cv_curses_wacs_map" >&5
    +echo "$as_me:16576: result: $cf_cv_curses_wacs_map" >&5
     echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
     
     test "$cf_cv_curses_wacs_map" != unknown &&
    @@ -16495,7 +16581,7 @@ cat >>confdefs.h <&5
    +echo "$as_me:16584: checking for wide alternate character constants" >&5
     echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
     if test "${cf_cv_curses_wacs_symbols+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -16505,7 +16591,7 @@ cf_cv_curses_wacs_symbols=no
     if test "$cf_cv_curses_wacs_map" != unknown
     then
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 16508 "configure"
    +#line 16594 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -16522,16 +16608,16 @@ cchar_t *foo = WACS_PLUS;
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16525: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16611: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16528: \$? = $ac_status" >&5
    +  echo "$as_me:16614: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16531: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16534: \$? = $ac_status" >&5
    +  echo "$as_me:16620: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_curses_wacs_symbols=yes
     else
    @@ -16541,7 +16627,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     else
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 16544 "configure"
    +#line 16630 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -16557,16 +16643,16 @@ cchar_t *foo = WACS_PLUS
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:16646: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:16563: \$? = $ac_status" >&5
    +  echo "$as_me:16649: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:16566: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16652: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16569: \$? = $ac_status" >&5
    +  echo "$as_me:16655: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_curses_wacs_symbols=yes
     else
    @@ -16577,7 +16663,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
     
     fi
    -echo "$as_me:16580: result: $cf_cv_curses_wacs_symbols" >&5
    +echo "$as_me:16666: result: $cf_cv_curses_wacs_symbols" >&5
     echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
     
     test "$cf_cv_curses_wacs_symbols" != no &&
    @@ -16587,10 +16673,10 @@ EOF
     
     fi
     
    -echo "$as_me:16590: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
    +echo "$as_me:16676: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
     echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16593 "configure"
    +#line 16679 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -16608,16 +16694,16 @@ attr_t foo
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16611: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16614: \$? = $ac_status" >&5
    +  echo "$as_me:16700: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16620: \$? = $ac_status" >&5
    +  echo "$as_me:16706: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -16626,7 +16712,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -echo "$as_me:16629: result: $cf_result" >&5
    +echo "$as_me:16715: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     if test $cf_result = yes ; then
     
    @@ -16647,14 +16733,14 @@ fi
     if test "$cf_enable_widec" = yes; then
     
     # This is needed on Tru64 5.0 to declare mbstate_t
    -echo "$as_me:16650: checking if we must include wchar.h to declare mbstate_t" >&5
    +echo "$as_me:16736: checking if we must include wchar.h to declare mbstate_t" >&5
     echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
     if test "${cf_cv_mbstate_t+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16657 "configure"
    +#line 16743 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16672,23 +16758,23 @@ mbstate_t state
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16761: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16678: \$? = $ac_status" >&5
    +  echo "$as_me:16764: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16681: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16767: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16684: \$? = $ac_status" >&5
    +  echo "$as_me:16770: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_mbstate_t=no
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16691 "configure"
    +#line 16777 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16707,16 +16793,16 @@ mbstate_t value
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16710: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16796: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16713: \$? = $ac_status" >&5
    +  echo "$as_me:16799: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16716: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16802: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16719: \$? = $ac_status" >&5
    +  echo "$as_me:16805: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_mbstate_t=yes
     else
    @@ -16728,7 +16814,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     fi
    -echo "$as_me:16731: result: $cf_cv_mbstate_t" >&5
    +echo "$as_me:16817: result: $cf_cv_mbstate_t" >&5
     echo "${ECHO_T}$cf_cv_mbstate_t" >&6
     
     if test "$cf_cv_mbstate_t" = yes ; then
    @@ -16751,14 +16837,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
     fi
     
     # This is needed on Tru64 5.0 to declare wchar_t
    -echo "$as_me:16754: checking if we must include wchar.h to declare wchar_t" >&5
    +echo "$as_me:16840: checking if we must include wchar.h to declare wchar_t" >&5
     echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
     if test "${cf_cv_wchar_t+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16761 "configure"
    +#line 16847 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16776,23 +16862,23 @@ wchar_t state
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16782: \$? = $ac_status" >&5
    +  echo "$as_me:16868: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16785: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16788: \$? = $ac_status" >&5
    +  echo "$as_me:16874: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_wchar_t=no
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16795 "configure"
    +#line 16881 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16811,16 +16897,16 @@ wchar_t value
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16817: \$? = $ac_status" >&5
    +  echo "$as_me:16903: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16820: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16823: \$? = $ac_status" >&5
    +  echo "$as_me:16909: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_wchar_t=yes
     else
    @@ -16832,7 +16918,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     fi
    -echo "$as_me:16835: result: $cf_cv_wchar_t" >&5
    +echo "$as_me:16921: result: $cf_cv_wchar_t" >&5
     echo "${ECHO_T}$cf_cv_wchar_t" >&6
     
     if test "$cf_cv_wchar_t" = yes ; then
    @@ -16855,14 +16941,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
     fi
     
     # This is needed on Tru64 5.0 to declare wint_t
    -echo "$as_me:16858: checking if we must include wchar.h to declare wint_t" >&5
    +echo "$as_me:16944: checking if we must include wchar.h to declare wint_t" >&5
     echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
     if test "${cf_cv_wint_t+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
     else
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16865 "configure"
    +#line 16951 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16880,23 +16966,23 @@ wint_t state
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16883: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:16969: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16886: \$? = $ac_status" >&5
    +  echo "$as_me:16972: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:16975: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16892: \$? = $ac_status" >&5
    +  echo "$as_me:16978: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_wint_t=no
     else
       echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16899 "configure"
    +#line 16985 "configure"
     #include "confdefs.h"
     
     #include 
    @@ -16915,16 +17001,16 @@ wint_t value
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16918: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17004: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16921: \$? = $ac_status" >&5
    +  echo "$as_me:17007: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17010: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16927: \$? = $ac_status" >&5
    +  echo "$as_me:17013: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_cv_wint_t=yes
     else
    @@ -16936,7 +17022,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     fi
    -echo "$as_me:16939: result: $cf_cv_wint_t" >&5
    +echo "$as_me:17025: result: $cf_cv_wint_t" >&5
     echo "${ECHO_T}$cf_cv_wint_t" >&6
     
     if test "$cf_cv_wint_t" = yes ; then
    @@ -16960,10 +17046,10 @@ fi
     
     	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
     
    -echo "$as_me:16963: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
    +echo "$as_me:17049: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
     echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
    -#line 16966 "configure"
    +#line 17052 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -16981,16 +17067,16 @@ mbstate_t foo
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:16984: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17070: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:16987: \$? = $ac_status" >&5
    +  echo "$as_me:17073: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17076: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:16993: \$? = $ac_status" >&5
    +  echo "$as_me:17079: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -16999,7 +17085,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -echo "$as_me:17002: result: $cf_result" >&5
    +echo "$as_me:17088: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     if test $cf_result = yes ; then
     
    @@ -17021,10 +17107,10 @@ fi
     
     	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
     
    -echo "$as_me:17024: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
    +echo "$as_me:17110: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
     echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
    -#line 17027 "configure"
    +#line 17113 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -17042,16 +17128,16 @@ wchar_t foo
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17131: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17048: \$? = $ac_status" >&5
    +  echo "$as_me:17134: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17137: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17054: \$? = $ac_status" >&5
    +  echo "$as_me:17140: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -17060,7 +17146,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -echo "$as_me:17063: result: $cf_result" >&5
    +echo "$as_me:17149: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     if test $cf_result = yes ; then
     
    @@ -17082,10 +17168,10 @@ fi
     
     	if test "$NCURSES_OK_WINT_T" = 0 ; then
     
    -echo "$as_me:17085: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
    +echo "$as_me:17171: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
     echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
    -#line 17088 "configure"
    +#line 17174 "configure"
     #include "confdefs.h"
     
     #ifndef _XOPEN_SOURCE_EXTENDED
    @@ -17103,16 +17189,16 @@ wint_t foo
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:17106: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17109: \$? = $ac_status" >&5
    +  echo "$as_me:17195: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:17112: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17115: \$? = $ac_status" >&5
    +  echo "$as_me:17201: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -17121,7 +17207,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -echo "$as_me:17124: result: $cf_result" >&5
    +echo "$as_me:17210: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     if test $cf_result = yes ; then
     
    @@ -17149,11 +17235,11 @@ boolnames \
     boolfnames \
     ttytype
     do
    -echo "$as_me:17152: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
    +echo "$as_me:17238: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
     echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 17156 "configure"
    +#line 17242 "configure"
     #include "confdefs.h"
     
     #ifdef HAVE_XCURSES
    @@ -17181,16 +17267,16 @@ void *foo = &($cf_data)
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:17184: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17270: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17187: \$? = $ac_status" >&5
    +  echo "$as_me:17273: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:17190: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17276: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17193: \$? = $ac_status" >&5
    +  echo "$as_me:17279: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     
    @@ -17200,7 +17286,7 @@ cat conftest.$ac_ext >&5
     cf_result=no
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
    -echo "$as_me:17203: result: $cf_result" >&5
    +echo "$as_me:17289: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     
     if test $cf_result = yes ; then
    @@ -17212,14 +17298,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
     EOF
     
     else
    -	echo "$as_me:17215: checking for data $cf_data in library" >&5
    +	echo "$as_me:17301: checking for data $cf_data in library" >&5
     echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
     	# BSD linkers insist on making weak linkage, but resolve at runtime.
     	if test "$cross_compiling" = yes; then
     
     	# cross-compiling
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 17222 "configure"
    +#line 17308 "configure"
     #include "confdefs.h"
     
     #ifdef HAVE_XCURSES
    @@ -17252,16 +17338,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:17255: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:17341: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:17258: \$? = $ac_status" >&5
    +  echo "$as_me:17344: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:17261: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17347: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17264: \$? = $ac_status" >&5
    +  echo "$as_me:17350: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     else
    @@ -17273,7 +17359,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     
     else
       cat >conftest.$ac_ext <<_ACEOF
    -#line 17276 "configure"
    +#line 17362 "configure"
     #include "confdefs.h"
     
     #ifdef HAVE_XCURSES
    @@ -17299,15 +17385,15 @@ int main(void)
     }
     _ACEOF
     rm -f conftest$ac_exeext
    -if { (eval echo "$as_me:17302: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:17305: \$? = $ac_status" >&5
    +  echo "$as_me:17391: \$? = $ac_status" >&5
       (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    -  { (eval echo "$as_me:17307: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17393: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17310: \$? = $ac_status" >&5
    +  echo "$as_me:17396: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_result=yes
     
    @@ -17319,7 +17405,7 @@ cf_result=no
     fi
     rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     fi
    -	echo "$as_me:17322: result: $cf_result" >&5
    +	echo "$as_me:17408: result: $cf_result" >&5
     echo "${ECHO_T}$cf_result" >&6
     	if test $cf_result = yes ; then
     
    @@ -17336,7 +17422,7 @@ done
     
     if ( test "$GCC" = yes || test "$GXX" = yes )
     then
    -echo "$as_me:17339: checking if you want to turn on gcc warnings" >&5
    +echo "$as_me:17425: 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.
    @@ -17353,7 +17439,7 @@ else
     	with_warnings=no
     
     fi;
    -echo "$as_me:17356: result: $with_warnings" >&5
    +echo "$as_me:17442: result: $with_warnings" >&5
     echo "${ECHO_T}$with_warnings" >&6
     if test "$with_warnings" = "yes"
     then
    @@ -17376,10 +17462,10 @@ cat > conftest.i <&5
    +	{ echo "$as_me:17465: 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:17517: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17434: \$? = $ac_status" >&5
    +  echo "$as_me:17520: \$? = $ac_status" >&5
       (exit $ac_status); }; then
    -			test -n "$verbose" && echo "$as_me:17436: result: ... $cf_attribute" >&5
    +			test -n "$verbose" && echo "$as_me:17522: result: ... $cf_attribute" >&5
     echo "${ECHO_T}... $cf_attribute" >&6
     			cat conftest.h >>confdefs.h
     			case $cf_attribute in
    @@ -17497,12 +17583,12 @@ INTEL_COMPILER=no
     if test "$GCC" = yes ; then
     	case $host_os in
     	(linux*|gnu*)
    -		echo "$as_me:17500: checking if this is really Intel C compiler" >&5
    +		echo "$as_me:17586: checking if this is really Intel C compiler" >&5
     echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
     		cf_save_CFLAGS="$CFLAGS"
     		CFLAGS="$CFLAGS -no-gcc"
     		cat >conftest.$ac_ext <<_ACEOF
    -#line 17505 "configure"
    +#line 17591 "configure"
     #include "confdefs.h"
     
     int
    @@ -17519,16 +17605,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17608: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17525: \$? = $ac_status" >&5
    +  echo "$as_me:17611: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:17528: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17614: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17531: \$? = $ac_status" >&5
    +  echo "$as_me:17617: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       INTEL_COMPILER=yes
     cf_save_CFLAGS="$cf_save_CFLAGS -we147"
    @@ -17539,7 +17625,7 @@ cat conftest.$ac_ext >&5
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     		CFLAGS="$cf_save_CFLAGS"
    -		echo "$as_me:17542: result: $INTEL_COMPILER" >&5
    +		echo "$as_me:17628: result: $INTEL_COMPILER" >&5
     echo "${ECHO_T}$INTEL_COMPILER" >&6
     		;;
     	esac
    @@ -17548,12 +17634,12 @@ fi
     CLANG_COMPILER=no
     
     if test "$GCC" = yes ; then
    -	echo "$as_me:17551: checking if this is really Clang C compiler" >&5
    +	echo "$as_me:17637: checking if this is really Clang C compiler" >&5
     echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
     	cf_save_CFLAGS="$CFLAGS"
     	CFLAGS="$CFLAGS -Qunused-arguments"
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 17556 "configure"
    +#line 17642 "configure"
     #include "confdefs.h"
     
     int
    @@ -17570,16 +17656,16 @@ make an error
     }
     _ACEOF
     rm -f conftest.$ac_objext
    -if { (eval echo "$as_me:17573: \"$ac_compile\"") >&5
    +if { (eval echo "$as_me:17659: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17576: \$? = $ac_status" >&5
    +  echo "$as_me:17662: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest.$ac_objext'
    -  { (eval echo "$as_me:17579: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:17665: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17582: \$? = $ac_status" >&5
    +  echo "$as_me:17668: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       CLANG_COMPILER=yes
     cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
    @@ -17590,12 +17676,12 @@ cat conftest.$ac_ext >&5
     fi
     rm -f conftest.$ac_objext conftest.$ac_ext
     	CFLAGS="$cf_save_CFLAGS"
    -	echo "$as_me:17593: result: $CLANG_COMPILER" >&5
    +	echo "$as_me:17679: result: $CLANG_COMPILER" >&5
     echo "${ECHO_T}$CLANG_COMPILER" >&6
     fi
     
     cat > conftest.$ac_ext <&5
    +	{ echo "$as_me:17701: checking for $CC warning options..." >&5
     echo "$as_me: checking for $CC warning options..." >&6;}
     	cf_save_CFLAGS="$CFLAGS"
     	EXTRA_CFLAGS="-Wall"
    @@ -17628,12 +17714,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:17631: \"$ac_compile\"") >&5
    +		if { (eval echo "$as_me:17717: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17634: \$? = $ac_status" >&5
    +  echo "$as_me:17720: \$? = $ac_status" >&5
       (exit $ac_status); }; then
    -			test -n "$verbose" && echo "$as_me:17636: result: ... -$cf_opt" >&5
    +			test -n "$verbose" && echo "$as_me:17722: result: ... -$cf_opt" >&5
     echo "${ECHO_T}... -$cf_opt" >&6
     			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
     		fi
    @@ -17642,7 +17728,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
     
     elif test "$GCC" = yes
     then
    -	{ echo "$as_me:17645: checking for $CC warning options..." >&5
    +	{ echo "$as_me:17731: checking for $CC warning options..." >&5
     echo "$as_me: checking for $CC warning options..." >&6;}
     	cf_save_CFLAGS="$CFLAGS"
     	EXTRA_CFLAGS=
    @@ -17666,12 +17752,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
     		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
     	do
     		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    -		if { (eval echo "$as_me:17669: \"$ac_compile\"") >&5
    +		if { (eval echo "$as_me:17755: \"$ac_compile\"") >&5
       (eval $ac_compile) 2>&5
       ac_status=$?
    -  echo "$as_me:17672: \$? = $ac_status" >&5
    +  echo "$as_me:17758: \$? = $ac_status" >&5
       (exit $ac_status); }; then
    -			test -n "$verbose" && echo "$as_me:17674: result: ... -$cf_opt" >&5
    +			test -n "$verbose" && echo "$as_me:17760: result: ... -$cf_opt" >&5
     echo "${ECHO_T}... -$cf_opt" >&6
     			case $cf_opt in
     			(Wcast-qual)
    @@ -17682,7 +17768,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}:17685: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    +echo "${as_me:-configure}:17771: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
     
     					continue;;
     				esac
    @@ -17692,7 +17778,7 @@ echo "${as_me:-configure}:17685: 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}:17695: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    +echo "${as_me:-configure}:17781: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
     
     					continue;;
     				esac
    @@ -17708,7 +17794,7 @@ rm -rf conftest*
     fi
     fi
     
    -echo "$as_me:17711: checking if you want to use dmalloc for testing" >&5
    +echo "$as_me:17797: 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.
    @@ -17725,7 +17811,7 @@ EOF
     else
       with_dmalloc=
     fi;
    -echo "$as_me:17728: result: ${with_dmalloc:-no}" >&5
    +echo "$as_me:17814: result: ${with_dmalloc:-no}" >&5
     echo "${ECHO_T}${with_dmalloc:-no}" >&6
     
     case .$with_cflags in
    @@ -17839,23 +17925,23 @@ fi
     esac
     
     if test "$with_dmalloc" = yes ; then
    -	echo "$as_me:17842: checking for dmalloc.h" >&5
    +	echo "$as_me:17928: 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 17848 "configure"
    +#line 17934 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:17852: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:17938: \"$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:17858: \$? = $ac_status" >&5
    +  echo "$as_me:17944: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -17874,11 +17960,11 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:17877: result: $ac_cv_header_dmalloc_h" >&5
    +echo "$as_me:17963: 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:17881: checking for dmalloc_debug in -ldmalloc" >&5
    +echo "$as_me:17967: 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
    @@ -17886,7 +17972,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-ldmalloc  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 17889 "configure"
    +#line 17975 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -17905,16 +17991,16 @@ dmalloc_debug ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:17908: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:17994: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:17911: \$? = $ac_status" >&5
    +  echo "$as_me:17997: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:17914: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:18000: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:17917: \$? = $ac_status" >&5
    +  echo "$as_me:18003: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_dmalloc_dmalloc_debug=yes
     else
    @@ -17925,7 +18011,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:17928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    +echo "$as_me:18014: 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:18029: 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.
    @@ -17957,7 +18043,7 @@ EOF
     else
       with_dbmalloc=
     fi;
    -echo "$as_me:17960: result: ${with_dbmalloc:-no}" >&5
    +echo "$as_me:18046: result: ${with_dbmalloc:-no}" >&5
     echo "${ECHO_T}${with_dbmalloc:-no}" >&6
     
     case .$with_cflags in
    @@ -18071,23 +18157,23 @@ fi
     esac
     
     if test "$with_dbmalloc" = yes ; then
    -	echo "$as_me:18074: checking for dbmalloc.h" >&5
    +	echo "$as_me:18160: 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 18080 "configure"
    +#line 18166 "configure"
     #include "confdefs.h"
     #include 
     _ACEOF
    -if { (eval echo "$as_me:18084: \"$ac_cpp conftest.$ac_ext\"") >&5
    +if { (eval echo "$as_me:18170: \"$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:18090: \$? = $ac_status" >&5
    +  echo "$as_me:18176: \$? = $ac_status" >&5
       (exit $ac_status); } >/dev/null; then
       if test -s conftest.err; then
         ac_cpp_err=$ac_c_preproc_warn_flag
    @@ -18106,11 +18192,11 @@ else
     fi
     rm -f conftest.err conftest.$ac_ext
     fi
    -echo "$as_me:18109: result: $ac_cv_header_dbmalloc_h" >&5
    +echo "$as_me:18195: 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:18113: checking for debug_malloc in -ldbmalloc" >&5
    +echo "$as_me:18199: 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
    @@ -18118,7 +18204,7 @@ else
       ac_check_lib_save_LIBS=$LIBS
     LIBS="-ldbmalloc  $LIBS"
     cat >conftest.$ac_ext <<_ACEOF
    -#line 18121 "configure"
    +#line 18207 "configure"
     #include "confdefs.h"
     
     /* Override any gcc2 internal prototype to avoid an error.  */
    @@ -18137,16 +18223,16 @@ debug_malloc ();
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:18140: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:18226: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:18143: \$? = $ac_status" >&5
    +  echo "$as_me:18229: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:18146: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:18232: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:18149: \$? = $ac_status" >&5
    +  echo "$as_me:18235: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       ac_cv_lib_dbmalloc_debug_malloc=yes
     else
    @@ -18157,7 +18243,7 @@ fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_check_lib_save_LIBS
     fi
    -echo "$as_me:18160: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    +echo "$as_me:18246: 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:18261: 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.
    @@ -18189,7 +18275,7 @@ EOF
     else
       with_valgrind=
     fi;
    -echo "$as_me:18192: result: ${with_valgrind:-no}" >&5
    +echo "$as_me:18278: result: ${with_valgrind:-no}" >&5
     echo "${ECHO_T}${with_valgrind:-no}" >&6
     
     case .$with_cflags in
    @@ -18302,7 +18388,7 @@ fi
     	;;
     esac
     
    -echo "$as_me:18305: checking if you want to perform memory-leak testing" >&5
    +echo "$as_me:18391: 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.
    @@ -18312,7 +18398,7 @@ if test "${enable_leaks+set}" = set; then
     else
       : ${with_no_leaks:=no}
     fi;
    -echo "$as_me:18315: result: $with_no_leaks" >&5
    +echo "$as_me:18401: result: $with_no_leaks" >&5
     echo "${ECHO_T}$with_no_leaks" >&6
     
     if test "$with_no_leaks" = yes ; then
    @@ -18328,7 +18414,7 @@ EOF
     fi
     
     LD_RPATH_OPT=
    -echo "$as_me:18331: checking for an rpath option" >&5
    +echo "$as_me:18417: checking for an rpath option" >&5
     echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
     case $cf_cv_system_name in
     (irix*)
    @@ -18359,12 +18445,12 @@ case $cf_cv_system_name in
     (*)
     	;;
     esac
    -echo "$as_me:18362: result: $LD_RPATH_OPT" >&5
    +echo "$as_me:18448: result: $LD_RPATH_OPT" >&5
     echo "${ECHO_T}$LD_RPATH_OPT" >&6
     
     case "x$LD_RPATH_OPT" in
     (x-R*)
    -	echo "$as_me:18367: checking if we need a space after rpath option" >&5
    +	echo "$as_me:18453: checking if we need a space after rpath option" >&5
     echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
     	cf_save_LIBS="$LIBS"
     
    @@ -18385,7 +18471,7 @@ done
     LIBS="$cf_add_libs"
     
     	cat >conftest.$ac_ext <<_ACEOF
    -#line 18388 "configure"
    +#line 18474 "configure"
     #include "confdefs.h"
     
     int
    @@ -18397,16 +18483,16 @@ main (void)
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:18400: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:18403: \$? = $ac_status" >&5
    +  echo "$as_me:18489: \$? = $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:18492: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:18409: \$? = $ac_status" >&5
    +  echo "$as_me:18495: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_rpath_space=no
     else
    @@ -18416,13 +18502,13 @@ cf_rpath_space=yes
     fi
     rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     	LIBS="$cf_save_LIBS"
    -	echo "$as_me:18419: result: $cf_rpath_space" >&5
    +	echo "$as_me:18505: result: $cf_rpath_space" >&5
     echo "${ECHO_T}$cf_rpath_space" >&6
     	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
     	;;
     esac
     
    -echo "$as_me:18425: checking if rpath-hack should be disabled" >&5
    +echo "$as_me:18511: checking if rpath-hack should be disabled" >&5
     echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
     
     # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
    @@ -18439,21 +18525,21 @@ else
     	cf_disable_rpath_hack=no
     
     fi;
    -echo "$as_me:18442: result: $cf_disable_rpath_hack" >&5
    +echo "$as_me:18528: result: $cf_disable_rpath_hack" >&5
     echo "${ECHO_T}$cf_disable_rpath_hack" >&6
     if test "$cf_disable_rpath_hack" = no ; then
     
    -echo "$as_me:18446: checking for updated LDFLAGS" >&5
    +echo "$as_me:18532: checking for updated LDFLAGS" >&5
     echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
     if test -n "$LD_RPATH_OPT" ; then
    -	echo "$as_me:18449: result: maybe" >&5
    +	echo "$as_me:18535: result: maybe" >&5
     echo "${ECHO_T}maybe" >&6
     
     	for ac_prog in ldd
     do
       # Extract the first word of "$ac_prog", so it can be a program name with args.
     set dummy $ac_prog; ac_word=$2
    -echo "$as_me:18456: checking for $ac_word" >&5
    +echo "$as_me:18542: checking for $ac_word" >&5
     echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
       echo $ECHO_N "(cached) $ECHO_C" >&6
    @@ -18468,7 +18554,7 @@ for ac_dir in $ac_dummy; do
       test -z "$ac_dir" && ac_dir=.
       $as_executable_p "$ac_dir/$ac_word" || continue
     ac_cv_prog_cf_ldd_prog="$ac_prog"
    -echo "$as_me:18471: found $ac_dir/$ac_word" >&5
    +echo "$as_me:18557: found $ac_dir/$ac_word" >&5
     break
     done
     
    @@ -18476,10 +18562,10 @@ fi
     fi
     cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
     if test -n "$cf_ldd_prog"; then
    -  echo "$as_me:18479: result: $cf_ldd_prog" >&5
    +  echo "$as_me:18565: result: $cf_ldd_prog" >&5
     echo "${ECHO_T}$cf_ldd_prog" >&6
     else
    -  echo "$as_me:18482: result: no" >&5
    +  echo "$as_me:18568: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -18493,7 +18579,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
     		cf_rpath_oops=
     
     cat >conftest.$ac_ext <<_ACEOF
    -#line 18496 "configure"
    +#line 18582 "configure"
     #include "confdefs.h"
     #include 
     int
    @@ -18505,16 +18591,16 @@ printf("Hello");
     }
     _ACEOF
     rm -f conftest.$ac_objext conftest$ac_exeext
    -if { (eval echo "$as_me:18508: \"$ac_link\"") >&5
    +if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
       (eval $ac_link) 2>&5
       ac_status=$?
    -  echo "$as_me:18511: \$? = $ac_status" >&5
    +  echo "$as_me:18597: \$? = $ac_status" >&5
       (exit $ac_status); } &&
              { ac_try='test -s conftest$ac_exeext'
    -  { (eval echo "$as_me:18514: \"$ac_try\"") >&5
    +  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
       (eval $ac_try) 2>&5
       ac_status=$?
    -  echo "$as_me:18517: \$? = $ac_status" >&5
    +  echo "$as_me:18603: \$? = $ac_status" >&5
       (exit $ac_status); }; }; then
       cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
     		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
    @@ -18542,7 +18628,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     					then
     						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
     
    -echo "${as_me:-configure}:18545: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
    +echo "${as_me:-configure}:18631: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
     
     						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
     						break
    @@ -18554,11 +18640,11 @@ echo "${as_me:-configure}:18545: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
     
     	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
     
    -echo "${as_me:-configure}:18557: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    +echo "${as_me:-configure}:18643: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     
     test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
     
    -echo "${as_me:-configure}:18561: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    +echo "${as_me:-configure}:18647: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
     
     cf_rpath_dst=
     for cf_rpath_src in $LDFLAGS
    @@ -18595,7 +18681,7 @@ do
     			then
     				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
     
    -echo "${as_me:-configure}:18598: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
    +echo "${as_me:-configure}:18684: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
     
     				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
     			fi
    @@ -18608,11 +18694,11 @@ LDFLAGS=$cf_rpath_dst
     
     test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
     
    -echo "${as_me:-configure}:18611: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    +echo "${as_me:-configure}:18697: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
     
     test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
     
    -echo "${as_me:-configure}:18615: testing ...checking LIBS $LIBS ..." 1>&5
    +echo "${as_me:-configure}:18701: testing ...checking LIBS $LIBS ..." 1>&5
     
     cf_rpath_dst=
     for cf_rpath_src in $LIBS
    @@ -18649,7 +18735,7 @@ do
     			then
     				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
     
    -echo "${as_me:-configure}:18652: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
    +echo "${as_me:-configure}:18738: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
     
     				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
     			fi
    @@ -18662,14 +18748,14 @@ LIBS=$cf_rpath_dst
     
     test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
     
    -echo "${as_me:-configure}:18665: testing ...checked LIBS $LIBS ..." 1>&5
    +echo "${as_me:-configure}:18751: testing ...checked LIBS $LIBS ..." 1>&5
     
     	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
     
    -echo "${as_me:-configure}:18669: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    +echo "${as_me:-configure}:18755: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     
     else
    -	echo "$as_me:18672: result: no" >&5
    +	echo "$as_me:18758: result: no" >&5
     echo "${ECHO_T}no" >&6
     fi
     
    @@ -18759,7 +18845,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:18762: creating $CONFIG_STATUS" >&5
    +{ echo "$as_me:18848: creating $CONFIG_STATUS" >&5
     echo "$as_me: creating $CONFIG_STATUS" >&6;}
     cat >$CONFIG_STATUS <<_ACEOF
     #! $SHELL
    @@ -18935,7 +19021,7 @@ cat >>$CONFIG_STATUS <<\EOF
         echo "$ac_cs_version"; exit 0 ;;
       --he | --h)
         # Conflict between --help and --header
    -    { { echo "$as_me:18938: error: ambiguous option: $1
    +    { { echo "$as_me:19024: 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;}
    @@ -18954,7 +19040,7 @@ Try \`$0 --help' for more information." >&2;}
         ac_need_defaults=false;;
     
       # This is an error.
    -  -*) { { echo "$as_me:18957: error: unrecognized option: $1
    +  -*) { { echo "$as_me:19043: 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;}
    @@ -19004,7 +19090,7 @@ do
       "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
       "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
       "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
    -  *) { { echo "$as_me:19007: error: invalid argument: $ac_config_target" >&5
    +  *) { { echo "$as_me:19093: error: invalid argument: $ac_config_target" >&5
     echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
        { (exit 1); exit 1; }; };;
       esac
    @@ -19160,6 +19246,8 @@ s,@X_LIBS@,$X_LIBS,;t t
     s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
     s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t
     s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t
    +s,@RGB_PATH@,$RGB_PATH,;t t
    +s,@no_x11_rgb@,$no_x11_rgb,;t t
     s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
     s,@cf_ldd_prog@,$cf_ldd_prog,;t t
     s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
    @@ -19295,7 +19383,7 @@ done; }
       esac
     
       if test x"$ac_file" != x-; then
    -    { echo "$as_me:19298: creating $ac_file" >&5
    +    { echo "$as_me:19386: creating $ac_file" >&5
     echo "$as_me: creating $ac_file" >&6;}
         rm -f "$ac_file"
       fi
    @@ -19313,7 +19401,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:19316: error: cannot find input file: $f" >&5
    +         test -f "$f" || { { echo "$as_me:19404: error: cannot find input file: $f" >&5
     echo "$as_me: error: cannot find input file: $f" >&2;}
        { (exit 1); exit 1; }; }
              echo $f;;
    @@ -19326,7 +19414,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
                echo $srcdir/$f
              else
                # /dev/null tree
    -           { { echo "$as_me:19329: error: cannot find input file: $f" >&5
    +           { { echo "$as_me:19417: error: cannot find input file: $f" >&5
     echo "$as_me: error: cannot find input file: $f" >&2;}
        { (exit 1); exit 1; }; }
              fi;;
    @@ -19342,7 +19430,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:19345: WARNING: datarootdir was used implicitly but not set:
    +          { echo "$as_me:19433: 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;}
    @@ -19351,7 +19439,7 @@ $ac_seen" >&2;}
           fi
           ac_seen=`grep '${datarootdir}' $ac_item`
           if test -n "$ac_seen"; then
    -        { echo "$as_me:19354: WARNING: datarootdir was used explicitly but not set:
    +        { echo "$as_me:19442: 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;}
    @@ -19388,7 +19476,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:19391: WARNING: Variable $ac_name is used but was not set:
    +              { echo "$as_me:19479: 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;}
    @@ -19399,7 +19487,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:19402: WARNING: Some variables may not be substituted:
    +      { echo "$as_me:19490: WARNING: Some variables may not be substituted:
     $ac_seen" >&5
     echo "$as_me: WARNING: Some variables may not be substituted:
     $ac_seen" >&2;}
    @@ -19448,7 +19536,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:19451: creating $ac_file" >&5
    +  test x"$ac_file" != x- && { echo "$as_me:19539: creating $ac_file" >&5
     echo "$as_me: creating $ac_file" >&6;}
     
       # First look for the input files in the build tree, otherwise in the
    @@ -19459,7 +19547,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:19462: error: cannot find input file: $f" >&5
    +         test -f "$f" || { { echo "$as_me:19550: error: cannot find input file: $f" >&5
     echo "$as_me: error: cannot find input file: $f" >&2;}
        { (exit 1); exit 1; }; }
              echo $f;;
    @@ -19472,7 +19560,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
                echo $srcdir/$f
              else
                # /dev/null tree
    -           { { echo "$as_me:19475: error: cannot find input file: $f" >&5
    +           { { echo "$as_me:19563: error: cannot find input file: $f" >&5
     echo "$as_me: error: cannot find input file: $f" >&2;}
        { (exit 1); exit 1; }; }
              fi;;
    @@ -19530,7 +19618,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:19533: $ac_file is unchanged" >&5
    +      { echo "$as_me:19621: $ac_file is unchanged" >&5
     echo "$as_me: $ac_file is unchanged" >&6;}
         else
           ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    diff --git a/test/configure.in b/test/configure.in
    index 49298f51..77d5c155 100644
    --- a/test/configure.in
    +++ b/test/configure.in
    @@ -28,7 +28,7 @@ dnl***************************************************************************
     dnl
     dnl Author: Thomas E. Dickey 1996-on
     dnl
    -dnl $Id: configure.in,v 1.143 2017/09/30 00:00:56 tom Exp $
    +dnl $Id: configure.in,v 1.144 2017/11/25 21:24:23 tom Exp $
     dnl This is a simple configuration-script for the ncurses test programs that
     dnl allows the test-directory to be separately configured against a reference
     dnl system (i.e., sysvr4 curses)
    @@ -137,6 +137,8 @@ case $cf_cv_screen in
     	;;
     esac
     
    +CF_WITH_X11_RGB
    +
     dnl If we've not specified a library, assume we're using sysvr4 libraries
     dnl installed conventionally (e.g., SunOS 5.x - solaris).
     
    diff --git a/test/demo_menus.c b/test/demo_menus.c
    index c9e1b55a..61c69dae 100644
    --- a/test/demo_menus.c
    +++ b/test/demo_menus.c
    @@ -26,7 +26,7 @@
      * authorization.                                                           *
      ****************************************************************************/
     /*
    - * $Id: demo_menus.c,v 1.64 2017/06/24 14:21:52 tom Exp $
    + * $Id: demo_menus.c,v 1.65 2017/11/24 21:03:30 tom Exp $
      *
      * Demonstrate a variety of functions from the menu library.
      * Thomas Dickey - 2005/4/9
    @@ -192,9 +192,9 @@ menu_offset(MenuNo number)
         int result = 0;
     
         if (okMenuNo(number)) {
    -	int spc_desc, spc_rows, spc_cols;
    -
    +	int spc_rows;
     #ifdef NCURSES_VERSION
    +	int spc_desc, spc_cols;
     	menu_spacing(mpBanner, &spc_desc, &spc_rows, &spc_cols);
     #else
     	spc_rows = 0;
    diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
    index 7de1919e..ab1c22c4 100644
    --- a/test/demo_terminfo.c
    +++ b/test/demo_terminfo.c
    @@ -29,7 +29,7 @@
     /*
      * Author: Thomas E. Dickey
      *
    - * $Id: demo_terminfo.c,v 1.47 2017/04/09 00:27:42 tom Exp $
    + * $Id: demo_terminfo.c,v 1.48 2017/11/24 20:49:11 tom Exp $
      *
      * A simple demo of the terminfo interface.
      */
    @@ -69,8 +69,10 @@ static bool f_opt = FALSE;
     static bool n_opt = FALSE;
     static bool q_opt = FALSE;
     static bool s_opt = FALSE;
    +#ifdef NCURSES_VERSION
     static bool x_opt = FALSE;
     static bool y_opt = FALSE;
    +#endif
     
     static char *d_opt;
     static char *e_opt;
    diff --git a/test/dots.c b/test/dots.c
    index 8e500094..07934237 100644
    --- a/test/dots.c
    +++ b/test/dots.c
    @@ -29,7 +29,7 @@
     /*
      * Author: Thomas E. Dickey  1999
      *
    - * $Id: dots.c,v 1.32 2017/10/22 15:20:57 tom Exp $
    + * $Id: dots.c,v 1.33 2017/11/24 19:26:31 tom Exp $
      *
      * A simple demo of the terminfo interface.
      */
    @@ -117,7 +117,9 @@ usage(void)
     	,""
     	,"Options:"
     	," -T TERM  override $TERM"
    +#if HAVE_USE_ENV
     	," -e       allow environment $LINES / $COLUMNS"
    +#endif
     	," -f       use tigetnum rather than  mapping"
     	," -m SIZE  set margin (default: 2)"
     	," -s MSECS delay 1% of the time (default: 1 msecs)"
    @@ -147,9 +149,11 @@ main(int argc,
     	case 'T':
     	    putenv(strcat(strcpy(malloc(6 + strlen(optarg)), "TERM="), optarg));
     	    break;
    +#if HAVE_USE_ENV
     	case 'e':
     	    use_env(TRUE);
     	    break;
    +#endif
     	case 'f':
     	    f_option = 1;
     	    break;
    diff --git a/test/dots_curses.c b/test/dots_curses.c
    index e8c452cf..a2025cbe 100644
    --- a/test/dots_curses.c
    +++ b/test/dots_curses.c
    @@ -29,7 +29,7 @@
     /*
      * Author: Thomas E. Dickey
      *
    - * $Id: dots_curses.c,v 1.11 2017/10/30 22:22:22 tom Exp $
    + * $Id: dots_curses.c,v 1.12 2017/11/24 19:25:28 tom Exp $
      *
      * A simple demo of the curses interface used for comparison with termcap.
      */
    @@ -96,7 +96,9 @@ usage(void)
     #if HAVE_USE_DEFAULT_COLORS
     	," -d       invoke use_default_colors()"
     #endif
    +#if HAVE_USE_ENV
     	," -e       allow environment $LINES / $COLUMNS"
    +#endif
     	," -m SIZE  set margin (default: 2)"
     	," -s MSECS delay 1% of the time (default: 1 msecs)"
         };
    diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
    index 78b54dc7..7dfae824 100644
    --- a/test/dots_mvcur.c
    +++ b/test/dots_mvcur.c
    @@ -29,7 +29,7 @@
     /*
      * Author: Thomas E. Dickey - 2007
      *
    - * $Id: dots_mvcur.c,v 1.18 2017/10/22 15:22:43 tom Exp $
    + * $Id: dots_mvcur.c,v 1.19 2017/11/24 19:26:31 tom Exp $
      *
      * A simple demo of the terminfo interface, and mvcur.
      */
    @@ -118,7 +118,9 @@ usage(void)
     	,""
     	,"Options:"
     	," -T TERM  override $TERM"
    +#if HAVE_USE_ENV
     	," -e       allow environment $LINES / $COLUMNS"
    +#endif
     	," -f       use tigetnum rather than  mapping"
     	," -m SIZE  set margin (default: 2)"
     	," -s MSECS delay 1% of the time (default: 1 msecs)"
    @@ -150,9 +152,11 @@ main(int argc GCC_UNUSED,
     	case 'T':
     	    putenv(strcat(strcpy(malloc(6 + strlen(optarg)), "TERM="), optarg));
     	    break;
    +#if HAVE_USE_ENV
     	case 'e':
     	    use_env(TRUE);
     	    break;
    +#endif
     	case 'f':
     	    f_option = 1;
     	    break;
    diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
    index 6ccd265a..ef077ab2 100644
    --- a/test/dots_xcurses.c
    +++ b/test/dots_xcurses.c
    @@ -29,7 +29,7 @@
     /*
      * Author: Thomas E. Dickey
      *
    - * $Id: dots_xcurses.c,v 1.12 2017/10/30 22:06:10 tom Exp $
    + * $Id: dots_xcurses.c,v 1.13 2017/11/24 19:25:45 tom Exp $
      *
      * A simple demo of the wide-curses interface used for comparison with termcap.
      */
    @@ -119,7 +119,9 @@ usage(void)
     #if HAVE_USE_DEFAULT_COLORS
     	," -d       invoke use_default_colors()"
     #endif
    +#if HAVE_USE_ENV
     	," -e       allow environment $LINES / $COLUMNS"
    +#endif
     	," -m SIZE  set margin (default: 2)"
     	," -s MSECS delay 1% of the time (default: 1 msecs)"
     #if HAVE_ALLOC_PAIR
    @@ -159,9 +161,11 @@ main(int argc, char *argv[])
     	    d_option = TRUE;
     	    break;
     #endif
    +#if HAVE_USE_ENV
     	case 'e':
     	    use_env(TRUE);
     	    break;
    +#endif
     	case 'm':
     	    m_option = atoi(optarg);
     	    break;
    diff --git a/test/ncurses.c b/test/ncurses.c
    index ab842ff5..86a842c3 100644
    --- a/test/ncurses.c
    +++ b/test/ncurses.c
    @@ -40,7 +40,7 @@ AUTHOR
        Author: Eric S. Raymond  1993
                Thomas E. Dickey (beginning revision 1.27 in 1996).
     
    -$Id: ncurses.c,v 1.502 2017/11/02 20:46:06 tom Exp $
    +$Id: ncurses.c,v 1.504 2017/11/24 20:51:18 tom Exp $
     
     ***************************************************************************/
     
    @@ -355,6 +355,7 @@ wGet_wchar(WINDOW *win, wint_t *result)
     #define Get_wchar(result) wGet_wchar(stdscr, result)
     
     /* replaces wgetn_wstr(), since we want to be able to edit values */
    +#if USE_SOFTKEYS
     static void
     wGet_wstring(WINDOW *win, wchar_t *buffer, int limit)
     {
    @@ -460,8 +461,9 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit)
         wmove(win, y0, x0);
         noecho();
     }
    +#endif /* USE_SOFTKEYS */
     
    -#endif
    +#endif /* USE_WIDEC_SUPPORT */
     
     static void
     Pause(void)
    @@ -7714,7 +7716,7 @@ main_menu(bool top)
     #if USE_LIBMENU
     	CMDS(TRUE, ONLY(menu_test),	'm', "exercise menu library"),
     #endif
    -#if USE_LIBMENU
    +#if USE_LIBPANEL
     	CMDS(TRUE, BOTH(panel_test),	'o', "exercise panel library"),
     #endif
     #if HAVE_NEWPAD
    diff --git a/test/picsmap.c b/test/picsmap.c
    index be8903ab..597f4a82 100644
    --- a/test/picsmap.c
    +++ b/test/picsmap.c
    @@ -26,7 +26,7 @@
      * authorization.                                                           *
      ****************************************************************************/
     /*
    - * $Id: picsmap.c,v 1.108 2017/11/19 02:56:12 tom Exp $
    + * $Id: picsmap.c,v 1.112 2017/11/26 00:10:57 tom Exp $
      *
      * Author: Thomas E. Dickey
      *
    @@ -76,7 +76,9 @@
     #define Scaled256(n)	(NCURSES_COLOR_T) (int)(((n) * 1000.0) / 256)
     #define ScaledColor(n)	(NCURSES_COLOR_T) (int)(((n) * 1000.0) / scale)
     
    +#ifndef RGB_PATH
     #define RGB_PATH "/etc/X11/rgb.txt"
    +#endif
     
     #include 
     
    @@ -112,6 +114,7 @@ static void warning(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
     static int gather_c_values(int);
     
     static FILE *logfp = 0;
    +static double aspect_ratio = 0.6;
     static bool in_curses = FALSE;
     static bool debugging = FALSE;
     static bool quiet = FALSE;
    @@ -452,9 +455,10 @@ read_file(const char *filename)
     		    for (j = 0; (size_t) j < size; ++j) {
     			if (blob[j] == '\0' ||
     			    (UChar(blob[j]) < 32 &&
    -			     !isspace(blob[j])) ||
    -			    (UChar(blob[j]) >= 128 && UChar(blob[j]) < 160))
    +			     !isspace(UChar(blob[j]))) ||
    +			    (UChar(blob[j]) >= 128 && UChar(blob[j]) < 160)) {
     			    binary = TRUE;
    +			}
     			if (blob[j] == '\n') {
     			    blob[j] = '\0';
     			    if (k && !binary) {
    @@ -497,6 +501,7 @@ usage(void)
     	,"Read/display one or more xbm/xpm files (possibly use \"convert\")"
     	,""
     	,"Options:"
    +	,"  -a ratio     aspect-ratio correction for ImageMagick"
     #if HAVE_USE_DEFAULT_COLORS
     	,"  -d           invoke use_default_colors"
     #endif
    @@ -1277,7 +1282,7 @@ parse_img(const char *filename)
     		isspace(UChar(buffer[n])) &&
     		sscanf(skip_word(buffer + n), " %dx%d ", &pic_x, &pic_y) == 2) {
     		/* distort image to make it show normally on terminal */
    -		pic_x = (166 * pic_x) / 100;
    +		pic_x = (int) ((double) pic_x / aspect_ratio);
     	    } else {
     		pic_x = pic_y = 0;
     	    }
    @@ -1634,11 +1639,20 @@ main(int argc, char *argv[])
     {
         int n;
         int opt_d = FALSE;
    +    char ignore_ch;
         const char *palette_path = 0;
    -    const char *rgb_path = "/etc/X11/rgb.txt";
    +    const char *rgb_path = RGB_PATH;
     
    -    while ((n = getopt(argc, argv, "dLl:p:qr:s:x:")) != -1) {
    +    while ((n = getopt(argc, argv, "a:dLl:p:qr:s:x:")) != -1) {
     	switch (n) {
    +	case 'a':
    +	    if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1
    +		|| aspect_ratio < 0.1
    +		|| aspect_ratio > 10.) {
    +		fprintf(stderr, "Expected a number in [0.1 to 10.]: %s\n", optarg);
    +		usage();
    +	    }
    +	    break;
     #if HAVE_USE_DEFAULT_COLORS
     	case 'd':
     	    opt_d = TRUE;
    -- 
    2.44.0