Changeset c5ae37b


Ignore:
Timestamp:
Dec 29, 2008, 8:15:49 PM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
a039cd4
Parents:
386216c
Message:

Updated Ncurses Patch to -2

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r386216c rc5ae37b  
    5959        <listitem>
    6060          <para>[Jim] - Updated Readline Patch to -5.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[Jim] - Updated Ncurses Patch to -2.</para>
    6164        </listitem>
    6265      </itemizedlist>

  • BOOK/patches.ent

    r386216c rc5ae37b  
    5757<!ENTITY ncurses-bashfix-patch-size "4 KB">
    5858
    59 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-1.patch">
    60 <!ENTITY ncurses-branch_update-patch-md5 "a45276c1d6063a188a75e20f1f97e7b5">
    61 <!ENTITY ncurses-branch_update-patch-size "432 KB">
     59<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-2.patch">
     60<!ENTITY ncurses-branch_update-patch-md5 "717d73995a63857228fb9a6a99768d2a">
     61<!ENTITY ncurses-branch_update-patch-size "508 KB">
    6262
    6363<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">

  • patches/ncurses-5.7-branch_update-2.patch

    r386216c rc5ae37b  
    11Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
    2 Date: 12-20-2008
     2Date: 12-29-2008
    33Initial Package Version: 5.7
    44Origin: Upstream
    55Upstream Status: Applied
    66Description: This is a branch update for NCurses-5.7, and should be
    7              rechecked periodically. This patch covers up to 5.7-20081213.
     7             rechecked periodically. This patch covers up to 5.7-20081227.
    88
    99diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    1010--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    11 +++ ncurses-5.7/Ada95/samples/Makefile.in       2008-12-20 14:47:10.000000000 -0800
     11+++ ncurses-5.7/Ada95/samples/Makefile.in       2008-12-29 20:11:45.000000000 -0800
    1212@@ -1,5 +1,5 @@
    1313 ##############################################################################
    … …  
    3737diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    3838--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    39 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2008-12-20 14:47:10.000000000 -0800
     39+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2008-12-29 20:11:45.000000000 -0800
    4040@@ -35,8 +35,8 @@
    4141 ------------------------------------------------------------------------------
    … …  
    6060diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    6161--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    62 +++ ncurses-5.7/INSTALL 2008-12-20 14:47:08.000000000 -0800
     62+++ ncurses-5.7/INSTALL 2008-12-29 20:11:42.000000000 -0800
    6363@@ -25,7 +25,7 @@
    6464 -- sale, use or other dealings in this Software without prior written        --
    … …  
    8282diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    8383--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    84 +++ ncurses-5.7/MANIFEST        2008-12-20 14:47:08.000000000 -0800
     84+++ ncurses-5.7/MANIFEST        2008-12-29 20:11:58.000000000 -0800
    8585@@ -640,6 +640,7 @@
    8686 ./man/ncurses.3x
    … …  
    9999 ./progs/toe.c
    100100 ./progs/tput.c
     101@@ -963,6 +965,7 @@
     102 ./test/cardfile.c
     103 ./test/cardfile.dat
     104 ./test/chgat.c
     105+./test/clip_printw.c
     106 ./test/color_set.c
     107 ./test/configure
     108 ./test/configure.in
     109@@ -990,6 +993,7 @@
     110 ./test/inch_wide.c
     111 ./test/inchs.c
     112 ./test/ins_wide.c
     113+./test/insdelln.c
     114 ./test/inserts.c
     115 ./test/key_names.c
     116 ./test/keynames.c
    101117diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    102118--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    103 +++ ncurses-5.7/NEWS    2008-12-20 14:47:16.000000000 -0800
     119+++ ncurses-5.7/NEWS    2008-12-29 20:12:06.000000000 -0800
    104120@@ -25,7 +25,7 @@
    105121 -- sale, use or other dealings in this Software without prior written        --
    … …  
    107123 -------------------------------------------------------------------------------
    108124--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    109 +-- $Id: NEWS,v 1.1339 2008/12/13 21:02:18 tom Exp $
     125+-- $Id: NEWS,v 1.1344 2008/12/28 01:14:55 tom Exp $
    110126 -------------------------------------------------------------------------------
    111127 
    112128 This is a log of changes that ncurses has gone through since Zeyd started
    113 @@ -45,6 +45,62 @@
     129@@ -45,6 +45,75 @@
    114130 Changes through 1.9.9e did not credit all contributions;
    115131 it is not possible to add this information.
    116132 
     133+20081227
     134+       + modify mk-1st.awk to work with extra categories for tinfo library.
     135+       + modify configure script to allow building shared libraries with gcc
     136+         on AIX 5 or 6 (adapted from patch by Lital Natan).
     137+
     138+20081220
     139+       + modify to omit the opaque-functions from lib_gen.o when
     140+         --disable-ext-funcs is used.
     141+       + add test/clip_printw.c to illustrate how to use printw without
     142+         wrapping.
     143+       + modify ncurses 'F' test to demo wborder_set() with colored lines.
     144+       + modify ncurses 'f' test to demo wborder() with colored lines.
     145+
    117146+20081213
    118147+       + add check for failure to open hashed-database needed for db4.6
    … …  
    176205diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    177206--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    178 +++ ncurses-5.7/TO-DO   2008-12-20 14:47:12.000000000 -0800
     207+++ ncurses-5.7/TO-DO   2008-12-29 20:11:47.000000000 -0800
    179208@@ -25,7 +25,7 @@
    180209 -- sale, use or other dealings in this Software without prior written        --
    … …  
    254283diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    255284--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    256 +++ ncurses-5.7/aclocal.m4      2008-12-20 14:47:16.000000000 -0800
     285+++ ncurses-5.7/aclocal.m4      2008-12-29 20:12:06.000000000 -0800
    257286@@ -28,7 +28,7 @@
    258287 dnl
    … …  
    260289 dnl
    261290-dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
    262 +dnl $Id: aclocal.m4,v 1.475 2008/12/13 21:19:44 tom Exp $
     291+dnl $Id: aclocal.m4,v 1.477 2008/12/27 17:35:01 tom Exp $
    263292 dnl Macros used in NCURSES auto-configuration script.
    264293 dnl
    265294 dnl These macros are maintained separately from NCURSES.  The copyright on
    266 @@ -1998,11 +1998,31 @@
     295@@ -168,7 +168,7 @@
     296 
     297 ])dnl
     298 dnl ---------------------------------------------------------------------------
     299-dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
     300+dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
     301 dnl -------------
     302 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
     303 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
     304@@ -195,7 +195,7 @@
     305                fi
     306 
     307                if test "$cf_have_incdir" = no ; then
     308-          if test "$cf_add_incdir" = /usr/local/include ; then
     309+                 if test "$cf_add_incdir" = /usr/local/include ; then
     310                        if test "$GCC" = yes
     311                        then
     312                          cf_save_CPPFLAGS=$CPPFLAGS
     313@@ -213,9 +213,9 @@
     314                  CF_VERBOSE(adding $cf_add_incdir to include-path)
     315                  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
     316 
     317-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     318-          test "$cf_top_incdir" = "$cf_add_incdir" && break
     319-          cf_add_incdir="$cf_top_incdir"
     320+                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     321+                 test "$cf_top_incdir" = "$cf_add_incdir" && break
     322+                 cf_add_incdir="$cf_top_incdir"
     323                else
     324                  break
     325                fi
     326@@ -353,7 +353,7 @@
     327 fi
     328 ])dnl
     329 dnl ---------------------------------------------------------------------------
     330-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
     331+dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
     332 dnl -----------------
     333 dnl Check if awk can handle big strings using printf.  Some older versions of
     334 dnl awk choke on large strings passed via "%s".
     335@@ -362,19 +362,19 @@
     336 dnl $2 = variable to set with result
     337 AC_DEFUN([CF_AWK_BIG_PRINTF],
     338 [
     339-    case x$AWK in #(vi
     340-    x)
     341-        eval $2=no
     342-        ;;
     343-    *) #(vi
     344-        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
     345-            | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
     346-            eval $2=yes
     347-        else
     348-            eval $2=no
     349-        fi
     350-        ;;
     351-    esac
     352+       case x$AWK in #(vi
     353+       x)
     354+               eval $2=no
     355+               ;;
     356+       *) #(vi
     357+               if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
     358+                       | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
     359+                       eval $2=yes
     360+               else
     361+                       eval $2=no
     362+               fi
     363+               ;;
     364+       esac
     365 ])dnl
     366 dnl ---------------------------------------------------------------------------
     367 dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
     368@@ -1019,7 +1019,7 @@
     369 CXXFLAGS="$cf_save_CXXFLAGS"
     370 ])
     371 dnl ---------------------------------------------------------------------------
     372-dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
     373+dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
     374 dnl ---------------
     375 dnl Find a library (specifically the linkage used in the code fragment),
     376 dnl searching for it if it is not already in the library path.
     377@@ -1052,6 +1052,7 @@
     378     cf_cv_find_linkage_$3=yes,[
     379     cf_cv_find_linkage_$3=no
     380 
     381+    CF_VERBOSE(find linkage for $3 library)
     382     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
     383 
     384     cf_save_CPPFLAGS="$CPPFLAGS"
     385@@ -1998,11 +1999,31 @@
    267386 ])
    268387 ])dnl
    … …  
    299418 test "$includedir" != "/usr/include" && \
    300419 test -d "$includedir" && {
    301 @@ -2017,6 +2037,7 @@
     420@@ -2017,6 +2038,7 @@
    302421        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
    303422 }
    … …  
    307426 dnl ---------------------------------------------------------------------------
    308427 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
    309 @@ -2193,11 +2214,33 @@
     428@@ -2143,7 +2165,7 @@
     429 ])
     430 ])
     431 dnl ---------------------------------------------------------------------------
     432-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
     433+dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
     434 dnl -----------------
     435 dnl Check for compiler/linker flags used to temporarily force usage of static
     436 dnl libraries.  This depends on the compiler and platform.  Use this to help
     437@@ -2153,7 +2175,7 @@
     438 
     439 if test "$GCC" = yes ; then
     440        case $cf_cv_system_name in #(
     441-       OS/2*|os2*|aix[[45]]*)  #( vi
     442+       OS/2*|os2*|aix[[4]]*)   #( vi
     443                LDFLAGS_STATIC=
     444                LDFLAGS_SHARED=
     445                ;;
     446@@ -2164,7 +2186,7 @@
     447     esac
     448 else
     449        case $cf_cv_system_name in #(
     450-       aix[[45]]*)     #( from ld manpage
     451+       aix[[456]]*)    #( from ld manpage
     452                LDFLAGS_STATIC=-bstatic
     453                LDFLAGS_SHARED=-bdynamic
     454                ;;
     455@@ -2179,7 +2201,7 @@
     456                ;;
     457        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
     458                # alternative "-oldstyle_liblookup" (not in cc manpage)
     459-               LDFLAGS_STATIC=-noso
     460+               LDFLAGS_STATIC=-noso
     461                LDFLAGS_SHARED=-so_archive
     462                ;;
     463        solaris2*)
     464@@ -2193,11 +2215,33 @@
    310465 AC_SUBST(LDFLAGS_SHARED)
    311466 ])
    … …  
    344499 dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
    345500 dnl -------------
    346 @@ -2216,7 +2259,7 @@
     501@@ -2216,7 +2260,7 @@
    347502        AC_SUBST(LIB_PREFIX)
    348503 ])dnl
    … …  
    353508 dnl Append definitions and rules for the given models to the subdirectory
    354509 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
    355 @@ -2504,18 +2547,28 @@
     510@@ -2504,18 +2548,28 @@
    356511 install.libs uninstall.libs \\
    357512 install.data uninstall.data ::
    … …  
    382537 if test -f $srcdir/$tack.h; then
    383538 cat >> Makefile <<CF_EOF
    384 @@ -2526,6 +2579,7 @@
     539@@ -2526,6 +2580,7 @@
    385540 CF_EOF
    386541 fi
    … …  
    390545 dnl If we're installing into a subdirectory of /usr/include, etc., we should
    391546 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
    392 @@ -4003,7 +4057,7 @@
     547@@ -2679,7 +2734,7 @@
     548 ])
     549 ])
     550 dnl ---------------------------------------------------------------------------
     551-dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
     552+dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
     553 dnl -------------
     554 dnl Compute the library file-suffix from the given model name
     555 dnl $1 = model name
     556@@ -2689,40 +2744,44 @@
     557 AC_DEFUN([CF_LIB_SUFFIX],
     558 [
     559        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
     560-       case $1 in
     561-       libtool)
     562+       case $1 in #(vi
     563+       libtool) #(vi
     564                $2='.la'
     565                $3=[$]$2
     566                ;;
     567-       normal)
     568+       normal) #(vi
     569                $2='.a'
     570                $3=[$]$2
     571                ;;
     572-       debug)
     573+       debug) #(vi
     574                $2='_g.a'
     575                $3=[$]$2
     576                ;;
     577-       profile)
     578+       profile) #(vi
     579                $2='_p.a'
     580                $3=[$]$2
     581                ;;
     582-       shared)
     583+       shared) #(vi
     584                case $cf_cv_system_name in
     585-               cygwin*)
     586+               aix[[56]]*) #(vi
     587+                       $2='.a'
     588+                       $3=[$]$2
     589+                       ;;
     590+               cygwin*) #(vi
     591                        $2='.dll'
     592                        $3='.dll.a'
     593                        ;;
     594-               darwin*)
     595+               darwin*) #(vi
     596                        $2='.dylib'
     597                        $3=[$]$2
     598                        ;;
     599-               hpux*)
     600+               hpux*) #(vi
     601                        case $target in
     602-                       ia64*)
     603+                       ia64*) #(vi
     604                                $2='.so'
     605                                $3=[$]$2
     606                                ;;
     607-                       *)
     608+                       *) #(vi
     609                                $2='.sl'
     610                                $3=[$]$2
     611                                ;;
     612@@ -4003,7 +4062,7 @@
    393613 esac
    394614 ])dnl
    … …  
    399619 dnl Check for ldconfig, needed to fixup shared libraries that would be built
    400620 dnl and then used in the install.
    401 @@ -4012,7 +4066,7 @@
     621@@ -4012,7 +4071,7 @@
    402622   LDCONFIG=:
    403623 else
    … …  
    408628   ;;
    409629 *) LDPATH=$PATH:/sbin:/usr/sbin
    410 @@ -4642,7 +4696,7 @@
     630@@ -4147,7 +4206,7 @@
     631 fi
     632 ])dnl
     633 dnl ---------------------------------------------------------------------------
     634-dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
     635+dnl CF_SHARED_OPTS version: 54 updated: 2008/12/27 12:30:03
     636 dnl --------------
     637 dnl --------------
     638 dnl Attempt to determine the appropriate CC/LD options for creating a shared
     639@@ -4219,6 +4278,12 @@
     640        cf_cv_shlib_version_infix=no
     641 
     642        case $cf_cv_system_name in
     643+       aix[[56]]*)
     644+               if test "$GCC" = yes; then
     645+                       CC_SHARED_OPTS=
     646+                       MK_SHARED_LIB="$(CC) -shared"
     647+               fi
     648+               ;;
     649        beos*)
     650                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
     651                ;;
     652@@ -4239,7 +4304,7 @@
     653 EOF
     654                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
     655 CF_EOF
     656-               chmod +x mk_shared_lib.sh
     657+               chmod +x mk_shared_lib.sh
     658                ;;
     659        darwin*)
     660                EXTRA_CFLAGS="-no-cpp-precomp"
     661@@ -4642,7 +4707,7 @@
    411662 fi
    412663 ])dnl
    413664 dnl ---------------------------------------------------------------------------
    414665-dnl CF_SRC_MODULES version: 18 updated: 2005/05/28 12:58:54
    415 +dnl CF_SRC_MODULES version: 19 updated: 2008/12/13 16:10:19
     666+dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
    416667 dnl --------------
    417668 dnl For each parameter, test if the source-directory exists, and if it contains
    418669 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
    419 @@ -4717,7 +4771,11 @@
     670@@ -4717,7 +4782,11 @@
    420671 AC_SUBST(TEST_ARG2)
    421672 AC_SUBST(TEST_DEP2)
    … …  
    430681 do
    431682        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    432 @@ -5535,7 +5593,7 @@
     683@@ -4728,8 +4797,8 @@
     684 
     685 ADA_SUBDIRS=
     686 if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
     687-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
     688-   ADA_SUBDIRS="gen src samples"
     689+       SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
     690+       ADA_SUBDIRS="gen src samples"
     691 fi
     692 
     693 SUB_MAKEFILES=
     694@@ -4739,11 +4808,11 @@
     695 done
     696 
     697 if test -n "$ADA_SUBDIRS"; then
     698-   for cf_dir in $ADA_SUBDIRS
     699-   do
     700-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
     701-   done
     702-   AC_SUBST(ADA_SUBDIRS)
     703+       for cf_dir in $ADA_SUBDIRS
     704+       do
     705+               SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
     706+       done
     707+       AC_SUBST(ADA_SUBDIRS)
     708 fi
     709 ])dnl
     710 dnl ---------------------------------------------------------------------------
     711@@ -5241,7 +5310,7 @@
     712 fi
     713 ])
     714 dnl ---------------------------------------------------------------------------
     715-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
     716+dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
     717 dnl ---------------
     718 dnl Provide a configure option to incorporate libtool.  Define several useful
     719 dnl symbols for the makefile rules.
     720@@ -5261,18 +5330,18 @@
     721 dnl            echo cannot find libtool.m4 file
     722 dnl            exit 1
     723 dnl    fi
     724-dnl   
     725+dnl
     726 dnl    LOCAL=aclocal.m4
     727 dnl    ORIG=aclocal.m4.orig
     728-dnl   
     729+dnl
     730 dnl    trap "mv $ORIG $LOCAL" 0 1 2 5 15
     731 dnl    rm -f $ORIG
     732 dnl    mv $LOCAL $ORIG
     733-dnl   
     734+dnl
     735 dnl    # sed the LIBTOOL= assignment to omit the current directory?
     736 dnl    sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
     737 dnl    cat $ORIG >>$LOCAL
     738-dnl   
     739+dnl
     740 dnl    autoconf-257 $*
     741 dnl
     742 AC_DEFUN([CF_WITH_LIBTOOL],
     743@@ -5306,15 +5375,15 @@
     744        AC_PROG_LIBTOOL
     745        # missing_content_AC_PROG_LIBTOOL}}
     746 ],[
     747-       if test "$with_libtool" != "yes" ; then
     748+       if test "$with_libtool" != "yes" ; then
     749                CF_PATH_SYNTAX(with_libtool)
     750                LIBTOOL=$with_libtool
     751        else
     752-               AC_PATH_PROG(LIBTOOL,libtool)
     753-       fi
     754-       if test -z "$LIBTOOL" ; then
     755-               AC_MSG_ERROR(Cannot find libtool)
     756-       fi
     757+               AC_PATH_PROG(LIBTOOL,libtool)
     758+       fi
     759+       if test -z "$LIBTOOL" ; then
     760+               AC_MSG_ERROR(Cannot find libtool)
     761+       fi
     762 ])dnl
     763        LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
     764        LIB_OBJECT='${OBJECTS:.o=.lo}'
     765@@ -5535,7 +5604,7 @@
    433766        [USE_VALGRIND])
    434767 ])dnl
    435768 dnl ---------------------------------------------------------------------------
    436769-dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
    437 +dnl CF_XOPEN_SOURCE version: 27 updated: 2008/12/13 14:08:40
     770+dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03
    438771 dnl ---------------
    439772 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    440773 dnl or adapt to the vendor's definitions to get equivalent functionality,
    441 @@ -5569,7 +5627,7 @@
     774@@ -5552,7 +5621,7 @@
     775 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
     776 
     777 case $host_os in #(vi
     778-aix[[45]]*) #(vi
     779+aix[[456]]*) #(vi
     780        CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
     781        ;;
     782 freebsd*|dragonfly*) #(vi
     783@@ -5569,7 +5638,7 @@
    442784 irix[[56]].*) #(vi
    443785        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    450792diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    451793--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    452 +++ ncurses-5.7/c++/cursesw.cc  2008-12-20 14:47:10.000000000 -0800
     794+++ ncurses-5.7/c++/cursesw.cc  2008-12-29 20:11:45.000000000 -0800
    453795@@ -1,6 +1,6 @@
    454796 // * this is for making emacs happy: -*-Mode: C++;-*-
    … …  
    487829diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    488830--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    489 +++ ncurses-5.7/configure       2008-12-20 14:47:16.000000000 -0800
    490 @@ -1,5 +1,5 @@
     831+++ ncurses-5.7/configure       2008-12-29 20:12:06.000000000 -0800
     832@@ -1,7 +1,7 @@
    491833 #! /bin/sh
    492834-# From configure.in Revision: 1.454 .
    493 +# From configure.in Revision: 1.456 .
     835+# From configure.in Revision: 1.457 .
    494836 # Guess values for system-dependent variables and create Makefiles.
    495  # Generated by Autoconf 2.52.20080325.
     837-# Generated by Autoconf 2.52.20080325.
     838+# Generated by Autoconf 2.52.20081225.
    496839 #
     840 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
     841 # Free Software Foundation, Inc.
    497842@@ -697,6 +697,7 @@
    498843   --without-cxx           do not adjust ncurses bool to match C++
    … …  
    503848   --without-curses-h      install curses.h as ncurses.h only
    504849   --enable-mixed-case     tic should assume mixed-case filenames
     850@@ -870,7 +871,7 @@
     851 running configure, to aid debugging if configure makes a mistake.
     852 
     853 It was created by $as_me, which was
     854-generated by GNU Autoconf 2.52.20080325.  Invocation command line was
     855+generated by GNU Autoconf 2.52.20081225.  Invocation command line was
     856 
     857   $ $0 $@
     858 
    505859@@ -994,7 +995,7 @@
    506860 fi
    … …  
    11041458   # Find the output, starting from the most likely.  This scheme is
    11051459 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
     1460@@ -1736,7 +1737,7 @@
     1461                 ls a.out conftest 2>/dev/null;
     1462                 ls a.* conftest.* 2>/dev/null`; do
     1463   case $ac_file in
     1464-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     1465+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     1466     a.out ) # We found the default executable, but exeext='' is most
     1467             # certainly right.
     1468             break;;
    11061469@@ -1750,34 +1751,34 @@
    11071470 else
    … …  
    11761539   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    11771540 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
     1541@@ -1810,7 +1811,7 @@
     1542 # `rm'.
     1543 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
     1544   case $ac_file in
     1545-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     1546+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     1547     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     1548           export ac_cv_exeext
     1549           break;;
    11781550@@ -1818,25 +1819,25 @@
    11791551   esac
    … …  
    12061578 
    12071579 int
    1208 @@ -1848,10 +1849,10 @@
     1580@@ -1848,14 +1849,14 @@
    12091581 }
    12101582 _ACEOF
    … …  
    12191591   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    12201592   case $ac_file in
     1593-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
     1594+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
     1595     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
     1596        break;;
     1597   esac
    12211598@@ -1863,24 +1864,24 @@
    12221599 else
    … …  
    27163093 
    27173094 # Check whether --with-libtool or --without-libtool was given.
    2718 @@ -4037,7 +4051,7 @@
     3095@@ -4037,11 +4051,11 @@
    27193096 else
    27203097   with_libtool=no
    … …  
    27253102 if test "$with_libtool" != "no"; then
    27263103 
     3104-       if test "$with_libtool" != "yes" ; then
     3105+       if test "$with_libtool" != "yes" ; then
     3106 
     3107 if test "x$prefix" != xNONE; then
     3108   cf_path_syntax="$prefix"
    27273109@@ -4068,7 +4082,7 @@
    27283110   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    … …  
    27343116    { (exit 1); exit 1; }; }
    27353117   ;;
    2736 @@ -4078,7 +4092,7 @@
     3118@@ -4076,9 +4090,9 @@
     3119 
     3120                LIBTOOL=$with_libtool
    27373121        else
    2738                 # Extract the first word of "libtool", so it can be a program name with args.
     3122-               # Extract the first word of "libtool", so it can be a program name with args.
     3123+               # Extract the first word of "libtool", so it can be a program name with args.
    27393124 set dummy libtool; ac_word=$2
    27403125-echo "$as_me:4081: checking for $ac_word" >&5
    … …  
    27523137 fi
    27533138 done
    2754 @@ -4106,16 +4120,16 @@
     3139@@ -4106,19 +4120,19 @@
    27553140 LIBTOOL=$ac_cv_path_LIBTOOL
    27563141 
    … …  
    27653150 fi
    27663151 
    2767         fi
    2768         if test -z "$LIBTOOL" ; then
     3152-       fi
     3153-       if test -z "$LIBTOOL" ; then
    27693154-               { { echo "$as_me:4118: error: Cannot find libtool" >&5
    2770 +               { { echo "$as_me:4132: error: Cannot find libtool" >&5
     3155+       fi
     3156+       if test -z "$LIBTOOL" ; then
     3157+               { { echo "$as_me:4132: error: Cannot find libtool" >&5
    27713158 echo "$as_me: error: Cannot find libtool" >&2;}
    27723159    { (exit 1); exit 1; }; }
    2773         fi
     3160-       fi
     3161+       fi
     3162        LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
     3163        LIB_OBJECT='${OBJECTS:.o=.lo}'
     3164        LIB_SUFFIX=.la
    27743165@@ -4130,17 +4144,17 @@
    27753166        LIB_PREP=:
    … …  
    34903881                CFLAGS="$cf_save_CFLAGS"
    34913882        fi
    3492 @@ -5027,7 +5041,7 @@
     3883@@ -4999,6 +5013,12 @@
     3884        cf_cv_shlib_version_infix=no
     3885 
     3886        case $cf_cv_system_name in
     3887+       aix[56]*)
     3888+               if test "$GCC" = yes; then
     3889+                       CC_SHARED_OPTS=
     3890+                       MK_SHARED_LIB="$(CC) -shared"
     3891+               fi
     3892+               ;;
     3893        beos*)
     3894                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
     3895                ;;
     3896@@ -5027,7 +5047,7 @@
    34933897                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    34943898                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    34953899                cf_cv_shlib_version_infix=yes
    34963900-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    3497 +               echo "$as_me:5044: checking if ld -search_paths_first works" >&5
     3901+               echo "$as_me:5050: checking if ld -search_paths_first works" >&5
    34983902 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    34993903 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    35003904   echo $ECHO_N "(cached) $ECHO_C" >&6
    3501 @@ -5036,7 +5050,7 @@
     3905@@ -5036,7 +5056,7 @@
    35023906                        cf_save_LDFLAGS=$LDFLAGS
    35033907                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    35043908                        cat >conftest.$ac_ext <<_ACEOF
    35053909-#line 5039 "configure"
    3506 +#line 5053 "configure"
     3910+#line 5059 "configure"
    35073911 #include "confdefs.h"
    35083912 
    35093913 int
    3510 @@ -5048,16 +5062,16 @@
     3914@@ -5048,16 +5068,16 @@
    35113915 }
    35123916 _ACEOF
    35133917 rm -f conftest.$ac_objext conftest$ac_exeext
    35143918-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    3515 +if { (eval echo "$as_me:5065: \"$ac_link\"") >&5
     3919+if { (eval echo "$as_me:5071: \"$ac_link\"") >&5
    35163920   (eval $ac_link) 2>&5
    35173921   ac_status=$?
    35183922-  echo "$as_me:5054: \$? = $ac_status" >&5
    3519 +  echo "$as_me:5068: \$? = $ac_status" >&5
     3923+  echo "$as_me:5074: \$? = $ac_status" >&5
    35203924   (exit $ac_status); } &&
    35213925          { ac_try='test -s conftest$ac_exeext'
    35223926-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    3523 +  { (eval echo "$as_me:5071: \"$ac_try\"") >&5
     3927+  { (eval echo "$as_me:5077: \"$ac_try\"") >&5
    35243928   (eval $ac_try) 2>&5
    35253929   ac_status=$?
    35263930-  echo "$as_me:5060: \$? = $ac_status" >&5
    3527 +  echo "$as_me:5074: \$? = $ac_status" >&5
     3931+  echo "$as_me:5080: \$? = $ac_status" >&5
    35283932   (exit $ac_status); }; }; then
    35293933   cf_cv_ldflags_search_paths_first=yes
    35303934 else
    3531 @@ -5068,7 +5082,7 @@
     3935@@ -5068,7 +5088,7 @@
    35323936 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    35333937                                LDFLAGS=$cf_save_LDFLAGS
    35343938 fi
    35353939-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    3536 +echo "$as_me:5085: result: $cf_cv_ldflags_search_paths_first" >&5
     3940+echo "$as_me:5091: result: $cf_cv_ldflags_search_paths_first" >&5
    35373941 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    35383942                if test $cf_cv_ldflags_search_paths_first = yes; then
    35393943                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    3540 @@ -5285,7 +5299,7 @@
     3944@@ -5285,7 +5305,7 @@
    35413945                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    35423946                        ;;
    35433947                *)
    35443948-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    3545 +                       { echo "$as_me:5302: WARNING: ignored --with-shlib-version" >&5
     3949+                       { echo "$as_me:5308: WARNING: ignored --with-shlib-version" >&5
    35463950 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    35473951                        ;;
    35483952                esac
    3549 @@ -5293,12 +5307,12 @@
     3953@@ -5293,12 +5313,12 @@
    35503954        esac
    35513955 
    35523956        if test -n "$cf_ld_rpath_opt" ; then
    35533957-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    3554 +               echo "$as_me:5310: checking if we need a space after rpath option" >&5
     3958+               echo "$as_me:5316: checking if we need a space after rpath option" >&5
    35553959 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    35563960                cf_save_LIBS="$LIBS"
    … …  
    35583962                cat >conftest.$ac_ext <<_ACEOF
    35593963-#line 5301 "configure"
    3560 +#line 5315 "configure"
     3964+#line 5321 "configure"
    35613965 #include "confdefs.h"
    35623966 
    35633967 int
    3564 @@ -5310,16 +5324,16 @@
     3968@@ -5310,16 +5330,16 @@
    35653969 }
    35663970 _ACEOF
    35673971 rm -f conftest.$ac_objext conftest$ac_exeext
    35683972-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    3569 +if { (eval echo "$as_me:5327: \"$ac_link\"") >&5
     3973+if { (eval echo "$as_me:5333: \"$ac_link\"") >&5
    35703974   (eval $ac_link) 2>&5
    35713975   ac_status=$?
    35723976-  echo "$as_me:5316: \$? = $ac_status" >&5
    3573 +  echo "$as_me:5330: \$? = $ac_status" >&5
     3977+  echo "$as_me:5336: \$? = $ac_status" >&5
    35743978   (exit $ac_status); } &&
    35753979          { ac_try='test -s conftest$ac_exeext'
    35763980-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    3577 +  { (eval echo "$as_me:5333: \"$ac_try\"") >&5
     3981+  { (eval echo "$as_me:5339: \"$ac_try\"") >&5
    35783982   (eval $ac_try) 2>&5
    35793983   ac_status=$?
    35803984-  echo "$as_me:5322: \$? = $ac_status" >&5
    3581 +  echo "$as_me:5336: \$? = $ac_status" >&5
     3985+  echo "$as_me:5342: \$? = $ac_status" >&5
    35823986   (exit $ac_status); }; }; then
    35833987   cf_rpath_space=no
    35843988 else
    3585 @@ -5329,7 +5343,7 @@
     3989@@ -5329,7 +5349,7 @@
    35863990 fi
    35873991 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    35883992                LIBS="$cf_save_LIBS"
    35893993-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    3590 +               echo "$as_me:5346: result: $cf_rpath_space" >&5
     3994+               echo "$as_me:5352: result: $cf_rpath_space" >&5
    35913995 echo "${ECHO_T}$cf_rpath_space" >&6
    35923996                test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
    35933997                MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
    3594 @@ -5338,7 +5352,7 @@
     3998@@ -5338,7 +5358,7 @@
    35953999 if test "$CC_SHARED_OPTS" = "unknown"; then
    35964000        for model in $cf_list_models; do
    35974001                if test "$model" = "shared"; then
    35984002-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    3599 +                       { { echo "$as_me:5355: error: Shared libraries are not supported in this version" >&5
     4003+                       { { echo "$as_me:5361: error: Shared libraries are not supported in this version" >&5
    36004004 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    36014005    { (exit 1); exit 1; }; }
    36024006                fi
    3603 @@ -5348,7 +5362,7 @@
     4007@@ -5348,7 +5368,7 @@
    36044008 ###############################################################################
    36054009 
    36064010 ###    use option --disable-overwrite to leave out the link to -lcurses
    36074011-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    3608 +echo "$as_me:5365: checking if you wish to install ncurses overwriting curses" >&5
     4012+echo "$as_me:5371: checking if you wish to install ncurses overwriting curses" >&5
    36094013 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    36104014 
    36114015 # Check whether --enable-overwrite or --disable-overwrite was given.
    3612 @@ -5358,10 +5372,10 @@
     4016@@ -5358,10 +5378,10 @@
    36134017 else
    36144018   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    36154019 fi;
    36164020-echo "$as_me:5361: result: $with_overwrite" >&5
    3617 +echo "$as_me:5375: result: $with_overwrite" >&5
     4021+echo "$as_me:5381: result: $with_overwrite" >&5
    36184022 echo "${ECHO_T}$with_overwrite" >&6
    36194023 
    36204024-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    3621 +echo "$as_me:5378: checking if external terminfo-database is used" >&5
     4025+echo "$as_me:5384: checking if external terminfo-database is used" >&5
    36224026 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    36234027 
    36244028 # Check whether --enable-database or --disable-database was given.
    3625 @@ -5371,7 +5385,7 @@
     4029@@ -5371,7 +5391,7 @@
    36264030 else
    36274031   use_database=yes
    36284032 fi;
    36294033-echo "$as_me:5374: result: $use_database" >&5
    3630 +echo "$as_me:5388: result: $use_database" >&5
     4034+echo "$as_me:5394: result: $use_database" >&5
    36314035 echo "${ECHO_T}$use_database" >&6
    36324036 
    36334037 case $host_os in #(vi
    3634 @@ -5393,7 +5407,7 @@
     4038@@ -5393,7 +5413,7 @@
    36354039 #define USE_DATABASE 1
    36364040 EOF
    36374041 
    36384042-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    3639 +       echo "$as_me:5410: checking which terminfo source-file will be installed" >&5
     4043+       echo "$as_me:5416: checking which terminfo source-file will be installed" >&5
    36404044 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    36414045 
    36424046 # Check whether --enable-database or --disable-database was given.
    3643 @@ -5401,10 +5415,10 @@
     4047@@ -5401,10 +5421,10 @@
    36444048   enableval="$enable_database"
    36454049   TERMINFO_SRC=$withval
    36464050 fi;
    36474051-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    3648 +       echo "$as_me:5418: result: $TERMINFO_SRC" >&5
     4052+       echo "$as_me:5424: result: $TERMINFO_SRC" >&5
    36494053 echo "${ECHO_T}$TERMINFO_SRC" >&6
    36504054 
    36514055-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    3652 +       echo "$as_me:5421: checking whether to use hashed database instead of directory/tree" >&5
     4056+       echo "$as_me:5427: checking whether to use hashed database instead of directory/tree" >&5
    36534057 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    36544058 
    36554059 # Check whether --with-hashed-db or --without-hashed-db was given.
    3656 @@ -5414,13 +5428,13 @@
     4060@@ -5414,13 +5434,13 @@
    36574061 else
    36584062   with_hashed_db=no
    36594063 fi;
    36604064-       echo "$as_me:5417: result: $with_hashed_db" >&5
    3661 +       echo "$as_me:5431: result: $with_hashed_db" >&5
     4065+       echo "$as_me:5437: result: $with_hashed_db" >&5
    36624066 echo "${ECHO_T}$with_hashed_db" >&6
    36634067 else
    … …  
    36664070 
    36674071-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    3668 +echo "$as_me:5437: checking for list of fallback descriptions" >&5
     4072+echo "$as_me:5443: checking for list of fallback descriptions" >&5
    36694073 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    36704074 
    36714075 # Check whether --with-fallbacks or --without-fallbacks was given.
    3672 @@ -5430,11 +5444,11 @@
     4076@@ -5430,11 +5450,11 @@
    36734077 else
    36744078   with_fallback=
    36754079 fi;
    36764080-echo "$as_me:5433: result: $with_fallback" >&5
    3677 +echo "$as_me:5447: result: $with_fallback" >&5
     4081+echo "$as_me:5453: result: $with_fallback" >&5
    36784082 echo "${ECHO_T}$with_fallback" >&6
    36794083 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    36804084 
    36814085-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    3682 +echo "$as_me:5451: checking if you want modern xterm or antique" >&5
     4086+echo "$as_me:5457: checking if you want modern xterm or antique" >&5
    36834087 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    36844088 
    36854089 # Check whether --with-xterm-new or --without-xterm-new was given.
    3686 @@ -5448,7 +5462,7 @@
     4090@@ -5448,7 +5468,7 @@
    36874091 no)    with_xterm_new=xterm-old;;
    36884092 *)     with_xterm_new=xterm-new;;
    36894093 esac
    36904094-echo "$as_me:5451: result: $with_xterm_new" >&5
    3691 +echo "$as_me:5465: result: $with_xterm_new" >&5
     4095+echo "$as_me:5471: result: $with_xterm_new" >&5
    36924096 echo "${ECHO_T}$with_xterm_new" >&6
    36934097 WHICH_XTERM=$with_xterm_new
    36944098 
    3695 @@ -5458,7 +5472,7 @@
     4099@@ -5458,7 +5478,7 @@
    36964100        MAKE_TERMINFO="#"
    36974101 else
    36984102 
    36994103-echo "$as_me:5461: checking for list of terminfo directories" >&5
    3700 +echo "$as_me:5475: checking for list of terminfo directories" >&5
     4104+echo "$as_me:5481: checking for list of terminfo directories" >&5
    37014105 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    37024106 
    37034107 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    3704 @@ -5498,7 +5512,7 @@
     4108@@ -5498,7 +5518,7 @@
    37054109   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    37064110   ;;
    37074111 *)
    37084112-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    3709 +  { { echo "$as_me:5515: error: expected a pathname, not \"$cf_src_path\"" >&5
     4113+  { { echo "$as_me:5521: error: expected a pathname, not \"$cf_src_path\"" >&5
    37104114 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    37114115    { (exit 1); exit 1; }; }
    37124116   ;;
    3713 @@ -5511,13 +5525,13 @@
     4117@@ -5511,13 +5531,13 @@
    37144118 
    37154119 eval 'TERMINFO_DIRS="$cf_dst_path"'
    37164120 
    37174121-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    3718 +echo "$as_me:5528: result: $TERMINFO_DIRS" >&5
     4122+echo "$as_me:5534: result: $TERMINFO_DIRS" >&5
    37194123 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    37204124 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
    … …  
    37234127 
    37244128-echo "$as_me:5520: checking for default terminfo directory" >&5
    3725 +echo "$as_me:5534: checking for default terminfo directory" >&5
     4129+echo "$as_me:5540: checking for default terminfo directory" >&5
    37264130 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    37274131 
    37284132 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    3729 @@ -5553,7 +5567,7 @@
     4133@@ -5553,7 +5573,7 @@
    37304134   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    37314135   ;;
    37324136 *)
    37334137-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    3734 +  { { echo "$as_me:5570: error: expected a pathname, not \"$withval\"" >&5
     4138+  { { echo "$as_me:5576: error: expected a pathname, not \"$withval\"" >&5
    37354139 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    37364140    { (exit 1); exit 1; }; }
    37374141   ;;
    3738 @@ -5562,7 +5576,7 @@
     4142@@ -5562,7 +5582,7 @@
    37394143 fi
    37404144 TERMINFO="$withval"
    37414145 
    37424146-echo "$as_me:5565: result: $TERMINFO" >&5
    3743 +echo "$as_me:5579: result: $TERMINFO" >&5
     4147+echo "$as_me:5585: result: $TERMINFO" >&5
    37444148 echo "${ECHO_T}$TERMINFO" >&6
    37454149 cat >>confdefs.h <<EOF
    37464150 #define TERMINFO "$TERMINFO"
    3747 @@ -5572,7 +5586,7 @@
     4151@@ -5572,7 +5592,7 @@
    37484152 
    37494153 ###    use option --disable-big-core to make tic run on small machines
    37504154 ###    We need 4Mb, check if we can allocate 50% more than that.
    37514155-echo "$as_me:5575: checking if big-core option selected" >&5
    3752 +echo "$as_me:5589: checking if big-core option selected" >&5
     4156+echo "$as_me:5595: checking if big-core option selected" >&5
    37534157 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    37544158 
    37554159 # Check whether --enable-big-core or --disable-big-core was given.
    3756 @@ -5584,7 +5598,7 @@
     4160@@ -5584,7 +5604,7 @@
    37574161   with_big_core=no
    37584162 else
    37594163   cat >conftest.$ac_ext <<_ACEOF
    37604164-#line 5587 "configure"
    3761 +#line 5601 "configure"
     4165+#line 5607 "configure"
    37624166 #include "confdefs.h"
    37634167 
    37644168 #include <stdlib.h>
    3765 @@ -5598,15 +5612,15 @@
     4169@@ -5598,15 +5618,15 @@
    37664170 }
    37674171 _ACEOF
    37684172 rm -f conftest$ac_exeext
    37694173-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    3770 +if { (eval echo "$as_me:5615: \"$ac_link\"") >&5
     4174+if { (eval echo "$as_me:5621: \"$ac_link\"") >&5
    37714175   (eval $ac_link) 2>&5
    37724176   ac_status=$?
    37734177-  echo "$as_me:5604: \$? = $ac_status" >&5
    3774 +  echo "$as_me:5618: \$? = $ac_status" >&5
     4178+  echo "$as_me:5624: \$? = $ac_status" >&5
    37754179   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    37764180-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    3777 +  { (eval echo "$as_me:5620: \"$ac_try\"") >&5
     4181+  { (eval echo "$as_me:5626: \"$ac_try\"") >&5
    37784182   (eval $ac_try) 2>&5
    37794183   ac_status=$?
    37804184-  echo "$as_me:5609: \$? = $ac_status" >&5
    3781 +  echo "$as_me:5623: \$? = $ac_status" >&5
     4185+  echo "$as_me:5629: \$? = $ac_status" >&5
    37824186   (exit $ac_status); }; }; then
    37834187   with_big_core=yes
    37844188 else
    3785 @@ -5618,7 +5632,7 @@
     4189@@ -5618,7 +5638,7 @@
    37864190 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    37874191 fi
    37884192 fi;
    37894193-echo "$as_me:5621: result: $with_big_core" >&5
    3790 +echo "$as_me:5635: result: $with_big_core" >&5
     4194+echo "$as_me:5641: result: $with_big_core" >&5
    37914195 echo "${ECHO_T}$with_big_core" >&6
    37924196 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    37934197 #define HAVE_BIG_CORE 1
    3794 @@ -5627,7 +5641,7 @@
     4198@@ -5627,7 +5647,7 @@
    37954199 ### ISO C only guarantees 512-char strings, we have tables which load faster
    37964200 ### when constructed using "big" strings.  More than the C compiler, the awk
    37974201 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    37984202-echo "$as_me:5630: checking if big-strings option selected" >&5
    3799 +echo "$as_me:5644: checking if big-strings option selected" >&5
     4203+echo "$as_me:5650: checking if big-strings option selected" >&5
    38004204 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    38014205 
    38024206 # Check whether --enable-big-strings or --disable-big-strings was given.
    3803 @@ -5651,14 +5665,14 @@
    3804      esac
     4207@@ -5636,29 +5656,29 @@
     4208   with_big_strings=$enableval
     4209 else
     4210 
     4211-    case x$AWK in #(vi
     4212-    x)
     4213-        eval with_big_strings=no
     4214-        ;;
     4215-    *) #(vi
     4216-        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
     4217-            | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
     4218-            eval with_big_strings=yes
     4219-        else
     4220-            eval with_big_strings=no
     4221-        fi
     4222-        ;;
     4223-    esac
     4224+       case x$AWK in #(vi
     4225+       x)
     4226+               eval with_big_strings=no
     4227+               ;;
     4228+       *) #(vi
     4229+               if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
     4230+                       | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
     4231+                       eval with_big_strings=yes
     4232+               else
     4233+                       eval with_big_strings=no
     4234+               fi
     4235+               ;;
     4236+       esac
    38054237 
    38064238 fi;
    38074239-echo "$as_me:5654: result: $with_big_strings" >&5
    3808 +echo "$as_me:5668: result: $with_big_strings" >&5
     4240+echo "$as_me:5674: result: $with_big_strings" >&5
    38094241 echo "${ECHO_T}$with_big_strings" >&6
    38104242 
    … …  
    38144246 ###    use option --enable-termcap to compile in the termcap fallback support
    38154247-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    3816 +echo "$as_me:5675: checking if you want termcap-fallback support" >&5
     4248+echo "$as_me:5681: checking if you want termcap-fallback support" >&5
    38174249 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    38184250 
    38194251 # Check whether --enable-termcap or --disable-termcap was given.
    3820 @@ -5668,13 +5682,13 @@
     4252@@ -5668,13 +5688,13 @@
    38214253 else
    38224254   with_termcap=no
    38234255 fi;
    38244256-echo "$as_me:5671: result: $with_termcap" >&5
    3825 +echo "$as_me:5685: result: $with_termcap" >&5
     4257+echo "$as_me:5691: result: $with_termcap" >&5
    38264258 echo "${ECHO_T}$with_termcap" >&6
    38274259 
    … …  
    38304262                if test -z "$with_fallback" ; then
    38314263-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    3832 +                       { { echo "$as_me:5691: error: You have disabled the database w/o specifying fallbacks" >&5
     4264+                       { { echo "$as_me:5697: error: You have disabled the database w/o specifying fallbacks" >&5
    38334265 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    38344266    { (exit 1); exit 1; }; }
    38354267                fi
    3836 @@ -5686,7 +5700,7 @@
     4268@@ -5686,7 +5706,7 @@
    38374269 else
    38384270 
    38394271 if test "$with_ticlib" != no ; then
    38404272-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    3841 +       { { echo "$as_me:5703: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
     4273+       { { echo "$as_me:5709: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    38424274 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    38434275    { (exit 1); exit 1; }; }
    38444276 fi
    3845 @@ -5695,7 +5709,7 @@
     4277@@ -5695,7 +5715,7 @@
    38464278 #define USE_TERMCAP 1
    38474279 EOF
    38484280 
    38494281-echo "$as_me:5698: checking for list of termcap files" >&5
    3850 +echo "$as_me:5712: checking for list of termcap files" >&5
     4282+echo "$as_me:5718: checking for list of termcap files" >&5
    38514283 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    38524284 
    38534285 # Check whether --with-termpath or --without-termpath was given.
    3854 @@ -5735,7 +5749,7 @@
     4286@@ -5735,7 +5755,7 @@
    38554287   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    38564288   ;;
    38574289 *)
    38584290-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    3859 +  { { echo "$as_me:5752: error: expected a pathname, not \"$cf_src_path\"" >&5
     4291+  { { echo "$as_me:5758: error: expected a pathname, not \"$cf_src_path\"" >&5
    38604292 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    38614293    { (exit 1); exit 1; }; }
    38624294   ;;
    3863 @@ -5748,14 +5762,14 @@
     4295@@ -5748,14 +5768,14 @@
    38644296 
    38654297 eval 'TERMPATH="$cf_dst_path"'
    38664298 
    38674299-echo "$as_me:5751: result: $TERMPATH" >&5
    3868 +echo "$as_me:5765: result: $TERMPATH" >&5
     4300+echo "$as_me:5771: result: $TERMPATH" >&5
    38694301 echo "${ECHO_T}$TERMPATH" >&6
    38704302 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
    … …  
    38744306 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    38754307-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    3876 +echo "$as_me:5772: checking if fast termcap-loader is needed" >&5
     4308+echo "$as_me:5778: checking if fast termcap-loader is needed" >&5
    38774309 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    38784310 
    38794311 # Check whether --enable-getcap or --disable-getcap was given.
    3880 @@ -5765,13 +5779,13 @@
     4312@@ -5765,13 +5785,13 @@
    38814313 else
    38824314   with_getcap=no
    38834315 fi;
    38844316-echo "$as_me:5768: result: $with_getcap" >&5
    3885 +echo "$as_me:5782: result: $with_getcap" >&5
     4317+echo "$as_me:5788: result: $with_getcap" >&5
    38864318 echo "${ECHO_T}$with_getcap" >&6
    38874319 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    38904322 
    38914323-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    3892 +echo "$as_me:5788: checking if translated termcaps will be cached in ~/.terminfo" >&5
     4324+echo "$as_me:5794: checking if translated termcaps will be cached in ~/.terminfo" >&5
    38934325 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    38944326 
    38954327 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    3896 @@ -5781,7 +5795,7 @@
     4328@@ -5781,7 +5801,7 @@
    38974329 else
    38984330   with_getcap_cache=no
    38994331 fi;
    39004332-echo "$as_me:5784: result: $with_getcap_cache" >&5
    3901 +echo "$as_me:5798: result: $with_getcap_cache" >&5
     4333+echo "$as_me:5804: result: $with_getcap_cache" >&5
    39024334 echo "${ECHO_T}$with_getcap_cache" >&6
    39034335 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    39044336 #define USE_GETCAP_CACHE 1
    3905 @@ -5790,7 +5804,7 @@
     4337@@ -5790,7 +5810,7 @@
    39064338 fi
    39074339 
    39084340 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    39094341-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    3910 +echo "$as_me:5807: checking if ~/.terminfo is wanted" >&5
     4342+echo "$as_me:5813: checking if ~/.terminfo is wanted" >&5
    39114343 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    39124344 
    39134345 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    3914 @@ -5800,13 +5814,13 @@
     4346@@ -5800,13 +5820,13 @@
    39154347 else
    39164348   with_home_terminfo=yes
    39174349 fi;
    39184350-echo "$as_me:5803: result: $with_home_terminfo" >&5
    3919 +echo "$as_me:5817: result: $with_home_terminfo" >&5
     4351+echo "$as_me:5823: result: $with_home_terminfo" >&5
    39204352 echo "${ECHO_T}$with_home_terminfo" >&6
    39214353 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    39244356 
    39254357-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    3926 +echo "$as_me:5823: checking if you want to use restricted environment when running as root" >&5
     4358+echo "$as_me:5829: checking if you want to use restricted environment when running as root" >&5
    39274359 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    39284360 
    39294361 # Check whether --enable-root-environ or --disable-root-environ was given.
    3930 @@ -5816,7 +5830,7 @@
     4362@@ -5816,7 +5836,7 @@
    39314363 else
    39324364   with_root_environ=yes
    39334365 fi;
    39344366-echo "$as_me:5819: result: $with_root_environ" >&5
    3935 +echo "$as_me:5833: result: $with_root_environ" >&5
     4367+echo "$as_me:5839: result: $with_root_environ" >&5
    39364368 echo "${ECHO_T}$with_root_environ" >&6
    39374369 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    39384370 #define USE_ROOT_ENVIRON 1
    3939 @@ -5830,13 +5844,13 @@
     4371@@ -5830,13 +5850,13 @@
    39404372        unlink
    39414373 do
    39424374 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    39434375-echo "$as_me:5833: checking for $ac_func" >&5
    3944 +echo "$as_me:5847: checking for $ac_func" >&5
     4376+echo "$as_me:5853: checking for $ac_func" >&5
    39454377 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    39464378 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    39494381   cat >conftest.$ac_ext <<_ACEOF
    39504382-#line 5839 "configure"
    3951 +#line 5853 "configure"
     4383+#line 5859 "configure"
    39524384 #include "confdefs.h"
    39534385 /* System header to define __stub macros and hopefully few prototypes,
    39544386     which can conflict with char $ac_func (); below.  */
    3955 @@ -5867,16 +5881,16 @@
     4387@@ -5867,16 +5887,16 @@
    39564388 }
    39574389 _ACEOF
    39584390 rm -f conftest.$ac_objext conftest$ac_exeext
    39594391-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    3960 +if { (eval echo "$as_me:5884: \"$ac_link\"") >&5
     4392+if { (eval echo "$as_me:5890: \"$ac_link\"") >&5
    39614393   (eval $ac_link) 2>&5
    39624394   ac_status=$?
    39634395-  echo "$as_me:5873: \$? = $ac_status" >&5
    3964 +  echo "$as_me:5887: \$? = $ac_status" >&5
     4396+  echo "$as_me:5893: \$? = $ac_status" >&5
    39654397   (exit $ac_status); } &&
    39664398          { ac_try='test -s conftest$ac_exeext'
    39674399-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    3968 +  { (eval echo "$as_me:5890: \"$ac_try\"") >&5
     4400+  { (eval echo "$as_me:5896: \"$ac_try\"") >&5
    39694401   (eval $ac_try) 2>&5
    39704402   ac_status=$?
    39714403-  echo "$as_me:5879: \$? = $ac_status" >&5
    3972 +  echo "$as_me:5893: \$? = $ac_status" >&5
     4404+  echo "$as_me:5899: \$? = $ac_status" >&5
    39734405   (exit $ac_status); }; }; then
    39744406   eval "$as_ac_var=yes"
    39754407 else
    3976 @@ -5886,7 +5900,7 @@
     4408@@ -5886,7 +5906,7 @@
    39774409 fi
    39784410 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    39794411 fi
    39804412-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    3981 +echo "$as_me:5903: result: `eval echo '${'$as_ac_var'}'`" >&5
     4413+echo "$as_me:5909: result: `eval echo '${'$as_ac_var'}'`" >&5
    39824414 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    39834415 if test `eval echo '${'$as_ac_var'}'` = yes; then
    39844416   cat >>confdefs.h <<EOF
    3985 @@ -5903,13 +5917,13 @@
     4417@@ -5903,13 +5923,13 @@
    39864418                symlink
    39874419 do
    39884420 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    39894421-echo "$as_me:5906: checking for $ac_func" >&5
    3990 +echo "$as_me:5920: checking for $ac_func" >&5
     4422+echo "$as_me:5926: checking for $ac_func" >&5
    39914423 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    39924424 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    39954427   cat >conftest.$ac_ext <<_ACEOF
    39964428-#line 5912 "configure"
    3997 +#line 5926 "configure"
     4429+#line 5932 "configure"
    39984430 #include "confdefs.h"
    39994431 /* System header to define __stub macros and hopefully few prototypes,
    40004432     which can conflict with char $ac_func (); below.  */
    4001 @@ -5940,16 +5954,16 @@
     4433@@ -5940,16 +5960,16 @@
    40024434 }
    40034435 _ACEOF
    40044436 rm -f conftest.$ac_objext conftest$ac_exeext
    40054437-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    4006 +if { (eval echo "$as_me:5957: \"$ac_link\"") >&5
     4438+if { (eval echo "$as_me:5963: \"$ac_link\"") >&5
    40074439   (eval $ac_link) 2>&5
    40084440   ac_status=$?
    40094441-  echo "$as_me:5946: \$? = $ac_status" >&5
    4010 +  echo "$as_me:5960: \$? = $ac_status" >&5
     4442+  echo "$as_me:5966: \$? = $ac_status" >&5
    40114443   (exit $ac_status); } &&
    40124444          { ac_try='test -s conftest$ac_exeext'
    40134445-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    4014 +  { (eval echo "$as_me:5963: \"$ac_try\"") >&5
     4446+  { (eval echo "$as_me:5969: \"$ac_try\"") >&5
    40154447   (eval $ac_try) 2>&5
    40164448   ac_status=$?
    40174449-  echo "$as_me:5952: \$? = $ac_status" >&5
    4018 +  echo "$as_me:5966: \$? = $ac_status" >&5
     4450+  echo "$as_me:5972: \$? = $ac_status" >&5
    40194451   (exit $ac_status); }; }; then
    40204452   eval "$as_ac_var=yes"
    40214453 else
    4022 @@ -5959,7 +5973,7 @@
     4454@@ -5959,7 +5979,7 @@
    40234455 fi
    40244456 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    40254457 fi
    40264458-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    4027 +echo "$as_me:5976: result: `eval echo '${'$as_ac_var'}'`" >&5
     4459+echo "$as_me:5982: result: `eval echo '${'$as_ac_var'}'`" >&5
    40284460 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    40294461 if test `eval echo '${'$as_ac_var'}'` = yes; then
    40304462   cat >>confdefs.h <<EOF
    4031 @@ -5970,7 +5984,7 @@
     4463@@ -5970,7 +5990,7 @@
    40324464 done
    40334465 
    40344466 else
    40354467-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    4036 +       echo "$as_me:5987: checking if link/symlink functions work" >&5
     4468+       echo "$as_me:5993: checking if link/symlink functions work" >&5
    40374469 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    40384470 if test "${cf_cv_link_funcs+set}" = set; then
    40394471   echo $ECHO_N "(cached) $ECHO_C" >&6
    4040 @@ -5983,7 +5997,7 @@
     4472@@ -5983,7 +6003,7 @@
    40414473                        eval 'ac_cv_func_'$cf_func'=error'
    40424474 else
    40434475   cat >conftest.$ac_ext <<_ACEOF
    40444476-#line 5986 "configure"
    4045 +#line 6000 "configure"
     4477+#line 6006 "configure"
    40464478 #include "confdefs.h"
    40474479 
    40484480 #include <sys/types.h>
    4049 @@ -6013,15 +6027,15 @@
     4481@@ -6013,15 +6033,15 @@
    40504482 
    40514483 _ACEOF
    40524484 rm -f conftest$ac_exeext
    40534485-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    4054 +if { (eval echo "$as_me:6030: \"$ac_link\"") >&5
     4486+if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
    40554487   (eval $ac_link) 2>&5
    40564488   ac_status=$?
    40574489-  echo "$as_me:6019: \$? = $ac_status" >&5
    4058 +  echo "$as_me:6033: \$? = $ac_status" >&5
     4490+  echo "$as_me:6039: \$? = $ac_status" >&5
    40594491   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    40604492-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    4061 +  { (eval echo "$as_me:6035: \"$ac_try\"") >&5
     4493+  { (eval echo "$as_me:6041: \"$ac_try\"") >&5
    40624494   (eval $ac_try) 2>&5
    40634495   ac_status=$?
    40644496-  echo "$as_me:6024: \$? = $ac_status" >&5
    4065 +  echo "$as_me:6038: \$? = $ac_status" >&5
     4497+  echo "$as_me:6044: \$? = $ac_status" >&5
    40664498   (exit $ac_status); }; }; then
    40674499 
    40684500                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    4069 @@ -6039,7 +6053,7 @@
     4501@@ -6039,7 +6059,7 @@
    40704502                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    40714503 
    40724504 fi
    40734505-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    4074 +echo "$as_me:6056: result: $cf_cv_link_funcs" >&5
     4506+echo "$as_me:6062: result: $cf_cv_link_funcs" >&5
    40754507 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    40764508        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    40774509 #define HAVE_LINK 1
    4078 @@ -6057,7 +6071,7 @@
     4510@@ -6057,7 +6077,7 @@
    40794511 # soft links (symbolic links) are useful for some systems where hard links do
    40804512 # not work, or to make it simpler to copy terminfo trees around.
    40814513 if test "$ac_cv_func_symlink" = yes ; then
    40824514-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    4083 +    echo "$as_me:6074: checking if tic should use symbolic links" >&5
     4515+    echo "$as_me:6080: checking if tic should use symbolic links" >&5
    40844516 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    40854517 
    40864518 # Check whether --enable-symlinks or --disable-symlinks was given.
    4087 @@ -6067,21 +6081,21 @@
     4519@@ -6067,21 +6087,21 @@
    40884520 else
    40894521   with_symlinks=no
    40904522 fi;
    40914523-    echo "$as_me:6070: result: $with_symlinks" >&5
    4092 +    echo "$as_me:6084: result: $with_symlinks" >&5
     4524+    echo "$as_me:6090: result: $with_symlinks" >&5
    40934525 echo "${ECHO_T}$with_symlinks" >&6
    40944526 fi
    … …  
    40984530 if test "$with_symlinks" = no ; then
    40994531-    echo "$as_me:6077: checking if tic should use hard links" >&5
    4100 +    echo "$as_me:6091: checking if tic should use hard links" >&5
     4532+    echo "$as_me:6097: checking if tic should use hard links" >&5
    41014533 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    41024534     if test "$ac_cv_func_link" = yes ; then
    … …  
    41064538     fi
    41074539-    echo "$as_me:6084: result: $with_links" >&5
    4108 +    echo "$as_me:6098: result: $with_links" >&5
     4540+    echo "$as_me:6104: result: $with_links" >&5
    41094541 echo "${ECHO_T}$with_links" >&6
    41104542 fi
    41114543 
    4112 @@ -6094,7 +6108,7 @@
     4544@@ -6094,7 +6114,7 @@
    41134545 EOF
    41144546 
    41154547 ###   use option --enable-broken-linker to force on use of broken-linker support
    41164548-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    4117 +echo "$as_me:6111: checking if you want broken-linker support code" >&5
     4549+echo "$as_me:6117: checking if you want broken-linker support code" >&5
    41184550 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    41194551 
    41204552 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    4121 @@ -6104,7 +6118,7 @@
     4553@@ -6104,7 +6124,7 @@
    41224554 else
    41234555   with_broken_linker=${BROKEN_LINKER-no}
    41244556 fi;
    41254557-echo "$as_me:6107: result: $with_broken_linker" >&5
    4126 +echo "$as_me:6121: result: $with_broken_linker" >&5
     4558+echo "$as_me:6127: result: $with_broken_linker" >&5
    41274559 echo "${ECHO_T}$with_broken_linker" >&6
    41284560 
    41294561 BROKEN_LINKER=0
    4130 @@ -6124,14 +6138,14 @@
     4562@@ -6124,14 +6144,14 @@
    41314563                BROKEN_LINKER=1
    41324564                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    41334565 
    41344566-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    4135 +echo "${as_me-configure}:6141: testing cygwin linker is broken anyway ..." 1>&5
     4567+echo "${as_me-configure}:6147: testing cygwin linker is broken anyway ..." 1>&5
    41364568 
    41374569                ;;
    … …  
    41414573 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    41424574-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    4143 +echo "$as_me:6148: checking if tputs should process BSD-style prefix padding" >&5
     4575+echo "$as_me:6154: checking if tputs should process BSD-style prefix padding" >&5
    41444576 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    41454577 
    41464578 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    4147 @@ -6141,7 +6155,7 @@
     4579@@ -6141,7 +6161,7 @@
    41484580 else
    41494581   with_bsdpad=no
    41504582 fi;
    41514583-echo "$as_me:6144: result: $with_bsdpad" >&5
    4152 +echo "$as_me:6158: result: $with_bsdpad" >&5
     4584+echo "$as_me:6164: result: $with_bsdpad" >&5
    41534585 echo "${ECHO_T}$with_bsdpad" >&6
    41544586 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    41554587 #define BSD_TPUTS 1
    4156 @@ -6158,7 +6172,7 @@
     4588@@ -6158,7 +6178,7 @@
    41574589 
    41584590 # Check to define _XOPEN_SOURCE "automatically"
    41594591 
    41604592-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    4161 +echo "$as_me:6175: checking if $CC -U and -D options work together" >&5
     4593+echo "$as_me:6181: checking if $CC -U and -D options work together" >&5
    41624594 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    41634595 if test "${cf_cv_cc_u_d_options+set}" = set; then
    41644596   echo $ECHO_N "(cached) $ECHO_C" >&6
    4165 @@ -6167,7 +6181,7 @@
     4597@@ -6167,7 +6187,7 @@
    41664598        cf_save_CPPFLAGS="$CPPFLAGS"
    41674599        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    41684600        cat >conftest.$ac_ext <<_ACEOF
    41694601-#line 6170 "configure"
    4170 +#line 6184 "configure"
     4602+#line 6190 "configure"
    41714603 #include "confdefs.h"
    41724604 
    41734605 int
    4174 @@ -6186,16 +6200,16 @@
     4606@@ -6186,16 +6206,16 @@
    41754607 }
    41764608 _ACEOF
    41774609 rm -f conftest.$ac_objext
    41784610-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    4179 +if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5
     4611+if { (eval echo "$as_me:6209: \"$ac_compile\"") >&5
    41804612   (eval $ac_compile) 2>&5
    41814613   ac_status=$?
    41824614-  echo "$as_me:6192: \$? = $ac_status" >&5
    4183 +  echo "$as_me:6206: \$? = $ac_status" >&5
     4615+  echo "$as_me:6212: \$? = $ac_status" >&5
    41844616   (exit $ac_status); } &&
    41854617          { ac_try='test -s conftest.$ac_objext'
    41864618-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    4187 +  { (eval echo "$as_me:6209: \"$ac_try\"") >&5
     4619+  { (eval echo "$as_me:6215: \"$ac_try\"") >&5
    41884620   (eval $ac_try) 2>&5
    41894621   ac_status=$?
    41904622-  echo "$as_me:6198: \$? = $ac_status" >&5
    4191 +  echo "$as_me:6212: \$? = $ac_status" >&5
     4623+  echo "$as_me:6218: \$? = $ac_status" >&5
    41924624   (exit $ac_status); }; }; then
    41934625 
    41944626        cf_cv_cc_u_d_options=yes
    4195 @@ -6209,7 +6223,7 @@
     4627@@ -6209,14 +6229,14 @@
    41964628        CPPFLAGS="$cf_save_CPPFLAGS"
    41974629 
    41984630 fi
    41994631-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    4200 +echo "$as_me:6226: result: $cf_cv_cc_u_d_options" >&5
     4632+echo "$as_me:6232: result: $cf_cv_cc_u_d_options" >&5
    42014633 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    42024634 
    42034635 cf_XOPEN_SOURCE=500
    4204 @@ -6233,16 +6247,16 @@
     4636 cf_POSIX_C_SOURCE=199506L
     4637 
     4638 case $host_os in #(vi
     4639-aix[45]*) #(vi
     4640+aix[456]*) #(vi
     4641        CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
     4642        ;;
     4643 freebsd*|dragonfly*) #(vi
     4644@@ -6233,16 +6253,16 @@
    42054645 irix[56].*) #(vi
    42064646        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    42104650 
    42114651-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    4212 +echo "$as_me:6252: checking if we must define _GNU_SOURCE" >&5
     4652+echo "$as_me:6258: checking if we must define _GNU_SOURCE" >&5
    42134653 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    42144654 if test "${cf_cv_gnu_source+set}" = set; then
    … …  
    42184658 cat >conftest.$ac_ext <<_ACEOF
    42194659-#line 6245 "configure"
    4220 +#line 6259 "configure"
     4660+#line 6265 "configure"
    42214661 #include "confdefs.h"
    42224662 #include <sys/types.h>
    42234663 int
    4224 @@ -6257,16 +6271,16 @@
     4664@@ -6257,16 +6277,16 @@
    42254665 }
    42264666 _ACEOF
    42274667 rm -f conftest.$ac_objext
    42284668-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    4229 +if { (eval echo "$as_me:6274: \"$ac_compile\"") >&5
     4669+if { (eval echo "$as_me:6280: \"$ac_compile\"") >&5
    42304670   (eval $ac_compile) 2>&5
    42314671   ac_status=$?
    42324672-  echo "$as_me:6263: \$? = $ac_status" >&5
    4233 +  echo "$as_me:6277: \$? = $ac_status" >&5
     4673+  echo "$as_me:6283: \$? = $ac_status" >&5
    42344674   (exit $ac_status); } &&
    42354675          { ac_try='test -s conftest.$ac_objext'
    42364676-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    4237 +  { (eval echo "$as_me:6280: \"$ac_try\"") >&5
     4677+  { (eval echo "$as_me:6286: \"$ac_try\"") >&5
    42384678   (eval $ac_try) 2>&5
    42394679   ac_status=$?
    42404680-  echo "$as_me:6269: \$? = $ac_status" >&5
    4241 +  echo "$as_me:6283: \$? = $ac_status" >&5
     4681+  echo "$as_me:6289: \$? = $ac_status" >&5
    42424682   (exit $ac_status); }; }; then
    42434683   cf_cv_gnu_source=no
    42444684 else
    4245 @@ -6275,7 +6289,7 @@
     4685@@ -6275,7 +6295,7 @@
    42464686 cf_save="$CPPFLAGS"
    42474687         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    42484688         cat >conftest.$ac_ext <<_ACEOF
    42494689-#line 6278 "configure"
    4250 +#line 6292 "configure"
     4690+#line 6298 "configure"
    42514691 #include "confdefs.h"
    42524692 #include <sys/types.h>
    42534693 int
    4254 @@ -6290,16 +6304,16 @@
     4694@@ -6290,16 +6310,16 @@
    42554695 }
    42564696 _ACEOF
    42574697 rm -f conftest.$ac_objext
    42584698-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
    4259 +if { (eval echo "$as_me:6307: \"$ac_compile\"") >&5
     4699+if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5
    42604700   (eval $ac_compile) 2>&5
    42614701   ac_status=$?
    42624702-  echo "$as_me:6296: \$? = $ac_status" >&5
    4263 +  echo "$as_me:6310: \$? = $ac_status" >&5
     4703+  echo "$as_me:6316: \$? = $ac_status" >&5
    42644704   (exit $ac_status); } &&
    42654705          { ac_try='test -s conftest.$ac_objext'
    42664706-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
    4267 +  { (eval echo "$as_me:6313: \"$ac_try\"") >&5
     4707+  { (eval echo "$as_me:6319: \"$ac_try\"") >&5
    42684708   (eval $ac_try) 2>&5
    42694709   ac_status=$?
    42704710-  echo "$as_me:6302: \$? = $ac_status" >&5
    4271 +  echo "$as_me:6316: \$? = $ac_status" >&5
     4711+  echo "$as_me:6322: \$? = $ac_status" >&5
    42724712   (exit $ac_status); }; }; then
    42734713   cf_cv_gnu_source=no
    42744714 else
    4275 @@ -6314,7 +6328,7 @@
     4715@@ -6314,7 +6334,7 @@
    42764716 rm -f conftest.$ac_objext conftest.$ac_ext
    42774717 
    42784718 fi
    42794719-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
    4280 +echo "$as_me:6331: result: $cf_cv_gnu_source" >&5
     4720+echo "$as_me:6337: result: $cf_cv_gnu_source" >&5
    42814721 echo "${ECHO_T}$cf_cv_gnu_source" >&6
    42824722 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    42834723 
    4284 @@ -6341,14 +6355,14 @@
     4724@@ -6341,14 +6361,14 @@
    42854725        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
    42864726        ;;
    42874727 *)
    42884728-       echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
    4289 +       echo "$as_me:6358: checking if we should define _XOPEN_SOURCE" >&5
     4729+       echo "$as_me:6364: checking if we should define _XOPEN_SOURCE" >&5
    42904730 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
    42914731 if test "${cf_cv_xopen_source+set}" = set; then
    … …  
    42954735        cat >conftest.$ac_ext <<_ACEOF
    42964736-#line 6351 "configure"
    4297 +#line 6365 "configure"
     4737+#line 6371 "configure"
    42984738 #include "confdefs.h"
    42994739 #include <sys/types.h>
    43004740 int
    4301 @@ -6363,16 +6377,16 @@
     4741@@ -6363,16 +6383,16 @@
    43024742 }
    43034743 _ACEOF
    43044744 rm -f conftest.$ac_objext
    43054745-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
    4306 +if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5
     4746+if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
    43074747   (eval $ac_compile) 2>&5
    43084748   ac_status=$?
    43094749-  echo "$as_me:6369: \$? = $ac_status" >&5
    4310 +  echo "$as_me:6383: \$? = $ac_status" >&5
     4750+  echo "$as_me:6389: \$? = $ac_status" >&5
    43114751   (exit $ac_status); } &&
    43124752          { ac_try='test -s conftest.$ac_objext'
    43134753-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
    4314 +  { (eval echo "$as_me:6386: \"$ac_try\"") >&5
     4754+  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
    43154755   (eval $ac_try) 2>&5
    43164756   ac_status=$?
    43174757-  echo "$as_me:6375: \$? = $ac_status" >&5
    4318 +  echo "$as_me:6389: \$? = $ac_status" >&5
     4758+  echo "$as_me:6395: \$? = $ac_status" >&5
    43194759   (exit $ac_status); }; }; then
    43204760   cf_cv_xopen_source=no
    43214761 else
    4322 @@ -6381,7 +6395,7 @@
     4762@@ -6381,7 +6401,7 @@
    43234763 cf_save="$CPPFLAGS"
    43244764         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
    43254765         cat >conftest.$ac_ext <<_ACEOF
    43264766-#line 6384 "configure"
    4327 +#line 6398 "configure"
     4767+#line 6404 "configure"
    43284768 #include "confdefs.h"
    43294769 #include <sys/types.h>
    43304770 int
    4331 @@ -6396,16 +6410,16 @@
     4771@@ -6396,16 +6416,16 @@
    43324772 }
    43334773 _ACEOF
    43344774 rm -f conftest.$ac_objext
    43354775-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
    4336 +if { (eval echo "$as_me:6413: \"$ac_compile\"") >&5
     4776+if { (eval echo "$as_me:6419: \"$ac_compile\"") >&5
    43374777   (eval $ac_compile) 2>&5
    43384778   ac_status=$?
    43394779-  echo "$as_me:6402: \$? = $ac_status" >&5
    4340 +  echo "$as_me:6416: \$? = $ac_status" >&5
     4780+  echo "$as_me:6422: \$? = $ac_status" >&5
    43414781   (exit $ac_status); } &&
    43424782          { ac_try='test -s conftest.$ac_objext'
    43434783-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
    4344 +  { (eval echo "$as_me:6419: \"$ac_try\"") >&5
     4784+  { (eval echo "$as_me:6425: \"$ac_try\"") >&5
    43454785   (eval $ac_try) 2>&5
    43464786   ac_status=$?
    43474787-  echo "$as_me:6408: \$? = $ac_status" >&5
    4348 +  echo "$as_me:6422: \$? = $ac_status" >&5
     4788+  echo "$as_me:6428: \$? = $ac_status" >&5
    43494789   (exit $ac_status); }; }; then
    43504790   cf_cv_xopen_source=no
    43514791 else
    4352 @@ -6420,7 +6434,7 @@
     4792@@ -6420,7 +6440,7 @@
    43534793 rm -f conftest.$ac_objext conftest.$ac_ext
    43544794 
    43554795 fi
    43564796-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
    4357 +echo "$as_me:6437: result: $cf_cv_xopen_source" >&5
     4797+echo "$as_me:6443: result: $cf_cv_xopen_source" >&5
    43584798 echo "${ECHO_T}$cf_cv_xopen_source" >&6
    43594799        if test "$cf_cv_xopen_source" != no ; then
    43604800 
    4361 @@ -6454,16 +6468,16 @@
     4801@@ -6454,16 +6474,16 @@
    43624802        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
    43634803                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
    43644804 
    43654805-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
    4366 +echo "$as_me:6471: checking if we should define _POSIX_C_SOURCE" >&5
     4806+echo "$as_me:6477: checking if we should define _POSIX_C_SOURCE" >&5
    43674807 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
    43684808 if test "${cf_cv_posix_c_source+set}" = set; then
    … …  
    43714811 
    43724812-echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
    4373 +echo "${as_me-configure}:6477: testing if the symbol is already defined go no further ..." 1>&5
     4813+echo "${as_me-configure}:6483: testing if the symbol is already defined go no further ..." 1>&5
    43744814 
    43754815        cat >conftest.$ac_ext <<_ACEOF
    43764816-#line 6466 "configure"
    4377 +#line 6480 "configure"
     4817+#line 6486 "configure"
    43784818 #include "confdefs.h"
    43794819 #include <sys/types.h>
    43804820 int
    4381 @@ -6478,16 +6492,16 @@
     4821@@ -6478,16 +6498,16 @@
    43824822 }
    43834823 _ACEOF
    43844824 rm -f conftest.$ac_objext
    43854825-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
    4386 +if { (eval echo "$as_me:6495: \"$ac_compile\"") >&5
     4826+if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5
    43874827   (eval $ac_compile) 2>&5
    43884828   ac_status=$?
    43894829-  echo "$as_me:6484: \$? = $ac_status" >&5
    4390 +  echo "$as_me:6498: \$? = $ac_status" >&5
     4830+  echo "$as_me:6504: \$? = $ac_status" >&5
    43914831   (exit $ac_status); } &&
    43924832          { ac_try='test -s conftest.$ac_objext'
    43934833-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
    4394 +  { (eval echo "$as_me:6501: \"$ac_try\"") >&5
     4834+  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
    43954835   (eval $ac_try) 2>&5
    43964836   ac_status=$?
    43974837-  echo "$as_me:6490: \$? = $ac_status" >&5
    4398 +  echo "$as_me:6504: \$? = $ac_status" >&5
     4838+  echo "$as_me:6510: \$? = $ac_status" >&5
    43994839   (exit $ac_status); }; }; then
    44004840   cf_cv_posix_c_source=no
    44014841 else
    4402 @@ -6508,7 +6522,7 @@
     4842@@ -6508,7 +6528,7 @@
    44034843         esac
    44044844         if test "$cf_want_posix_source" = yes ; then
    44054845                cat >conftest.$ac_ext <<_ACEOF
    44064846-#line 6511 "configure"
    4407 +#line 6525 "configure"
     4847+#line 6531 "configure"
    44084848 #include "confdefs.h"
    44094849 #include <sys/types.h>
    44104850 int
    4411 @@ -6523,16 +6537,16 @@
     4851@@ -6523,16 +6543,16 @@
    44124852 }
    44134853 _ACEOF
    44144854 rm -f conftest.$ac_objext
    44154855-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
    4416 +if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5
     4856+if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
    44174857   (eval $ac_compile) 2>&5
    44184858   ac_status=$?
    44194859-  echo "$as_me:6529: \$? = $ac_status" >&5
    4420 +  echo "$as_me:6543: \$? = $ac_status" >&5
     4860+  echo "$as_me:6549: \$? = $ac_status" >&5
    44214861   (exit $ac_status); } &&
    44224862          { ac_try='test -s conftest.$ac_objext'
    44234863-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
    4424 +  { (eval echo "$as_me:6546: \"$ac_try\"") >&5
     4864+  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
    44254865   (eval $ac_try) 2>&5
    44264866   ac_status=$?
    44274867-  echo "$as_me:6535: \$? = $ac_status" >&5
    4428 +  echo "$as_me:6549: \$? = $ac_status" >&5
     4868+  echo "$as_me:6555: \$? = $ac_status" >&5
    44294869   (exit $ac_status); }; }; then
    44304870   :
    44314871 else
    4432 @@ -6543,15 +6557,15 @@
     4872@@ -6543,15 +6563,15 @@
    44334873 rm -f conftest.$ac_objext conftest.$ac_ext
    44344874         fi
    44354875 
    44364876-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    4437 +echo "${as_me-configure}:6560: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
     4877+echo "${as_me-configure}:6566: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    44384878 
    44394879         CFLAGS="$cf_trim_CFLAGS"
    … …  
    44414881 
    44424882-echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
    4443 +echo "${as_me-configure}:6565: testing if the second compile does not leave our definition intact error ..." 1>&5
     4883+echo "${as_me-configure}:6571: testing if the second compile does not leave our definition intact error ..." 1>&5
    44444884 
    44454885         cat >conftest.$ac_ext <<_ACEOF
    44464886-#line 6554 "configure"
    4447 +#line 6568 "configure"
     4887+#line 6574 "configure"
    44484888 #include "confdefs.h"
    44494889 #include <sys/types.h>
    44504890 int
    4451 @@ -6566,16 +6580,16 @@
     4891@@ -6566,16 +6586,16 @@
    44524892 }
    44534893 _ACEOF
    44544894 rm -f conftest.$ac_objext
    44554895-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
    4456 +if { (eval echo "$as_me:6583: \"$ac_compile\"") >&5
     4896+if { (eval echo "$as_me:6589: \"$ac_compile\"") >&5
    44574897   (eval $ac_compile) 2>&5
    44584898   ac_status=$?
    44594899-  echo "$as_me:6572: \$? = $ac_status" >&5
    4460 +  echo "$as_me:6586: \$? = $ac_status" >&5
     4900+  echo "$as_me:6592: \$? = $ac_status" >&5
    44614901   (exit $ac_status); } &&
    44624902          { ac_try='test -s conftest.$ac_objext'
    44634903-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
    4464 +  { (eval echo "$as_me:6589: \"$ac_try\"") >&5
     4904+  { (eval echo "$as_me:6595: \"$ac_try\"") >&5
    44654905   (eval $ac_try) 2>&5
    44664906   ac_status=$?
    44674907-  echo "$as_me:6578: \$? = $ac_status" >&5
    4468 +  echo "$as_me:6592: \$? = $ac_status" >&5
     4908+  echo "$as_me:6598: \$? = $ac_status" >&5
    44694909   (exit $ac_status); }; }; then
    44704910   :
    44714911 else
    4472 @@ -6591,7 +6605,7 @@
     4912@@ -6591,7 +6611,7 @@
    44734913 rm -f conftest.$ac_objext conftest.$ac_ext
    44744914 
    44754915 fi
    44764916-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
    4477 +echo "$as_me:6608: result: $cf_cv_posix_c_source" >&5
     4917+echo "$as_me:6614: result: $cf_cv_posix_c_source" >&5
    44784918 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
    44794919 
    44804920 if test "$cf_cv_posix_c_source" != no ; then
    4481 @@ -6610,14 +6624,14 @@
     4921@@ -6610,14 +6630,14 @@
    44824922 
    44834923 # Work around breakage on OS X
    44844924 
    44854925-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
    4486 +echo "$as_me:6627: checking if SIGWINCH is defined" >&5
     4926+echo "$as_me:6633: checking if SIGWINCH is defined" >&5
    44874927 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
    44884928 if test "${cf_cv_define_sigwinch+set}" = set; then
    … …  
    44924932        cat >conftest.$ac_ext <<_ACEOF
    44934933-#line 6620 "configure"
    4494 +#line 6634 "configure"
     4934+#line 6640 "configure"
    44954935 #include "confdefs.h"
    44964936 
    44974937 #include <sys/types.h>
    4498 @@ -6632,23 +6646,23 @@
     4938@@ -6632,23 +6652,23 @@
    44994939 }
    45004940 _ACEOF
    45014941 rm -f conftest.$ac_objext
    45024942-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
    4503 +if { (eval echo "$as_me:6649: \"$ac_compile\"") >&5
     4943+if { (eval echo "$as_me:6655: \"$ac_compile\"") >&5
    45044944   (eval $ac_compile) 2>&5
    45054945   ac_status=$?
    45064946-  echo "$as_me:6638: \$? = $ac_status" >&5
    4507 +  echo "$as_me:6652: \$? = $ac_status" >&5
     4947+  echo "$as_me:6658: \$? = $ac_status" >&5
    45084948   (exit $ac_status); } &&
    45094949          { ac_try='test -s conftest.$ac_objext'
    45104950-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
    4511 +  { (eval echo "$as_me:6655: \"$ac_try\"") >&5
     4951+  { (eval echo "$as_me:6661: \"$ac_try\"") >&5
    45124952   (eval $ac_try) 2>&5
    45134953   ac_status=$?
    45144954-  echo "$as_me:6644: \$? = $ac_status" >&5
    4515 +  echo "$as_me:6658: \$? = $ac_status" >&5
     4955+  echo "$as_me:6664: \$? = $ac_status" >&5
    45164956   (exit $ac_status); }; }; then
    45174957   cf_cv_define_sigwinch=yes
    … …  
    45214961 cat >conftest.$ac_ext <<_ACEOF
    45224962-#line 6651 "configure"
    4523 +#line 6665 "configure"
     4963+#line 6671 "configure"
    45244964 #include "confdefs.h"
    45254965 
    45264966 #undef _XOPEN_SOURCE
    4527 @@ -6666,16 +6680,16 @@
     4967@@ -6666,16 +6686,16 @@
    45284968 }
    45294969 _ACEOF
    45304970 rm -f conftest.$ac_objext
    45314971-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
    4532 +if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
     4972+if { (eval echo "$as_me:6689: \"$ac_compile\"") >&5
    45334973   (eval $ac_compile) 2>&5
    45344974   ac_status=$?
    45354975-  echo "$as_me:6672: \$? = $ac_status" >&5
    4536 +  echo "$as_me:6686: \$? = $ac_status" >&5
     4976+  echo "$as_me:6692: \$? = $ac_status" >&5
    45374977   (exit $ac_status); } &&
    45384978          { ac_try='test -s conftest.$ac_objext'
    45394979-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
    4540 +  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
     4980+  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
    45414981   (eval $ac_try) 2>&5
    45424982   ac_status=$?
    45434983-  echo "$as_me:6678: \$? = $ac_status" >&5
    4544 +  echo "$as_me:6692: \$? = $ac_status" >&5
     4984+  echo "$as_me:6698: \$? = $ac_status" >&5
    45454985   (exit $ac_status); }; }; then
    45464986   cf_cv_define_sigwinch=maybe
    45474987 else
    4548 @@ -6689,11 +6703,11 @@
     4988@@ -6689,11 +6709,11 @@
    45494989 rm -f conftest.$ac_objext conftest.$ac_ext
    45504990 
    45514991 fi
    45524992-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
    4553 +echo "$as_me:6706: result: $cf_cv_define_sigwinch" >&5
     4993+echo "$as_me:6712: result: $cf_cv_define_sigwinch" >&5
    45544994 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
    45554995 
    45564996 if test "$cf_cv_define_sigwinch" = maybe ; then
    45574997-echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
    4558 +echo "$as_me:6710: checking for actual SIGWINCH definition" >&5
     4998+echo "$as_me:6716: checking for actual SIGWINCH definition" >&5
    45594999 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
    45605000 if test "${cf_cv_fixup_sigwinch+set}" = set; then
    45615001   echo $ECHO_N "(cached) $ECHO_C" >&6
    4562 @@ -6704,7 +6718,7 @@
     5002@@ -6704,7 +6724,7 @@
    45635003 while test $cf_sigwinch != 1
    45645004 do
    45655005        cat >conftest.$ac_ext <<_ACEOF
    45665006-#line 6707 "configure"
    4567 +#line 6721 "configure"
     5007+#line 6727 "configure"
    45685008 #include "confdefs.h"
    45695009 
    45705010 #undef _XOPEN_SOURCE
    4571 @@ -6726,16 +6740,16 @@
     5011@@ -6726,16 +6746,16 @@
    45725012 }
    45735013 _ACEOF
    45745014 rm -f conftest.$ac_objext
    45755015-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
    4576 +if { (eval echo "$as_me:6743: \"$ac_compile\"") >&5
     5016+if { (eval echo "$as_me:6749: \"$ac_compile\"") >&5
    45775017   (eval $ac_compile) 2>&5
    45785018   ac_status=$?
    45795019-  echo "$as_me:6732: \$? = $ac_status" >&5
    4580 +  echo "$as_me:6746: \$? = $ac_status" >&5
     5020+  echo "$as_me:6752: \$? = $ac_status" >&5
    45815021   (exit $ac_status); } &&
    45825022          { ac_try='test -s conftest.$ac_objext'
    45835023-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
    4584 +  { (eval echo "$as_me:6749: \"$ac_try\"") >&5
     5024+  { (eval echo "$as_me:6755: \"$ac_try\"") >&5
    45855025   (eval $ac_try) 2>&5
    45865026   ac_status=$?
    45875027-  echo "$as_me:6738: \$? = $ac_status" >&5
    4588 +  echo "$as_me:6752: \$? = $ac_status" >&5
     5028+  echo "$as_me:6758: \$? = $ac_status" >&5
    45895029   (exit $ac_status); }; }; then
    45905030   cf_cv_fixup_sigwinch=$cf_sigwinch
    45915031         break
    4592 @@ -6749,7 +6763,7 @@
     5032@@ -6749,7 +6769,7 @@
    45935033 done
    45945034 
    45955035 fi
    45965036-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
    4597 +echo "$as_me:6766: result: $cf_cv_fixup_sigwinch" >&5
     5037+echo "$as_me:6772: result: $cf_cv_fixup_sigwinch" >&5
    45985038 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
    45995039 
    46005040        if test "$cf_cv_fixup_sigwinch" != unknown ; then
    4601 @@ -6759,13 +6773,13 @@
     5041@@ -6759,13 +6779,13 @@
    46025042 
    46035043 # Checks for CODESET support.
    46045044 
    46055045-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
    4606 +  echo "$as_me:6776: checking for nl_langinfo and CODESET" >&5
     5046+  echo "$as_me:6782: checking for nl_langinfo and CODESET" >&5
    46075047 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
    46085048 if test "${am_cv_langinfo_codeset+set}" = set; then
    … …  
    46115051   cat >conftest.$ac_ext <<_ACEOF
    46125052-#line 6768 "configure"
    4613 +#line 6782 "configure"
     5053+#line 6788 "configure"
    46145054 #include "confdefs.h"
    46155055 #include <langinfo.h>
    46165056 int
    4617 @@ -6777,16 +6791,16 @@
     5057@@ -6777,16 +6797,16 @@
    46185058 }
    46195059 _ACEOF
    46205060 rm -f conftest.$ac_objext conftest$ac_exeext
    46215061-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
    4622 +if { (eval echo "$as_me:6794: \"$ac_link\"") >&5
     5062+if { (eval echo "$as_me:6800: \"$ac_link\"") >&5
    46235063   (eval $ac_link) 2>&5
    46245064   ac_status=$?
    46255065-  echo "$as_me:6783: \$? = $ac_status" >&5
    4626 +  echo "$as_me:6797: \$? = $ac_status" >&5
     5066+  echo "$as_me:6803: \$? = $ac_status" >&5
    46275067   (exit $ac_status); } &&
    46285068          { ac_try='test -s conftest$ac_exeext'
    46295069-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
    4630 +  { (eval echo "$as_me:6800: \"$ac_try\"") >&5
     5070+  { (eval echo "$as_me:6806: \"$ac_try\"") >&5
    46315071   (eval $ac_try) 2>&5
    46325072   ac_status=$?
    46335073-  echo "$as_me:6789: \$? = $ac_status" >&5
    4634 +  echo "$as_me:6803: \$? = $ac_status" >&5
     5074+  echo "$as_me:6809: \$? = $ac_status" >&5
    46355075   (exit $ac_status); }; }; then
    46365076   am_cv_langinfo_codeset=yes
    46375077 else
    4638 @@ -6797,7 +6811,7 @@
     5078@@ -6797,7 +6817,7 @@
    46395079 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    46405080 
    46415081 fi
    46425082-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
    4643 +echo "$as_me:6814: result: $am_cv_langinfo_codeset" >&5
     5083+echo "$as_me:6820: result: $am_cv_langinfo_codeset" >&5
    46445084 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    46455085   if test $am_cv_langinfo_codeset = yes; then
    46465086 
    4647 @@ -6811,7 +6825,7 @@
     5087@@ -6811,7 +6831,7 @@
    46485088 NCURSES_OK_WCHAR_T=
    46495089 NCURSES_OK_WINT_T=
    46505090 
    46515091-echo "$as_me:6814: checking if you want wide-character code" >&5
    4652 +echo "$as_me:6828: checking if you want wide-character code" >&5
     5092+echo "$as_me:6834: checking if you want wide-character code" >&5
    46535093 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
    46545094 
    46555095 # Check whether --enable-widec or --disable-widec was given.
    4656 @@ -6821,7 +6835,7 @@
     5096@@ -6821,7 +6841,7 @@
    46575097 else
    46585098   with_widec=no
    46595099 fi;
    46605100-echo "$as_me:6824: result: $with_widec" >&5
    4661 +echo "$as_me:6838: result: $with_widec" >&5
     5101+echo "$as_me:6844: result: $with_widec" >&5
    46625102 echo "${ECHO_T}$with_widec" >&6
    46635103 if test "$with_widec" = yes ; then
    46645104        LIB_SUFFIX="w${LIB_SUFFIX}"
    4665 @@ -6829,10 +6843,10 @@
     5105@@ -6829,10 +6849,10 @@
    46665106 #define USE_WIDEC_SUPPORT 1
    46675107 EOF
    46685108 
    46695109-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    4670 +echo "$as_me:6846: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
     5110+echo "$as_me:6852: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    46715111 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
    46725112 cat >conftest.$ac_ext <<_ACEOF
    46735113-#line 6835 "configure"
    4674 +#line 6849 "configure"
     5114+#line 6855 "configure"
    46755115 #include "confdefs.h"
    46765116 #include <sys/types.h>
    46775117 
    4678 @@ -6848,16 +6862,16 @@
     5118@@ -6848,16 +6868,16 @@
    46795119 }
    46805120 _ACEOF
    46815121 rm -f conftest.$ac_objext
    46825122-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
    4683 +if { (eval echo "$as_me:6865: \"$ac_compile\"") >&5
     5123+if { (eval echo "$as_me:6871: \"$ac_compile\"") >&5
    46845124   (eval $ac_compile) 2>&5
    46855125   ac_status=$?
    46865126-  echo "$as_me:6854: \$? = $ac_status" >&5
    4687 +  echo "$as_me:6868: \$? = $ac_status" >&5
     5127+  echo "$as_me:6874: \$? = $ac_status" >&5
    46885128   (exit $ac_status); } &&
    46895129          { ac_try='test -s conftest.$ac_objext'
    46905130-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
    4691 +  { (eval echo "$as_me:6871: \"$ac_try\"") >&5
     5131+  { (eval echo "$as_me:6877: \"$ac_try\"") >&5
    46925132   (eval $ac_try) 2>&5
    46935133   ac_status=$?
    46945134-  echo "$as_me:6860: \$? = $ac_status" >&5
    4695 +  echo "$as_me:6874: \$? = $ac_status" >&5
     5135+  echo "$as_me:6880: \$? = $ac_status" >&5
    46965136   (exit $ac_status); }; }; then
    46975137   cf_result=no
    46985138 else
    4699 @@ -6866,16 +6880,16 @@
     5139@@ -6866,16 +6886,16 @@
    47005140 cf_result=yes
    47015141 fi
    47025142 rm -f conftest.$ac_objext conftest.$ac_ext
    47035143-echo "$as_me:6869: result: $cf_result" >&5
    4704 +echo "$as_me:6883: result: $cf_result" >&5
     5144+echo "$as_me:6889: result: $cf_result" >&5
    47055145 echo "${ECHO_T}$cf_result" >&6
    47065146 
    … …  
    47095149 elif test "x" != "x" ; then
    47105150-       echo "$as_me:6875: checking checking for compatible value versus " >&5
    4711 +       echo "$as_me:6889: checking checking for compatible value versus " >&5
     5151+       echo "$as_me:6895: checking checking for compatible value versus " >&5
    47125152 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
    47135153        cat >conftest.$ac_ext <<_ACEOF
    47145154-#line 6878 "configure"
    4715 +#line 6892 "configure"
     5155+#line 6898 "configure"
    47165156 #include "confdefs.h"
    47175157 #include <sys/types.h>
    47185158 
    4719 @@ -6891,16 +6905,16 @@
     5159@@ -6891,16 +6911,16 @@
    47205160 }
    47215161 _ACEOF
    47225162 rm -f conftest.$ac_objext
    47235163-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
    4724 +if { (eval echo "$as_me:6908: \"$ac_compile\"") >&5
     5164+if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
    47255165   (eval $ac_compile) 2>&5
    47265166   ac_status=$?
    47275167-  echo "$as_me:6897: \$? = $ac_status" >&5
    4728 +  echo "$as_me:6911: \$? = $ac_status" >&5
     5168+  echo "$as_me:6917: \$? = $ac_status" >&5
    47295169   (exit $ac_status); } &&
    47305170          { ac_try='test -s conftest.$ac_objext'
    47315171-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
    4732 +  { (eval echo "$as_me:6914: \"$ac_try\"") >&5
     5172+  { (eval echo "$as_me:6920: \"$ac_try\"") >&5
    47335173   (eval $ac_try) 2>&5
    47345174   ac_status=$?
    47355175-  echo "$as_me:6903: \$? = $ac_status" >&5
    4736 +  echo "$as_me:6917: \$? = $ac_status" >&5
     5176+  echo "$as_me:6923: \$? = $ac_status" >&5
    47375177   (exit $ac_status); }; }; then
    47385178   cf_result=yes
    47395179 else
    4740 @@ -6909,7 +6923,7 @@
     5180@@ -6909,7 +6929,7 @@
    47415181 cf_result=no
    47425182 fi
    47435183 rm -f conftest.$ac_objext conftest.$ac_ext
    47445184-       echo "$as_me:6912: result: $cf_result" >&5
    4745 +       echo "$as_me:6926: result: $cf_result" >&5
     5185+       echo "$as_me:6932: result: $cf_result" >&5
    47465186 echo "${ECHO_T}$cf_result" >&6
    47475187        if test "$cf_result" = no ; then
    47485188                # perhaps we can override it - try...
    4749 @@ -6923,13 +6937,13 @@
     5189@@ -6923,13 +6943,13 @@
    47505190 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
    47515191 do
    47525192 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    47535193-echo "$as_me:6926: checking for $ac_func" >&5
    4754 +echo "$as_me:6940: checking for $ac_func" >&5
     5194+echo "$as_me:6946: checking for $ac_func" >&5
    47555195 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    47565196 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    47595199   cat >conftest.$ac_ext <<_ACEOF
    47605200-#line 6932 "configure"
    4761 +#line 6946 "configure"
     5201+#line 6952 "configure"
    47625202 #include "confdefs.h"
    47635203 /* System header to define __stub macros and hopefully few prototypes,
    47645204     which can conflict with char $ac_func (); below.  */
    4765 @@ -6960,16 +6974,16 @@
     5205@@ -6960,16 +6980,16 @@
    47665206 }
    47675207 _ACEOF
    47685208 rm -f conftest.$ac_objext conftest$ac_exeext
    47695209-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
    4770 +if { (eval echo "$as_me:6977: \"$ac_link\"") >&5
     5210+if { (eval echo "$as_me:6983: \"$ac_link\"") >&5
    47715211   (eval $ac_link) 2>&5
    47725212   ac_status=$?
    47735213-  echo "$as_me:6966: \$? = $ac_status" >&5
    4774 +  echo "$as_me:6980: \$? = $ac_status" >&5
     5214+  echo "$as_me:6986: \$? = $ac_status" >&5
    47755215   (exit $ac_status); } &&
    47765216          { ac_try='test -s conftest$ac_exeext'
    47775217-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
    4778 +  { (eval echo "$as_me:6983: \"$ac_try\"") >&5
     5218+  { (eval echo "$as_me:6989: \"$ac_try\"") >&5
    47795219   (eval $ac_try) 2>&5
    47805220   ac_status=$?
    47815221-  echo "$as_me:6972: \$? = $ac_status" >&5
    4782 +  echo "$as_me:6986: \$? = $ac_status" >&5
     5222+  echo "$as_me:6992: \$? = $ac_status" >&5
    47835223   (exit $ac_status); }; }; then
    47845224   eval "$as_ac_var=yes"
    47855225 else
    4786 @@ -6979,7 +6993,7 @@
     5226@@ -6979,7 +6999,7 @@
    47875227 fi
    47885228 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    47895229 fi
    47905230-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
    4791 +echo "$as_me:6996: result: `eval echo '${'$as_ac_var'}'`" >&5
     5231+echo "$as_me:7002: result: `eval echo '${'$as_ac_var'}'`" >&5
    47925232 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    47935233 if test `eval echo '${'$as_ac_var'}'` = yes; then
    47945234   cat >>confdefs.h <<EOF
    4795 @@ -6991,7 +7005,7 @@
     5235@@ -6991,7 +7011,7 @@
    47965236 
    47975237        if test "$ac_cv_func_putwc" != yes ; then
    47985238 
    47995239-echo "$as_me:6994: checking for multibyte character support" >&5
    4800 +echo "$as_me:7008: checking for multibyte character support" >&5
     5240+echo "$as_me:7014: checking for multibyte character support" >&5
    48015241 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
    48025242 if test "${cf_cv_utf8_lib+set}" = set; then
    48035243   echo $ECHO_N "(cached) $ECHO_C" >&6
    4804 @@ -6999,7 +7013,7 @@
     5244@@ -6999,7 +7019,7 @@
    48055245 
    48065246        cf_save_LIBS="$LIBS"
    48075247        cat >conftest.$ac_ext <<_ACEOF
    48085248-#line 7002 "configure"
    4809 +#line 7016 "configure"
     5249+#line 7022 "configure"
    48105250 #include "confdefs.h"
    48115251 
    48125252 #include <stdlib.h>
    4813 @@ -7012,16 +7026,16 @@
     5253@@ -7012,16 +7032,16 @@
    48145254 }
    48155255 _ACEOF
    48165256 rm -f conftest.$ac_objext conftest$ac_exeext
    48175257-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
    4818 +if { (eval echo "$as_me:7029: \"$ac_link\"") >&5
     5258+if { (eval echo "$as_me:7035: \"$ac_link\"") >&5
    48195259   (eval $ac_link) 2>&5
    48205260   ac_status=$?
    48215261-  echo "$as_me:7018: \$? = $ac_status" >&5
    4822 +  echo "$as_me:7032: \$? = $ac_status" >&5
     5262+  echo "$as_me:7038: \$? = $ac_status" >&5
    48235263   (exit $ac_status); } &&
    48245264          { ac_try='test -s conftest$ac_exeext'
    48255265-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
    4826 +  { (eval echo "$as_me:7035: \"$ac_try\"") >&5
     5266+  { (eval echo "$as_me:7041: \"$ac_try\"") >&5
    48275267   (eval $ac_try) 2>&5
    48285268   ac_status=$?
    48295269-  echo "$as_me:7024: \$? = $ac_status" >&5
    4830 +  echo "$as_me:7038: \$? = $ac_status" >&5
     5270+  echo "$as_me:7044: \$? = $ac_status" >&5
    48315271   (exit $ac_status); }; }; then
    48325272   cf_cv_utf8_lib=yes
    48335273 else
    4834 @@ -7033,10 +7047,10 @@
     5274@@ -7033,10 +7053,10 @@
    48355275 cf_cv_header_path_utf8=
    48365276 cf_cv_library_path_utf8=
    48375277 
    48385278-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    4839 +echo "${as_me-configure}:7050: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
     5279+echo "${as_me-configure}:7056: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    48405280 
    48415281 cat >conftest.$ac_ext <<_ACEOF
    48425282-#line 7039 "configure"
    4843 +#line 7053 "configure"
     5283+#line 7059 "configure"
    48445284 #include "confdefs.h"
    48455285 
    48465286 #include <libutf8.h>
    4847 @@ -7049,16 +7063,16 @@
     5287@@ -7049,16 +7069,16 @@
    48485288 }
    48495289 _ACEOF
    48505290 rm -f conftest.$ac_objext conftest$ac_exeext
    48515291-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
    4852 +if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
     5292+if { (eval echo "$as_me:7072: \"$ac_link\"") >&5
    48535293   (eval $ac_link) 2>&5
    48545294   ac_status=$?
    48555295-  echo "$as_me:7055: \$? = $ac_status" >&5
    4856 +  echo "$as_me:7069: \$? = $ac_status" >&5
     5296+  echo "$as_me:7075: \$? = $ac_status" >&5
    48575297   (exit $ac_status); } &&
    48585298          { ac_try='test -s conftest$ac_exeext'
    48595299-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
    4860 +  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
     5300+  { (eval echo "$as_me:7078: \"$ac_try\"") >&5
    48615301   (eval $ac_try) 2>&5
    48625302   ac_status=$?
    48635303-  echo "$as_me:7061: \$? = $ac_status" >&5
    4864 +  echo "$as_me:7075: \$? = $ac_status" >&5
     5304+  echo "$as_me:7081: \$? = $ac_status" >&5
    48655305   (exit $ac_status); }; }; then
    48665306   cf_cv_find_linkage_utf8=yes
    48675307 else
    4868 @@ -7067,12 +7081,37 @@
     5308@@ -7067,12 +7087,41 @@
    48695309 
    48705310     cf_cv_find_linkage_utf8=no
    48715311 
    48725312-echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    4873 +echo "${as_me-configure}:7084: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
     5313+    test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
     5314+
     5315+echo "${as_me-configure}:7092: testing find linkage for utf8 library ..." 1>&5
     5316+
     5317+echo "${as_me-configure}:7094: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    48745318 
    48755319     cf_save_CPPFLAGS="$CPPFLAGS"
    … …  
    49065350 test "/usr" != "$prefix" && \
    49075351 test -d "/usr" && \
    4908 @@ -7143,16 +7182,18 @@
     5352@@ -7143,16 +7192,18 @@
    49095353        test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
    49105354 }
    … …  
    49185362 
    49195363-echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    4920 +echo "${as_me-configure}:7192: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
     5364+echo "${as_me-configure}:7202: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    49215365 
    49225366         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
    49235367         cat >conftest.$ac_ext <<_ACEOF
    49245368-#line 7155 "configure"
    4925 +#line 7196 "configure"
     5369+#line 7206 "configure"
    49265370 #include "confdefs.h"
    49275371 
    49285372 #include <libutf8.h>
    4929 @@ -7165,21 +7206,21 @@
     5373@@ -7165,21 +7216,21 @@
    49305374 }
    49315375 _ACEOF
    49325376 rm -f conftest.$ac_objext
    49335377-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
    4934 +if { (eval echo "$as_me:7209: \"$ac_compile\"") >&5
     5378+if { (eval echo "$as_me:7219: \"$ac_compile\"") >&5
    49355379   (eval $ac_compile) 2>&5
    49365380   ac_status=$?
    49375381-  echo "$as_me:7171: \$? = $ac_status" >&5
    4938 +  echo "$as_me:7212: \$? = $ac_status" >&5
     5382+  echo "$as_me:7222: \$? = $ac_status" >&5
    49395383   (exit $ac_status); } &&
    49405384          { ac_try='test -s conftest.$ac_objext'
    49415385-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
    4942 +  { (eval echo "$as_me:7215: \"$ac_try\"") >&5
     5386+  { (eval echo "$as_me:7225: \"$ac_try\"") >&5
    49435387   (eval $ac_try) 2>&5
    49445388   ac_status=$?
    49455389-  echo "$as_me:7177: \$? = $ac_status" >&5
    4946 +  echo "$as_me:7218: \$? = $ac_status" >&5
     5390+  echo "$as_me:7228: \$? = $ac_status" >&5
    49475391   (exit $ac_status); }; }; then
    49485392 
    … …  
    49505394 
    49515395-echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    4952 +echo "${as_me-configure}:7223: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
     5396+echo "${as_me-configure}:7233: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    49535397 
    49545398             cf_cv_find_linkage_utf8=maybe
    49555399             cf_test_CPPFLAGS="$CPPFLAGS"
    4956 @@ -7197,13 +7238,39 @@
     5400@@ -7197,13 +7248,39 @@
    49575401 
    49585402     if test "$cf_cv_find_linkage_utf8" = maybe ; then
    49595403 
    49605404-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    4961 +echo "${as_me-configure}:7241: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
     5405+echo "${as_me-configure}:7251: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    49625406 
    49635407       cf_save_LIBS="$LIBS"
    … …  
    49965440 test "/usr" != "$prefix" && \
    49975441 test -d "/usr" && \
    4998 @@ -7260,18 +7327,20 @@
     5442@@ -7260,18 +7337,20 @@
    49995443        test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
    50005444 }
    … …  
    50085452 
    50095453-echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    5010 +echo "${as_me-configure}:7337: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
     5454+echo "${as_me-configure}:7347: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    50115455 
    50125456             CPPFLAGS="$cf_test_CPPFLAGS"
    … …  
    50155459             cat >conftest.$ac_ext <<_ACEOF
    50165460-#line 7274 "configure"
    5017 +#line 7343 "configure"
     5461+#line 7353 "configure"
    50185462 #include "confdefs.h"
    50195463 
    50205464 #include <libutf8.h>
    5021 @@ -7284,21 +7353,21 @@
     5465@@ -7284,21 +7363,21 @@
    50225466 }
    50235467 _ACEOF
    50245468 rm -f conftest.$ac_objext conftest$ac_exeext
    50255469-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
    5026 +if { (eval echo "$as_me:7356: \"$ac_link\"") >&5
     5470+if { (eval echo "$as_me:7366: \"$ac_link\"") >&5
    50275471   (eval $ac_link) 2>&5
    50285472   ac_status=$?
    50295473-  echo "$as_me:7290: \$? = $ac_status" >&5
    5030 +  echo "$as_me:7359: \$? = $ac_status" >&5
     5474+  echo "$as_me:7369: \$? = $ac_status" >&5
    50315475   (exit $ac_status); } &&
    50325476          { ac_try='test -s conftest$ac_exeext'
    50335477-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
    5034 +  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
     5478+  { (eval echo "$as_me:7372: \"$ac_try\"") >&5
    50355479   (eval $ac_try) 2>&5
    50365480   ac_status=$?
    50375481-  echo "$as_me:7296: \$? = $ac_status" >&5
    5038 +  echo "$as_me:7365: \$? = $ac_status" >&5
     5482+  echo "$as_me:7375: \$? = $ac_status" >&5
    50395483   (exit $ac_status); }; }; then
    50405484 
    … …  
    50425486 
    50435487-echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    5044 +echo "${as_me-configure}:7370: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
     5488+echo "${as_me-configure}:7380: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    50455489 
    50465490                 cf_cv_find_linkage_utf8=yes
    50475491                 cf_cv_library_file_utf8="-lutf8"
    5048 @@ -7336,7 +7405,7 @@
     5492@@ -7336,7 +7415,7 @@
    50495493 fi
    50505494 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    50515495 fi
    50525496-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
    5053 +echo "$as_me:7408: result: $cf_cv_utf8_lib" >&5
     5497+echo "$as_me:7418: result: $cf_cv_utf8_lib" >&5
    50545498 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
    50555499 
    50565500 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    5057 @@ -7370,7 +7439,7 @@
     5501@@ -7364,13 +7443,13 @@
     5502                fi
     5503 
     5504                if test "$cf_have_incdir" = no ; then
     5505-          if test "$cf_add_incdir" = /usr/local/include ; then
     5506+                 if test "$cf_add_incdir" = /usr/local/include ; then
     5507                        if test "$GCC" = yes
     5508                        then
    50585509                          cf_save_CPPFLAGS=$CPPFLAGS
    50595510                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    50605511                          cat >conftest.$ac_ext <<_ACEOF
    50615512-#line 7373 "configure"
    5062 +#line 7442 "configure"
     5513+#line 7452 "configure"
    50635514 #include "confdefs.h"
    50645515 #include <stdio.h>
    50655516 int
    5066 @@ -7382,16 +7451,16 @@
     5517@@ -7382,16 +7461,16 @@
    50675518 }
    50685519 _ACEOF
    50695520 rm -f conftest.$ac_objext
    50705521-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
    5071 +if { (eval echo "$as_me:7454: \"$ac_compile\"") >&5
     5522+if { (eval echo "$as_me:7464: \"$ac_compile\"") >&5
    50725523   (eval $ac_compile) 2>&5
    50735524   ac_status=$?
    50745525-  echo "$as_me:7388: \$? = $ac_status" >&5
    5075 +  echo "$as_me:7457: \$? = $ac_status" >&5
     5526+  echo "$as_me:7467: \$? = $ac_status" >&5
    50765527   (exit $ac_status); } &&
    50775528          { ac_try='test -s conftest.$ac_objext'
    50785529-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
    5079 +  { (eval echo "$as_me:7460: \"$ac_try\"") >&5
     5530+  { (eval echo "$as_me:7470: \"$ac_try\"") >&5
    50805531   (eval $ac_try) 2>&5
    50815532   ac_status=$?
    50825533-  echo "$as_me:7394: \$? = $ac_status" >&5
    5083 +  echo "$as_me:7463: \$? = $ac_status" >&5
     5534+  echo "$as_me:7473: \$? = $ac_status" >&5
    50845535   (exit $ac_status); }; }; then
    50855536   :
    50865537 else
    5087 @@ -7408,7 +7477,7 @@
     5538@@ -7408,13 +7487,13 @@
    50885539                if test "$cf_have_incdir" = no ; then
    50895540                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    50905541 
    50915542-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
    5092 +echo "${as_me-configure}:7480: testing adding $cf_add_incdir to include-path ..." 1>&5
     5543+echo "${as_me-configure}:7490: testing adding $cf_add_incdir to include-path ..." 1>&5
    50935544 
    50945545                  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
    50955546 
    5096 @@ -7442,7 +7511,7 @@
     5547-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     5548-          test "$cf_top_incdir" = "$cf_add_incdir" && break
     5549-          cf_add_incdir="$cf_top_incdir"
     5550+                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     5551+                 test "$cf_top_incdir" = "$cf_add_incdir" && break
     5552+                 cf_add_incdir="$cf_top_incdir"
     5553                else
     5554                  break
     5555                fi
     5556@@ -7442,7 +7521,7 @@
    50975557       if test "$cf_have_libdir" = no ; then
    50985558         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    50995559 
    51005560-echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
    5101 +echo "${as_me-configure}:7514: testing adding $cf_add_libdir to library-path ..." 1>&5
     5561+echo "${as_me-configure}:7524: testing adding $cf_add_libdir to library-path ..." 1>&5
    51025562 
    51035563         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    51045564       fi
    5105 @@ -7459,14 +7528,14 @@
     5565@@ -7459,14 +7538,14 @@
    51065566        fi
    51075567 
    51085568 # This is needed on Tru64 5.0 to declare mbstate_t
    51095569-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
    5110 +echo "$as_me:7531: checking if we must include wchar.h to declare mbstate_t" >&5
     5570+echo "$as_me:7541: checking if we must include wchar.h to declare mbstate_t" >&5
    51115571 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
    51125572 if test "${cf_cv_mbstate_t+set}" = set; then
    … …  
    51165576 cat >conftest.$ac_ext <<_ACEOF
    51175577-#line 7469 "configure"
    5118 +#line 7538 "configure"
     5578+#line 7548 "configure"
    51195579 #include "confdefs.h"
    51205580 
    51215581 #include <stdlib.h>
    5122 @@ -7484,23 +7553,23 @@
     5582@@ -7484,23 +7563,23 @@
    51235583 }
    51245584 _ACEOF
    51255585 rm -f conftest.$ac_objext
    51265586-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
    5127 +if { (eval echo "$as_me:7556: \"$ac_compile\"") >&5
     5587+if { (eval echo "$as_me:7566: \"$ac_compile\"") >&5
    51285588   (eval $ac_compile) 2>&5
    51295589   ac_status=$?
    51305590-  echo "$as_me:7490: \$? = $ac_status" >&5
    5131 +  echo "$as_me:7559: \$? = $ac_status" >&5
     5591+  echo "$as_me:7569: \$? = $ac_status" >&5
    51325592   (exit $ac_status); } &&
    51335593          { ac_try='test -s conftest.$ac_objext'
    51345594-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
    5135 +  { (eval echo "$as_me:7562: \"$ac_try\"") >&5
     5595+  { (eval echo "$as_me:7572: \"$ac_try\"") >&5
    51365596   (eval $ac_try) 2>&5
    51375597   ac_status=$?
    51385598-  echo "$as_me:7496: \$? = $ac_status" >&5
    5139 +  echo "$as_me:7565: \$? = $ac_status" >&5
     5599+  echo "$as_me:7575: \$? = $ac_status" >&5
    51405600   (exit $ac_status); }; }; then
    51415601   cf_cv_mbstate_t=no
    … …  
    51455605 cat >conftest.$ac_ext <<_ACEOF
    51465606-#line 7503 "configure"
    5147 +#line 7572 "configure"
     5607+#line 7582 "configure"
    51485608 #include "confdefs.h"
    51495609 
    51505610 #include <stdlib.h>
    5151 @@ -7519,16 +7588,16 @@
     5611@@ -7519,16 +7598,16 @@
    51525612 }
    51535613 _ACEOF
    51545614 rm -f conftest.$ac_objext
    51555615-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
    5156 +if { (eval echo "$as_me:7591: \"$ac_compile\"") >&5
     5616+if { (eval echo "$as_me:7601: \"$ac_compile\"") >&5
    51575617   (eval $ac_compile) 2>&5
    51585618   ac_status=$?
    51595619-  echo "$as_me:7525: \$? = $ac_status" >&5
    5160 +  echo "$as_me:7594: \$? = $ac_status" >&5
     5620+  echo "$as_me:7604: \$? = $ac_status" >&5
    51615621   (exit $ac_status); } &&
    51625622          { ac_try='test -s conftest.$ac_objext'
    51635623-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
    5164 +  { (eval echo "$as_me:7597: \"$ac_try\"") >&5
     5624+  { (eval echo "$as_me:7607: \"$ac_try\"") >&5
    51655625   (eval $ac_try) 2>&5
    51665626   ac_status=$?
    51675627-  echo "$as_me:7531: \$? = $ac_status" >&5
    5168 +  echo "$as_me:7600: \$? = $ac_status" >&5
     5628+  echo "$as_me:7610: \$? = $ac_status" >&5
    51695629   (exit $ac_status); }; }; then
    51705630   cf_cv_mbstate_t=yes
    51715631 else
    5172 @@ -7540,7 +7609,7 @@
     5632@@ -7540,7 +7619,7 @@
    51735633 fi
    51745634 rm -f conftest.$ac_objext conftest.$ac_ext
    51755635 fi
    51765636-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
    5177 +echo "$as_me:7612: result: $cf_cv_mbstate_t" >&5
     5637+echo "$as_me:7622: result: $cf_cv_mbstate_t" >&5
    51785638 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
    51795639 
    51805640 if test "$cf_cv_mbstate_t" = yes ; then
    5181 @@ -7557,14 +7626,14 @@
     5641@@ -7557,14 +7636,14 @@
    51825642 fi
    51835643 
    51845644 # This is needed on Tru64 5.0 to declare wchar_t
    51855645-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
    5186 +echo "$as_me:7629: checking if we must include wchar.h to declare wchar_t" >&5
     5646+echo "$as_me:7639: checking if we must include wchar.h to declare wchar_t" >&5
    51875647 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
    51885648 if test "${cf_cv_wchar_t+set}" = set; then
    … …  
    51925652 cat >conftest.$ac_ext <<_ACEOF
    51935653-#line 7567 "configure"
    5194 +#line 7636 "configure"
     5654+#line 7646 "configure"
    51955655 #include "confdefs.h"
    51965656 
    51975657 #include <stdlib.h>
    5198 @@ -7582,23 +7651,23 @@
     5658@@ -7582,23 +7661,23 @@
    51995659 }
    52005660 _ACEOF
    52015661 rm -f conftest.$ac_objext
    52025662-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
    5203 +if { (eval echo "$as_me:7654: \"$ac_compile\"") >&5
     5663+if { (eval echo "$as_me:7664: \"$ac_compile\"") >&5
    52045664   (eval $ac_compile) 2>&5
    52055665   ac_status=$?
    52065666-  echo "$as_me:7588: \$? = $ac_status" >&5
    5207 +  echo "$as_me:7657: \$? = $ac_status" >&5
     5667+  echo "$as_me:7667: \$? = $ac_status" >&5
    52085668   (exit $ac_status); } &&
    52095669          { ac_try='test -s conftest.$ac_objext'
    52105670-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
    5211 +  { (eval echo "$as_me:7660: \"$ac_try\"") >&5
     5671+  { (eval echo "$as_me:7670: \"$ac_try\"") >&5
    52125672   (eval $ac_try) 2>&5
    52135673   ac_status=$?
    52145674-  echo "$as_me:7594: \$? = $ac_status" >&5
    5215 +  echo "$as_me:7663: \$? = $ac_status" >&5
     5675+  echo "$as_me:7673: \$? = $ac_status" >&5
    52165676   (exit $ac_status); }; }; then
    52175677   cf_cv_wchar_t=no
    … …  
    52215681 cat >conftest.$ac_ext <<_ACEOF
    52225682-#line 7601 "configure"
    5223 +#line 7670 "configure"
     5683+#line 7680 "configure"
    52245684 #include "confdefs.h"
    52255685 
    52265686 #include <stdlib.h>
    5227 @@ -7617,16 +7686,16 @@
     5687@@ -7617,16 +7696,16 @@
    52285688 }
    52295689 _ACEOF
    52305690 rm -f conftest.$ac_objext
    52315691-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
    5232 +if { (eval echo "$as_me:7689: \"$ac_compile\"") >&5
     5692+if { (eval echo "$as_me:7699: \"$ac_compile\"") >&5
    52335693   (eval $ac_compile) 2>&5
    52345694   ac_status=$?
    52355695-  echo "$as_me:7623: \$? = $ac_status" >&5
    5236 +  echo "$as_me:7692: \$? = $ac_status" >&5
     5696+  echo "$as_me:7702: \$? = $ac_status" >&5
    52375697   (exit $ac_status); } &&
    52385698          { ac_try='test -s conftest.$ac_objext'
    52395699-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
    5240 +  { (eval echo "$as_me:7695: \"$ac_try\"") >&5
     5700+  { (eval echo "$as_me:7705: \"$ac_try\"") >&5
    52415701   (eval $ac_try) 2>&5
    52425702   ac_status=$?
    52435703-  echo "$as_me:7629: \$? = $ac_status" >&5
    5244 +  echo "$as_me:7698: \$? = $ac_status" >&5
     5704+  echo "$as_me:7708: \$? = $ac_status" >&5
    52455705   (exit $ac_status); }; }; then
    52465706   cf_cv_wchar_t=yes
    52475707 else
    5248 @@ -7638,7 +7707,7 @@
     5708@@ -7638,7 +7717,7 @@
    52495709 fi
    52505710 rm -f conftest.$ac_objext conftest.$ac_ext
    52515711 fi
    52525712-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
    5253 +echo "$as_me:7710: result: $cf_cv_wchar_t" >&5
     5713+echo "$as_me:7720: result: $cf_cv_wchar_t" >&5
    52545714 echo "${ECHO_T}$cf_cv_wchar_t" >&6
    52555715 
    52565716 if test "$cf_cv_wchar_t" = yes ; then
    5257 @@ -7660,14 +7729,14 @@
     5717@@ -7660,14 +7739,14 @@
    52585718 fi
    52595719 
    52605720 # This is needed on Tru64 5.0 to declare wint_t
    52615721-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
    5262 +echo "$as_me:7732: checking if we must include wchar.h to declare wint_t" >&5
     5722+echo "$as_me:7742: checking if we must include wchar.h to declare wint_t" >&5
    52635723 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
    52645724 if test "${cf_cv_wint_t+set}" = set; then
    … …  
    52685728 cat >conftest.$ac_ext <<_ACEOF
    52695729-#line 7670 "configure"
    5270 +#line 7739 "configure"
     5730+#line 7749 "configure"
    52715731 #include "confdefs.h"
    52725732 
    52735733 #include <stdlib.h>
    5274 @@ -7685,23 +7754,23 @@
     5734@@ -7685,23 +7764,23 @@
    52755735 }
    52765736 _ACEOF
    52775737 rm -f conftest.$ac_objext
    52785738-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
    5279 +if { (eval echo "$as_me:7757: \"$ac_compile\"") >&5
     5739+if { (eval echo "$as_me:7767: \"$ac_compile\"") >&5
    52805740   (eval $ac_compile) 2>&5
    52815741   ac_status=$?
    52825742-  echo "$as_me:7691: \$? = $ac_status" >&5
    5283 +  echo "$as_me:7760: \$? = $ac_status" >&5
     5743+  echo "$as_me:7770: \$? = $ac_status" >&5
    52845744   (exit $ac_status); } &&
    52855745          { ac_try='test -s conftest.$ac_objext'
    52865746-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
    5287 +  { (eval echo "$as_me:7763: \"$ac_try\"") >&5
     5747+  { (eval echo "$as_me:7773: \"$ac_try\"") >&5
    52885748   (eval $ac_try) 2>&5
    52895749   ac_status=$?
    52905750-  echo "$as_me:7697: \$? = $ac_status" >&5
    5291 +  echo "$as_me:7766: \$? = $ac_status" >&5
     5751+  echo "$as_me:7776: \$? = $ac_status" >&5
    52925752   (exit $ac_status); }; }; then
    52935753   cf_cv_wint_t=no
    … …  
    52975757 cat >conftest.$ac_ext <<_ACEOF
    52985758-#line 7704 "configure"
    5299 +#line 7773 "configure"
     5759+#line 7783 "configure"
    53005760 #include "confdefs.h"
    53015761 
    53025762 #include <stdlib.h>
    5303 @@ -7720,16 +7789,16 @@
     5763@@ -7720,16 +7799,16 @@
    53045764 }
    53055765 _ACEOF
    53065766 rm -f conftest.$ac_objext
    53075767-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
    5308 +if { (eval echo "$as_me:7792: \"$ac_compile\"") >&5
     5768+if { (eval echo "$as_me:7802: \"$ac_compile\"") >&5
    53095769   (eval $ac_compile) 2>&5
    53105770   ac_status=$?
    53115771-  echo "$as_me:7726: \$? = $ac_status" >&5
    5312 +  echo "$as_me:7795: \$? = $ac_status" >&5
     5772+  echo "$as_me:7805: \$? = $ac_status" >&5
    53135773   (exit $ac_status); } &&
    53145774          { ac_try='test -s conftest.$ac_objext'
    53155775-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
    5316 +  { (eval echo "$as_me:7798: \"$ac_try\"") >&5
     5776+  { (eval echo "$as_me:7808: \"$ac_try\"") >&5
    53175777   (eval $ac_try) 2>&5
    53185778   ac_status=$?
    53195779-  echo "$as_me:7732: \$? = $ac_status" >&5
    5320 +  echo "$as_me:7801: \$? = $ac_status" >&5
     5780+  echo "$as_me:7811: \$? = $ac_status" >&5
    53215781   (exit $ac_status); }; }; then
    53225782   cf_cv_wint_t=yes
    53235783 else
    5324 @@ -7741,7 +7810,7 @@
     5784@@ -7741,7 +7820,7 @@
    53255785 fi
    53265786 rm -f conftest.$ac_objext conftest.$ac_ext
    53275787 fi
    53285788-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
    5329 +echo "$as_me:7813: result: $cf_cv_wint_t" >&5
     5789+echo "$as_me:7823: result: $cf_cv_wint_t" >&5
    53305790 echo "${ECHO_T}$cf_cv_wint_t" >&6
    53315791 
    53325792 if test "$cf_cv_wint_t" = yes ; then
    5333 @@ -7780,7 +7849,7 @@
     5793@@ -7780,7 +7859,7 @@
    53345794        ;;
    53355795 esac
    53365796 
    53375797-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
    5338 +echo "$as_me:7852: checking whether to enable _LP64 definition in curses.h" >&5
     5798+echo "$as_me:7862: checking whether to enable _LP64 definition in curses.h" >&5
    53395799 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
    53405800 
    53415801 # Check whether --enable-lp64 or --disable-lp64 was given.
    5342 @@ -7790,7 +7859,7 @@
     5802@@ -7790,7 +7869,7 @@
    53435803 else
    53445804   with_lp64=$default_with_lp64
    53455805 fi;
    53465806-echo "$as_me:7793: result: $with_lp64" >&5
    5347 +echo "$as_me:7862: result: $with_lp64" >&5
     5807+echo "$as_me:7872: result: $with_lp64" >&5
    53485808 echo "${ECHO_T}$with_lp64" >&6
    53495809 
    53505810 if test "$with_lp64" = yes ; then
    5351 @@ -7806,7 +7875,7 @@
     5811@@ -7806,7 +7885,7 @@
    53525812 fi;
    53535813 if test "$enable_largefile" != no; then
    53545814 
    53555815-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
    5356 +  echo "$as_me:7878: checking for special C compiler options needed for large files" >&5
     5816+  echo "$as_me:7888: checking for special C compiler options needed for large files" >&5
    53575817 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
    53585818 if test "${ac_cv_sys_largefile_CC+set}" = set; then
    53595819   echo $ECHO_N "(cached) $ECHO_C" >&6
    5360 @@ -7818,7 +7887,7 @@
     5820@@ -7818,7 +7897,7 @@
    53615821         # IRIX 6.2 and later do not support large files by default,
    53625822         # so use the C compiler's -n32 option if that helps.
    53635823          cat >conftest.$ac_ext <<_ACEOF
    53645824-#line 7821 "configure"
    5365 +#line 7890 "configure"
     5825+#line 7900 "configure"
    53665826 #include "confdefs.h"
    53675827 #include <sys/types.h>
    53685828  /* Check that off_t can represent 2**63 - 1 correctly.
    5369 @@ -7838,16 +7907,16 @@
     5829@@ -7838,16 +7917,16 @@
    53705830 }
    53715831 _ACEOF
    53725832         rm -f conftest.$ac_objext
    53735833-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
    5374 +if { (eval echo "$as_me:7910: \"$ac_compile\"") >&5
     5834+if { (eval echo "$as_me:7920: \"$ac_compile\"") >&5
    53755835   (eval $ac_compile) 2>&5
    53765836   ac_status=$?
    53775837-  echo "$as_me:7844: \$? = $ac_status" >&5
    5378 +  echo "$as_me:7913: \$? = $ac_status" >&5
     5838+  echo "$as_me:7923: \$? = $ac_status" >&5
    53795839   (exit $ac_status); } &&
    53805840          { ac_try='test -s conftest.$ac_objext'
    53815841-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
    5382 +  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
     5842+  { (eval echo "$as_me:7926: \"$ac_try\"") >&5
    53835843   (eval $ac_try) 2>&5
    53845844   ac_status=$?
    53855845-  echo "$as_me:7850: \$? = $ac_status" >&5
    5386 +  echo "$as_me:7919: \$? = $ac_status" >&5
     5846+  echo "$as_me:7929: \$? = $ac_status" >&5
    53875847   (exit $ac_status); }; }; then
    53885848   break
    53895849 else
    5390 @@ -7857,16 +7926,16 @@
     5850@@ -7857,16 +7936,16 @@
    53915851 rm -f conftest.$ac_objext
    53925852         CC="$CC -n32"
    53935853         rm -f conftest.$ac_objext
    53945854-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
    5395 +if { (eval echo "$as_me:7929: \"$ac_compile\"") >&5
     5855+if { (eval echo "$as_me:7939: \"$ac_compile\"") >&5
    53965856   (eval $ac_compile) 2>&5
    53975857   ac_status=$?
    53985858-  echo "$as_me:7863: \$? = $ac_status" >&5
    5399 +  echo "$as_me:7932: \$? = $ac_status" >&5
     5859+  echo "$as_me:7942: \$? = $ac_status" >&5
    54005860   (exit $ac_status); } &&
    54015861          { ac_try='test -s conftest.$ac_objext'
    54025862-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
    5403 +  { (eval echo "$as_me:7935: \"$ac_try\"") >&5
     5863+  { (eval echo "$as_me:7945: \"$ac_try\"") >&5
    54045864   (eval $ac_try) 2>&5
    54055865   ac_status=$?
    54065866-  echo "$as_me:7869: \$? = $ac_status" >&5
    5407 +  echo "$as_me:7938: \$? = $ac_status" >&5
     5867+  echo "$as_me:7948: \$? = $ac_status" >&5
    54085868   (exit $ac_status); }; }; then
    54095869   ac_cv_sys_largefile_CC=' -n32'; break
    54105870 else
    5411 @@ -7880,13 +7949,13 @@
     5871@@ -7880,13 +7959,13 @@
    54125872        rm -f conftest.$ac_ext
    54135873     fi
    54145874 fi
    54155875-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
    5416 +echo "$as_me:7952: result: $ac_cv_sys_largefile_CC" >&5
     5876+echo "$as_me:7962: result: $ac_cv_sys_largefile_CC" >&5
    54175877 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
    54185878   if test "$ac_cv_sys_largefile_CC" != no; then
    … …  
    54215881 
    54225882-  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    5423 +  echo "$as_me:7958: checking for _FILE_OFFSET_BITS value needed for large files" >&5
     5883+  echo "$as_me:7968: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    54245884 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
    54255885 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    54265886   echo $ECHO_N "(cached) $ECHO_C" >&6
    5427 @@ -7894,7 +7963,7 @@
     5887@@ -7894,7 +7973,7 @@
    54285888   while :; do
    54295889   ac_cv_sys_file_offset_bits=no
    54305890   cat >conftest.$ac_ext <<_ACEOF
    54315891-#line 7897 "configure"
    5432 +#line 7966 "configure"
     5892+#line 7976 "configure"
    54335893 #include "confdefs.h"
    54345894 #include <sys/types.h>
    54355895  /* Check that off_t can represent 2**63 - 1 correctly.
    5436 @@ -7914,16 +7983,16 @@
     5896@@ -7914,16 +7993,16 @@
    54375897 }
    54385898 _ACEOF
    54395899 rm -f conftest.$ac_objext
    54405900-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
    5441 +if { (eval echo "$as_me:7986: \"$ac_compile\"") >&5
     5901+if { (eval echo "$as_me:7996: \"$ac_compile\"") >&5
    54425902   (eval $ac_compile) 2>&5
    54435903   ac_status=$?
    54445904-  echo "$as_me:7920: \$? = $ac_status" >&5
    5445 +  echo "$as_me:7989: \$? = $ac_status" >&5
     5905+  echo "$as_me:7999: \$? = $ac_status" >&5
    54465906   (exit $ac_status); } &&
    54475907          { ac_try='test -s conftest.$ac_objext'
    54485908-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
    5449 +  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
     5909+  { (eval echo "$as_me:8002: \"$ac_try\"") >&5
    54505910   (eval $ac_try) 2>&5
    54515911   ac_status=$?
    54525912-  echo "$as_me:7926: \$? = $ac_status" >&5
    5453 +  echo "$as_me:7995: \$? = $ac_status" >&5
     5913+  echo "$as_me:8005: \$? = $ac_status" >&5
    54545914   (exit $ac_status); }; }; then
    54555915   break
    54565916 else
    5457 @@ -7932,7 +8001,7 @@
     5917@@ -7932,7 +8011,7 @@
    54585918 fi
    54595919 rm -f conftest.$ac_objext conftest.$ac_ext
    54605920   cat >conftest.$ac_ext <<_ACEOF
    54615921-#line 7935 "configure"
    5462 +#line 8004 "configure"
     5922+#line 8014 "configure"
    54635923 #include "confdefs.h"
    54645924 #define _FILE_OFFSET_BITS 64
    54655925 #include <sys/types.h>
    5466 @@ -7953,16 +8022,16 @@
     5926@@ -7953,16 +8032,16 @@
    54675927 }
    54685928 _ACEOF
    54695929 rm -f conftest.$ac_objext
    54705930-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
    5471 +if { (eval echo "$as_me:8025: \"$ac_compile\"") >&5
     5931+if { (eval echo "$as_me:8035: \"$ac_compile\"") >&5
    54725932   (eval $ac_compile) 2>&5
    54735933   ac_status=$?
    54745934-  echo "$as_me:7959: \$? = $ac_status" >&5
    5475 +  echo "$as_me:8028: \$? = $ac_status" >&5
     5935+  echo "$as_me:8038: \$? = $ac_status" >&5
    54765936   (exit $ac_status); } &&
    54775937          { ac_try='test -s conftest.$ac_objext'
    54785938-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
    5479 +  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
     5939+  { (eval echo "$as_me:8041: \"$ac_try\"") >&5
    54805940   (eval $ac_try) 2>&5
    54815941   ac_status=$?
    54825942-  echo "$as_me:7965: \$? = $ac_status" >&5
    5483 +  echo "$as_me:8034: \$? = $ac_status" >&5
     5943+  echo "$as_me:8044: \$? = $ac_status" >&5
    54845944   (exit $ac_status); }; }; then
    54855945   ac_cv_sys_file_offset_bits=64; break
    54865946 else
    5487 @@ -7973,7 +8042,7 @@
     5947@@ -7973,7 +8052,7 @@
    54885948   break
    54895949 done
    54905950 fi
    54915951-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
    5492 +echo "$as_me:8045: result: $ac_cv_sys_file_offset_bits" >&5
     5952+echo "$as_me:8055: result: $ac_cv_sys_file_offset_bits" >&5
    54935953 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
    54945954 if test "$ac_cv_sys_file_offset_bits" != no; then
    54955955 
    5496 @@ -7983,7 +8052,7 @@
     5956@@ -7983,7 +8062,7 @@
    54975957 
    54985958 fi
    54995959 rm -f conftest*
    55005960-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
    5501 +  echo "$as_me:8055: checking for _LARGE_FILES value needed for large files" >&5
     5961+  echo "$as_me:8065: checking for _LARGE_FILES value needed for large files" >&5
    55025962 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
    55035963 if test "${ac_cv_sys_large_files+set}" = set; then
    55045964   echo $ECHO_N "(cached) $ECHO_C" >&6
    5505 @@ -7991,7 +8060,7 @@
     5965@@ -7991,7 +8070,7 @@
    55065966   while :; do
    55075967   ac_cv_sys_large_files=no
    55085968   cat >conftest.$ac_ext <<_ACEOF
    55095969-#line 7994 "configure"
    5510 +#line 8063 "configure"
     5970+#line 8073 "configure"
    55115971 #include "confdefs.h"
    55125972 #include <sys/types.h>
    55135973  /* Check that off_t can represent 2**63 - 1 correctly.
    5514 @@ -8011,16 +8080,16 @@
     5974@@ -8011,16 +8090,16 @@
    55155975 }
    55165976 _ACEOF
    55175977 rm -f conftest.$ac_objext
    55185978-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
    5519 +if { (eval echo "$as_me:8083: \"$ac_compile\"") >&5
     5979+if { (eval echo "$as_me:8093: \"$ac_compile\"") >&5
    55205980   (eval $ac_compile) 2>&5
    55215981   ac_status=$?
    55225982-  echo "$as_me:8017: \$? = $ac_status" >&5
    5523 +  echo "$as_me:8086: \$? = $ac_status" >&5
     5983+  echo "$as_me:8096: \$? = $ac_status" >&5
    55245984   (exit $ac_status); } &&
    55255985          { ac_try='test -s conftest.$ac_objext'
    55265986-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
    5527 +  { (eval echo "$as_me:8089: \"$ac_try\"") >&5
     5987+  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
    55285988   (eval $ac_try) 2>&5
    55295989   ac_status=$?
    55305990-  echo "$as_me:8023: \$? = $ac_status" >&5
    5531 +  echo "$as_me:8092: \$? = $ac_status" >&5
     5991+  echo "$as_me:8102: \$? = $ac_status" >&5
    55325992   (exit $ac_status); }; }; then
    55335993   break
    55345994 else
    5535 @@ -8029,7 +8098,7 @@
     5995@@ -8029,7 +8108,7 @@
    55365996 fi
    55375997 rm -f conftest.$ac_objext conftest.$ac_ext
    55385998   cat >conftest.$ac_ext <<_ACEOF
    55395999-#line 8032 "configure"
    5540 +#line 8101 "configure"
     6000+#line 8111 "configure"
    55416001 #include "confdefs.h"
    55426002 #define _LARGE_FILES 1
    55436003 #include <sys/types.h>
    5544 @@ -8050,16 +8119,16 @@
     6004@@ -8050,16 +8129,16 @@
    55456005 }
    55466006 _ACEOF
    55476007 rm -f conftest.$ac_objext
    55486008-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
    5549 +if { (eval echo "$as_me:8122: \"$ac_compile\"") >&5
     6009+if { (eval echo "$as_me:8132: \"$ac_compile\"") >&5
    55506010   (eval $ac_compile) 2>&5
    55516011   ac_status=$?
    55526012-  echo "$as_me:8056: \$? = $ac_status" >&5
    5553 +  echo "$as_me:8125: \$? = $ac_status" >&5
     6013+  echo "$as_me:8135: \$? = $ac_status" >&5
    55546014   (exit $ac_status); } &&
    55556015          { ac_try='test -s conftest.$ac_objext'
    55566016-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
    5557 +  { (eval echo "$as_me:8128: \"$ac_try\"") >&5
     6017+  { (eval echo "$as_me:8138: \"$ac_try\"") >&5
    55586018   (eval $ac_try) 2>&5
    55596019   ac_status=$?
    55606020-  echo "$as_me:8062: \$? = $ac_status" >&5
    5561 +  echo "$as_me:8131: \$? = $ac_status" >&5
     6021+  echo "$as_me:8141: \$? = $ac_status" >&5
    55626022   (exit $ac_status); }; }; then
    55636023   ac_cv_sys_large_files=1; break
    55646024 else
    5565 @@ -8070,7 +8139,7 @@
     6025@@ -8070,7 +8149,7 @@
    55666026   break
    55676027 done
    55686028 fi
    55696029-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
    5570 +echo "$as_me:8142: result: $ac_cv_sys_large_files" >&5
     6030+echo "$as_me:8152: result: $ac_cv_sys_large_files" >&5
    55716031 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
    55726032 if test "$ac_cv_sys_large_files" != no; then
    55736033 
    5574 @@ -8083,7 +8152,7 @@
     6034@@ -8083,7 +8162,7 @@
    55756035 fi
    55766036 
    55776037     if test "$enable_largefile" != no ; then
    55786038-       echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    5579 +       echo "$as_me:8155: checking for _LARGEFILE_SOURCE value needed for large files" >&5
     6039+       echo "$as_me:8165: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    55806040 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
    55816041 if test "${ac_cv_sys_largefile_source+set}" = set; then
    55826042   echo $ECHO_N "(cached) $ECHO_C" >&6
    5583 @@ -8091,7 +8160,7 @@
     6043@@ -8091,7 +8170,7 @@
    55846044   while :; do
    55856045   ac_cv_sys_largefile_source=no
    55866046   cat >conftest.$ac_ext <<_ACEOF
    55876047-#line 8094 "configure"
    5588 +#line 8163 "configure"
     6048+#line 8173 "configure"
    55896049 #include "confdefs.h"
    55906050 #include <stdio.h>
    55916051 int
    5592 @@ -8103,16 +8172,16 @@
     6052@@ -8103,16 +8182,16 @@
    55936053 }
    55946054 _ACEOF
    55956055 rm -f conftest.$ac_objext
    55966056-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
    5597 +if { (eval echo "$as_me:8175: \"$ac_compile\"") >&5
     6057+if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5
    55986058   (eval $ac_compile) 2>&5
    55996059   ac_status=$?
    56006060-  echo "$as_me:8109: \$? = $ac_status" >&5
    5601 +  echo "$as_me:8178: \$? = $ac_status" >&5
     6061+  echo "$as_me:8188: \$? = $ac_status" >&5
    56026062   (exit $ac_status); } &&
    56036063          { ac_try='test -s conftest.$ac_objext'
    56046064-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
    5605 +  { (eval echo "$as_me:8181: \"$ac_try\"") >&5
     6065+  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
    56066066   (eval $ac_try) 2>&5
    56076067   ac_status=$?
    56086068-  echo "$as_me:8115: \$? = $ac_status" >&5
    5609 +  echo "$as_me:8184: \$? = $ac_status" >&5
     6069+  echo "$as_me:8194: \$? = $ac_status" >&5
    56106070   (exit $ac_status); }; }; then
    56116071   break
    56126072 else
    5613 @@ -8121,7 +8190,7 @@
     6073@@ -8121,7 +8200,7 @@
    56146074 fi
    56156075 rm -f conftest.$ac_objext conftest.$ac_ext
    56166076   cat >conftest.$ac_ext <<_ACEOF
    56176077-#line 8124 "configure"
    5618 +#line 8193 "configure"
     6078+#line 8203 "configure"
    56196079 #include "confdefs.h"
    56206080 #define _LARGEFILE_SOURCE 1
    56216081 #include <stdio.h>
    5622 @@ -8134,16 +8203,16 @@
     6082@@ -8134,16 +8213,16 @@
    56236083 }
    56246084 _ACEOF
    56256085 rm -f conftest.$ac_objext
    56266086-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
    5627 +if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
     6087+if { (eval echo "$as_me:8216: \"$ac_compile\"") >&5
    56286088   (eval $ac_compile) 2>&5
    56296089   ac_status=$?
    56306090-  echo "$as_me:8140: \$? = $ac_status" >&5
    5631 +  echo "$as_me:8209: \$? = $ac_status" >&5
     6091+  echo "$as_me:8219: \$? = $ac_status" >&5
    56326092   (exit $ac_status); } &&
    56336093          { ac_try='test -s conftest.$ac_objext'
    56346094-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
    5635 +  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
     6095+  { (eval echo "$as_me:8222: \"$ac_try\"") >&5
    56366096   (eval $ac_try) 2>&5
    56376097   ac_status=$?
    56386098-  echo "$as_me:8146: \$? = $ac_status" >&5
    5639 +  echo "$as_me:8215: \$? = $ac_status" >&5
     6099+  echo "$as_me:8225: \$? = $ac_status" >&5
    56406100   (exit $ac_status); }; }; then
    56416101   ac_cv_sys_largefile_source=1; break
    56426102 else
    5643 @@ -8154,7 +8223,7 @@
     6103@@ -8154,7 +8233,7 @@
    56446104   break
    56456105 done
    56466106 fi
    56476107-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
    5648 +echo "$as_me:8226: result: $ac_cv_sys_largefile_source" >&5
     6108+echo "$as_me:8236: result: $ac_cv_sys_largefile_source" >&5
    56496109 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
    56506110 if test "$ac_cv_sys_largefile_source" != no; then
    56516111 
    5652 @@ -8168,13 +8237,13 @@
     6112@@ -8168,13 +8247,13 @@
    56536113 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
    56546114 # in glibc 2.1.3, but that breaks too many other things.
    56556115 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
    56566116-echo "$as_me:8171: checking for fseeko" >&5
    5657 +echo "$as_me:8240: checking for fseeko" >&5
     6117+echo "$as_me:8250: checking for fseeko" >&5
    56586118 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
    56596119 if test "${ac_cv_func_fseeko+set}" = set; then
    … …  
    56626122   cat >conftest.$ac_ext <<_ACEOF
    56636123-#line 8177 "configure"
    5664 +#line 8246 "configure"
     6124+#line 8256 "configure"
    56656125 #include "confdefs.h"
    56666126 #include <stdio.h>
    56676127 int
    5668 @@ -8186,16 +8255,16 @@
     6128@@ -8186,16 +8265,16 @@
    56696129 }
    56706130 _ACEOF
    56716131 rm -f conftest.$ac_objext conftest$ac_exeext
    56726132-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
    5673 +if { (eval echo "$as_me:8258: \"$ac_link\"") >&5
     6133+if { (eval echo "$as_me:8268: \"$ac_link\"") >&5
    56746134   (eval $ac_link) 2>&5
    56756135   ac_status=$?
    56766136-  echo "$as_me:8192: \$? = $ac_status" >&5
    5677 +  echo "$as_me:8261: \$? = $ac_status" >&5
     6137+  echo "$as_me:8271: \$? = $ac_status" >&5
    56786138   (exit $ac_status); } &&
    56796139          { ac_try='test -s conftest$ac_exeext'
    56806140-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
    5681 +  { (eval echo "$as_me:8264: \"$ac_try\"") >&5
     6141+  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
    56826142   (eval $ac_try) 2>&5
    56836143   ac_status=$?
    56846144-  echo "$as_me:8198: \$? = $ac_status" >&5
    5685 +  echo "$as_me:8267: \$? = $ac_status" >&5
     6145+  echo "$as_me:8277: \$? = $ac_status" >&5
    56866146   (exit $ac_status); }; }; then
    56876147   ac_cv_func_fseeko=yes
    56886148 else
    5689 @@ -8205,7 +8274,7 @@
     6149@@ -8205,7 +8284,7 @@
    56906150 fi
    56916151 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    56926152 fi
    56936153-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
    5694 +echo "$as_me:8277: result: $ac_cv_func_fseeko" >&5
     6154+echo "$as_me:8287: result: $ac_cv_func_fseeko" >&5
    56956155 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
    56966156 if test $ac_cv_func_fseeko = yes; then
    56976157 
    5698 @@ -8226,14 +8295,14 @@
     6158@@ -8226,14 +8305,14 @@
    56996159        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
    57006160        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
    57016161 
    57026162-       echo "$as_me:8229: checking whether to use struct dirent64" >&5
    5703 +       echo "$as_me:8298: checking whether to use struct dirent64" >&5
     6163+       echo "$as_me:8308: checking whether to use struct dirent64" >&5
    57046164 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
    57056165 if test "${cf_cv_struct_dirent64+set}" = set; then
    … …  
    57096169                cat >conftest.$ac_ext <<_ACEOF
    57106170-#line 8236 "configure"
    5711 +#line 8305 "configure"
     6171+#line 8315 "configure"
    57126172 #include "confdefs.h"
    57136173 
    57146174 #include <sys/types.h>
    5715 @@ -8254,16 +8323,16 @@
     6175@@ -8254,16 +8333,16 @@
    57166176 }
    57176177 _ACEOF
    57186178 rm -f conftest.$ac_objext
    57196179-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
    5720 +if { (eval echo "$as_me:8326: \"$ac_compile\"") >&5
     6180+if { (eval echo "$as_me:8336: \"$ac_compile\"") >&5
    57216181   (eval $ac_compile) 2>&5
    57226182   ac_status=$?
    57236183-  echo "$as_me:8260: \$? = $ac_status" >&5
    5724 +  echo "$as_me:8329: \$? = $ac_status" >&5
     6184+  echo "$as_me:8339: \$? = $ac_status" >&5
    57256185   (exit $ac_status); } &&
    57266186          { ac_try='test -s conftest.$ac_objext'
    57276187-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
    5728 +  { (eval echo "$as_me:8332: \"$ac_try\"") >&5
     6188+  { (eval echo "$as_me:8342: \"$ac_try\"") >&5
    57296189   (eval $ac_try) 2>&5
    57306190   ac_status=$?
    57316191-  echo "$as_me:8266: \$? = $ac_status" >&5
    5732 +  echo "$as_me:8335: \$? = $ac_status" >&5
     6192+  echo "$as_me:8345: \$? = $ac_status" >&5
    57336193   (exit $ac_status); }; }; then
    57346194   cf_cv_struct_dirent64=yes
    57356195 else
    5736 @@ -8274,7 +8343,7 @@
     6196@@ -8274,7 +8353,7 @@
    57376197 rm -f conftest.$ac_objext conftest.$ac_ext
    57386198 
    57396199 fi
    57406200-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
    5741 +echo "$as_me:8346: result: $cf_cv_struct_dirent64" >&5
     6201+echo "$as_me:8356: result: $cf_cv_struct_dirent64" >&5
    57426202 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
    57436203        test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
    57446204 #define HAVE_STRUCT_DIRENT64 1
    5745 @@ -8283,7 +8352,7 @@
     6205@@ -8283,7 +8362,7 @@
    57466206     fi
    57476207 
    57486208 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
    57496209-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    5750 +echo "$as_me:8355: checking if you want tparm not to use X/Open fixed-parameter list" >&5
     6210+echo "$as_me:8365: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    57516211 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
    57526212 
    57536213 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
    5754 @@ -8293,14 +8362,14 @@
     6214@@ -8293,14 +8372,14 @@
    57556215 else
    57566216   with_tparm_varargs=yes
    57576217 fi;
    57586218-echo "$as_me:8296: result: $with_tparm_varargs" >&5
    5759 +echo "$as_me:8365: result: $with_tparm_varargs" >&5
     6219+echo "$as_me:8375: result: $with_tparm_varargs" >&5
    57606220 echo "${ECHO_T}$with_tparm_varargs" >&6
    57616221 NCURSES_TPARM_VARARGS=0
    … …  
    57656225 if test "$with_ticlib" != no ; then
    57666226-echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    5767 +echo "$as_me:8372: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
     6227+echo "$as_me:8382: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    57686228 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
    57696229 
    57706230 # Check whether --enable-tic-depends or --disable-tic-depends was given.
    5771 @@ -8310,14 +8379,14 @@
     6231@@ -8310,14 +8389,14 @@
    57726232 else
    57736233   with_tic_depends=yes
    57746234 fi;
    57756235-echo "$as_me:8313: result: $with_tic_depends" >&5
    5776 +echo "$as_me:8382: result: $with_tic_depends" >&5
     6236+echo "$as_me:8392: result: $with_tic_depends" >&5
    57776237 echo "${ECHO_T}$with_tic_depends" >&6
    57786238 else
    … …  
    57826242 ###   use option --with-bool to override bool's type
    57836243-echo "$as_me:8320: checking for type of bool" >&5
    5784 +echo "$as_me:8389: checking for type of bool" >&5
     6244+echo "$as_me:8399: checking for type of bool" >&5
    57856245 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
    57866246 
    57876247 # Check whether --with-bool or --without-bool was given.
    5788 @@ -8327,10 +8396,10 @@
     6248@@ -8327,10 +8406,10 @@
    57896249 else
    57906250   NCURSES_BOOL=auto
    57916251 fi;
    57926252-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
    5793 +echo "$as_me:8399: result: $NCURSES_BOOL" >&5
     6253+echo "$as_me:8409: result: $NCURSES_BOOL" >&5
    57946254 echo "${ECHO_T}$NCURSES_BOOL" >&6
    57956255 
    57966256-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
    5797 +echo "$as_me:8402: checking for alternate terminal capabilities file" >&5
     6257+echo "$as_me:8412: checking for alternate terminal capabilities file" >&5
    57986258 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
    57996259 
    58006260 # Check whether --with-caps or --without-caps was given.
    5801 @@ -8341,11 +8410,11 @@
     6261@@ -8341,11 +8420,11 @@
    58026262   TERMINFO_CAPS=Caps
    58036263 fi;
    58046264 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
    58056265-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
    5806 +echo "$as_me:8413: result: $TERMINFO_CAPS" >&5
     6266+echo "$as_me:8423: result: $TERMINFO_CAPS" >&5
    58076267 echo "${ECHO_T}$TERMINFO_CAPS" >&6
    58086268 
    58096269 ###   use option --with-chtype to override chtype's type
    58106270-echo "$as_me:8348: checking for type of chtype" >&5
    5811 +echo "$as_me:8417: checking for type of chtype" >&5
     6271+echo "$as_me:8427: checking for type of chtype" >&5
    58126272 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    58136273 
    58146274 # Check whether --with-chtype or --without-chtype was given.
    5815 @@ -8355,11 +8424,11 @@
     6275@@ -8355,11 +8434,11 @@
    58166276 else
    58176277   NCURSES_CHTYPE=auto
    58186278 fi;
    58196279-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
    5820 +echo "$as_me:8427: result: $NCURSES_CHTYPE" >&5
     6280+echo "$as_me:8437: result: $NCURSES_CHTYPE" >&5
    58216281 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
    58226282 
    58236283 ###   use option --with-ospeed to override ospeed's type
    58246284-echo "$as_me:8362: checking for type of ospeed" >&5
    5825 +echo "$as_me:8431: checking for type of ospeed" >&5
     6285+echo "$as_me:8441: checking for type of ospeed" >&5
    58266286 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
    58276287 
    58286288 # Check whether --with-ospeed or --without-ospeed was given.
    5829 @@ -8369,11 +8438,11 @@
     6289@@ -8369,11 +8448,11 @@
    58306290 else
    58316291   NCURSES_OSPEED=short
    58326292 fi;
    58336293-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
    5834 +echo "$as_me:8441: result: $NCURSES_OSPEED" >&5
     6294+echo "$as_me:8451: result: $NCURSES_OSPEED" >&5
    58356295 echo "${ECHO_T}$NCURSES_OSPEED" >&6
    58366296 
    58376297 ###   use option --with-mmask-t to override mmask_t's type
    58386298-echo "$as_me:8376: checking for type of mmask_t" >&5
    5839 +echo "$as_me:8445: checking for type of mmask_t" >&5
     6299+echo "$as_me:8455: checking for type of mmask_t" >&5
    58406300 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
    58416301 
    58426302 # Check whether --with-mmask-t or --without-mmask-t was given.
    5843 @@ -8383,11 +8452,11 @@
     6303@@ -8383,11 +8462,11 @@
    58446304 else
    58456305   NCURSES_MMASK_T=auto
    58466306 fi;
    58476307-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
    5848 +echo "$as_me:8455: result: $NCURSES_MMASK_T" >&5
     6308+echo "$as_me:8465: result: $NCURSES_MMASK_T" >&5
    58496309 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
    58506310 
    58516311 ### Enable compiling-in rcs id's
    58526312-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
    5853 +echo "$as_me:8459: checking if RCS identifiers should be compiled-in" >&5
     6313+echo "$as_me:8469: checking if RCS identifiers should be compiled-in" >&5
    58546314 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
    58556315 
    58566316 # Check whether --with-rcs-ids or --without-rcs-ids was given.
    5857 @@ -8397,7 +8466,7 @@
     6317@@ -8397,7 +8476,7 @@
    58586318 else
    58596319   with_rcs_ids=no
    58606320 fi;
    58616321-echo "$as_me:8400: result: $with_rcs_ids" >&5
    5862 +echo "$as_me:8469: result: $with_rcs_ids" >&5
     6322+echo "$as_me:8479: result: $with_rcs_ids" >&5
    58636323 echo "${ECHO_T}$with_rcs_ids" >&6
    58646324 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
    58656325 #define USE_RCS_IDS 1
    5866 @@ -8405,7 +8474,7 @@
     6326@@ -8405,7 +8484,7 @@
    58676327 
    58686328 ###############################################################################
    58696329 
    58706330-echo "$as_me:8408: checking format of man-pages" >&5
    5871 +echo "$as_me:8477: checking format of man-pages" >&5
     6331+echo "$as_me:8487: checking format of man-pages" >&5
    58726332 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
    58736333 
    58746334 # Check whether --with-manpage-format or --without-manpage-format was given.
    5875 @@ -8494,14 +8563,14 @@
     6335@@ -8494,14 +8573,14 @@
    58766336   ;;
    58776337 esac
    58786338 
    58796339-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
    5880 +echo "$as_me:8566: result: $MANPAGE_FORMAT" >&5
     6340+echo "$as_me:8576: result: $MANPAGE_FORMAT" >&5
    58816341 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
    58826342 if test -n "$cf_unknown" ; then
    58836343-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
    5884 +  { echo "$as_me:8569: WARNING: Unexpected manpage-format $cf_unknown" >&5
     6344+  { echo "$as_me:8579: WARNING: Unexpected manpage-format $cf_unknown" >&5
    58856345 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
    58866346 fi
    58876347 
    58886348-echo "$as_me:8504: checking for manpage renaming" >&5
    5889 +echo "$as_me:8573: checking for manpage renaming" >&5
     6349+echo "$as_me:8583: checking for manpage renaming" >&5
    58906350 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
    58916351 
    58926352 # Check whether --with-manpage-renames or --without-manpage-renames was given.
    5893 @@ -8529,7 +8598,7 @@
     6353@@ -8529,7 +8608,7 @@
    58946354   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
    58956355     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
    58966356   elif test ! -f $MANPAGE_RENAMES ; then
    58976357-    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
    5898 +    { { echo "$as_me:8601: error: not a filename: $MANPAGE_RENAMES" >&5
     6358+    { { echo "$as_me:8611: error: not a filename: $MANPAGE_RENAMES" >&5
    58996359 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    59006360    { (exit 1); exit 1; }; }
    59016361   fi
    5902 @@ -8543,10 +8612,10 @@
     6362@@ -8543,10 +8622,10 @@
    59036363   fi
    59046364 fi
    59056365 
    59066366-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
    5907 +echo "$as_me:8615: result: $MANPAGE_RENAMES" >&5
     6367+echo "$as_me:8625: result: $MANPAGE_RENAMES" >&5
    59086368 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
    59096369 
    59106370-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
    5911 +echo "$as_me:8618: checking if manpage aliases will be installed" >&5
     6371+echo "$as_me:8628: checking if manpage aliases will be installed" >&5
    59126372 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
    59136373 
    59146374 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
    5915 @@ -8557,7 +8626,7 @@
     6375@@ -8557,7 +8636,7 @@
    59166376   MANPAGE_ALIASES=yes
    59176377 fi;
    59186378 
    59196379-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
    5920 +echo "$as_me:8629: result: $MANPAGE_ALIASES" >&5
     6380+echo "$as_me:8639: result: $MANPAGE_ALIASES" >&5
    59216381 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
    59226382 
    59236383 if test "$LN_S" = "ln -s"; then
    5924 @@ -8568,7 +8637,7 @@
     6384@@ -8568,7 +8647,7 @@
    59256385 
    59266386 MANPAGE_SYMLINKS=no
    59276387 if test "$MANPAGE_ALIASES" = yes ; then
    59286388-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
    5929 +echo "$as_me:8640: checking if manpage symlinks should be used" >&5
     6389+echo "$as_me:8650: checking if manpage symlinks should be used" >&5
    59306390 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
    59316391 
    59326392 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
    5933 @@ -8581,17 +8650,17 @@
     6393@@ -8581,17 +8660,17 @@
    59346394 
    59356395 if test "$$cf_use_symlinks" = no; then
    59366396 if test "$MANPAGE_SYMLINKS" = yes ; then
    59376397-       { echo "$as_me:8584: WARNING: cannot make symlinks" >&5
    5938 +       { echo "$as_me:8653: WARNING: cannot make symlinks" >&5
     6398+       { echo "$as_me:8663: WARNING: cannot make symlinks" >&5
    59396399 echo "$as_me: WARNING: cannot make symlinks" >&2;}
    59406400        MANPAGE_SYMLINKS=no
    … …  
    59436403 
    59446404-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
    5945 +echo "$as_me:8659: result: $MANPAGE_SYMLINKS" >&5
     6405+echo "$as_me:8669: result: $MANPAGE_SYMLINKS" >&5
    59466406 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
    59476407 fi
    59486408 
    59496409-echo "$as_me:8594: checking for manpage tbl" >&5
    5950 +echo "$as_me:8663: checking for manpage tbl" >&5
     6410+echo "$as_me:8673: checking for manpage tbl" >&5
    59516411 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
    59526412 
    59536413 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
    5954 @@ -8602,7 +8671,7 @@
     6414@@ -8602,7 +8681,7 @@
    59556415   MANPAGE_TBL=no
    59566416 fi;
    59576417 
    59586418-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
    5959 +echo "$as_me:8674: result: $MANPAGE_TBL" >&5
     6419+echo "$as_me:8684: result: $MANPAGE_TBL" >&5
    59606420 echo "${ECHO_T}$MANPAGE_TBL" >&6
    59616421 
    59626422   if test "$prefix" = "NONE" ; then
    5963 @@ -8718,7 +8787,7 @@
     6423@@ -8718,7 +8797,7 @@
    59646424                s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
    59656425 CF_EOF
    … …  
    59706430                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    59716431                cf_name=`echo $cf_name|sed "$program_transform_name"`
    5972 @@ -8913,7 +8982,7 @@
     6432@@ -8913,7 +8992,7 @@
    59736433 ###############################################################################
    59746434 
    59756435 ### Note that some functions (such as const) are normally disabled anyway.
    59766436-echo "$as_me:8916: checking if you want to build with function extensions" >&5
    5977 +echo "$as_me:8985: checking if you want to build with function extensions" >&5
     6437+echo "$as_me:8995: checking if you want to build with function extensions" >&5
    59786438 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
    59796439 
    59806440 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
    5981 @@ -8923,7 +8992,7 @@
     6441@@ -8923,7 +9002,7 @@
    59826442 else
    59836443   with_ext_funcs=yes
    59846444 fi;
    59856445-echo "$as_me:8926: result: $with_ext_funcs" >&5
    5986 +echo "$as_me:8995: result: $with_ext_funcs" >&5
     6446+echo "$as_me:9005: result: $with_ext_funcs" >&5
    59876447 echo "${ECHO_T}$with_ext_funcs" >&6
    59886448 if test "$with_ext_funcs" = yes ; then
    59896449        NCURSES_EXT_FUNCS=1
    5990 @@ -8960,7 +9029,7 @@
     6450@@ -8955,12 +9034,14 @@
     6451 #define NCURSES_EXT_FUNCS 1
     6452 EOF
     6453 
     6454+       GENERATED_EXT_FUNCS=generated
     6455 else
     6456        NCURSES_EXT_FUNCS=0
     6457+       GENERATED_EXT_FUNCS=
    59916458 fi
    59926459 
    59936460 ###   use option --enable-const to turn on use of const beyond that in XSI.
    59946461-echo "$as_me:8963: checking for extended use of const keyword" >&5
    5995 +echo "$as_me:9032: checking for extended use of const keyword" >&5
     6462+echo "$as_me:9044: checking for extended use of const keyword" >&5
    59966463 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
    59976464 
    59986465 # Check whether --enable-const or --disable-const was given.
    5999 @@ -8970,7 +9039,7 @@
     6466@@ -8970,7 +9051,7 @@
    60006467 else
    60016468   with_ext_const=no
    60026469 fi;
    60036470-echo "$as_me:8973: result: $with_ext_const" >&5
    6004 +echo "$as_me:9042: result: $with_ext_const" >&5
     6471+echo "$as_me:9054: result: $with_ext_const" >&5
    60056472 echo "${ECHO_T}$with_ext_const" >&6
    60066473 NCURSES_CONST='/*nothing*/'
    60076474 if test "$with_ext_const" = yes ; then
    6008 @@ -8978,7 +9047,7 @@
     6475@@ -8978,7 +9059,7 @@
    60096476 fi
    60106477 
    60116478 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
    60126479-echo "$as_me:8981: checking if you want to use extended colors" >&5
    6013 +echo "$as_me:9050: checking if you want to use extended colors" >&5
     6480+echo "$as_me:9062: checking if you want to use extended colors" >&5
    60146481 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
    60156482 
    60166483 # Check whether --enable-ext-colors or --disable-ext-colors was given.
    6017 @@ -8988,12 +9057,12 @@
     6484@@ -8988,12 +9069,12 @@
    60186485 else
    60196486   with_ext_colors=no
    60206487 fi;
    60216488-echo "$as_me:8991: result: $with_ext_colors" >&5
    6022 +echo "$as_me:9060: result: $with_ext_colors" >&5
     6489+echo "$as_me:9072: result: $with_ext_colors" >&5
    60236490 echo "${ECHO_T}$with_ext_colors" >&6
    60246491 NCURSES_EXT_COLORS=0
    … …  
    60266493        if test "$with_widec" != yes ; then
    60276494-               { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
    6028 +               { { echo "$as_me:9065: error: This option applies only to wide-character library" >&5
     6495+               { { echo "$as_me:9077: error: This option applies only to wide-character library" >&5
    60296496 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    60306497    { (exit 1); exit 1; }; }
    60316498        else
    6032 @@ -9004,7 +9073,7 @@
     6499@@ -9004,7 +9085,7 @@
    60336500        5.*)
    60346501                cf_cv_rel_version=6.0
    60356502                cf_cv_abi_version=6
    60366503-               { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    6037 +               { echo "$as_me:9076: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     6504+               { echo "$as_me:9088: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    60386505 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    60396506                ;;
    60406507        esac
    6041 @@ -9019,7 +9088,7 @@
     6508@@ -9019,7 +9100,7 @@
    60426509 fi
    60436510 
    60446511 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
    60456512-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
    6046 +echo "$as_me:9091: checking if you want to use extended mouse encoding" >&5
     6513+echo "$as_me:9103: checking if you want to use extended mouse encoding" >&5
    60476514 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
    60486515 
    60496516 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
    6050 @@ -9029,7 +9098,7 @@
     6517@@ -9029,7 +9110,7 @@
    60516518 else
    60526519   with_ext_mouse=no
    60536520 fi;
    60546521-echo "$as_me:9032: result: $with_ext_mouse" >&5
    6055 +echo "$as_me:9101: result: $with_ext_mouse" >&5
     6522+echo "$as_me:9113: result: $with_ext_mouse" >&5
    60566523 echo "${ECHO_T}$with_ext_mouse" >&6
    60576524 NCURSES_MOUSE_VERSION=1
    60586525 if test "$with_ext_mouse" = yes ; then
    6059 @@ -9040,7 +9109,7 @@
     6526@@ -9040,7 +9121,7 @@
    60606527        5.*)
    60616528                cf_cv_rel_version=6.0
    60626529                cf_cv_abi_version=6
    60636530-               { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    6064 +               { echo "$as_me:9112: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     6531+               { echo "$as_me:9124: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    60656532 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    60666533                ;;
    60676534        esac
    6068 @@ -9048,7 +9117,7 @@
     6535@@ -9048,7 +9129,7 @@
    60696536 
    60706537 fi
    60716538 
    60726539-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
    6073 +echo "$as_me:9120: checking if you want \$NCURSES_NO_PADDING code" >&5
     6540+echo "$as_me:9132: checking if you want \$NCURSES_NO_PADDING code" >&5
    60746541 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
    60756542 
    60766543 # Check whether --enable-no-padding or --disable-no-padding was given.
    6077 @@ -9058,19 +9127,19 @@
     6544@@ -9058,19 +9139,19 @@
    60786545 else
    60796546   with_no_padding=$with_ext_funcs
    60806547 fi;
    60816548-echo "$as_me:9061: result: $with_no_padding" >&5
    6082 +echo "$as_me:9130: result: $with_no_padding" >&5
     6549+echo "$as_me:9142: result: $with_no_padding" >&5
    60836550 echo "${ECHO_T}$with_no_padding" >&6
    60846551 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
    … …  
    60876554 
    60886555-echo "$as_me:9067: checking for ANSI C header files" >&5
    6089 +echo "$as_me:9136: checking for ANSI C header files" >&5
     6556+echo "$as_me:9148: checking for ANSI C header files" >&5
    60906557 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    60916558 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    60946561   cat >conftest.$ac_ext <<_ACEOF
    60956562-#line 9073 "configure"
    6096 +#line 9142 "configure"
     6563+#line 9154 "configure"
    60976564 #include "confdefs.h"
    60986565 #include <stdlib.h>
    60996566 #include <stdarg.h>
    6100 @@ -9078,13 +9147,13 @@
     6567@@ -9078,13 +9159,13 @@
    61016568 #include <float.h>
    61026569 
    61036570 _ACEOF
    61046571-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
    6105 +if { (eval echo "$as_me:9150: \"$ac_cpp conftest.$ac_ext\"") >&5
     6572+if { (eval echo "$as_me:9162: \"$ac_cpp conftest.$ac_ext\"") >&5
    61066573   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    61076574   ac_status=$?
    … …  
    61106577   cat conftest.err >&5
    61116578-  echo "$as_me:9087: \$? = $ac_status" >&5
    6112 +  echo "$as_me:9156: \$? = $ac_status" >&5
     6579+  echo "$as_me:9168: \$? = $ac_status" >&5
    61136580   (exit $ac_status); } >/dev/null; then
    61146581   if test -s conftest.err; then
    61156582     ac_cpp_err=$ac_c_preproc_warn_flag
    6116 @@ -9106,7 +9175,7 @@
     6583@@ -9106,7 +9187,7 @@
    61176584 if test $ac_cv_header_stdc = yes; then
    61186585   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    61196586   cat >conftest.$ac_ext <<_ACEOF
    61206587-#line 9109 "configure"
    6121 +#line 9178 "configure"
     6588+#line 9190 "configure"
    61226589 #include "confdefs.h"
    61236590 #include <string.h>
    61246591 
    6125 @@ -9124,7 +9193,7 @@
     6592@@ -9124,7 +9205,7 @@
    61266593 if test $ac_cv_header_stdc = yes; then
    61276594   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    61286595   cat >conftest.$ac_ext <<_ACEOF
    61296596-#line 9127 "configure"
    6130 +#line 9196 "configure"
     6597+#line 9208 "configure"
    61316598 #include "confdefs.h"
    61326599 #include <stdlib.h>
    61336600 
    6134 @@ -9145,7 +9214,7 @@
     6601@@ -9145,7 +9226,7 @@
    61356602   :
    61366603 else
    61376604   cat >conftest.$ac_ext <<_ACEOF
    61386605-#line 9148 "configure"
    6139 +#line 9217 "configure"
     6606+#line 9229 "configure"
    61406607 #include "confdefs.h"
    61416608 #include <ctype.h>
    61426609 #if ((' ' & 0x0FF) == 0x020)
    6143 @@ -9171,15 +9240,15 @@
     6610@@ -9171,15 +9252,15 @@
    61446611 }
    61456612 _ACEOF
    61466613 rm -f conftest$ac_exeext
    61476614-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
    6148 +if { (eval echo "$as_me:9243: \"$ac_link\"") >&5
     6615+if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
    61496616   (eval $ac_link) 2>&5
    61506617   ac_status=$?
    61516618-  echo "$as_me:9177: \$? = $ac_status" >&5
    6152 +  echo "$as_me:9246: \$? = $ac_status" >&5
     6619+  echo "$as_me:9258: \$? = $ac_status" >&5
    61536620   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    61546621-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
    6155 +  { (eval echo "$as_me:9248: \"$ac_try\"") >&5
     6622+  { (eval echo "$as_me:9260: \"$ac_try\"") >&5
    61566623   (eval $ac_try) 2>&5
    61576624   ac_status=$?
    61586625-  echo "$as_me:9182: \$? = $ac_status" >&5
    6159 +  echo "$as_me:9251: \$? = $ac_status" >&5
     6626+  echo "$as_me:9263: \$? = $ac_status" >&5
    61606627   (exit $ac_status); }; }; then
    61616628   :
    61626629 else
    6163 @@ -9192,7 +9261,7 @@
     6630@@ -9192,7 +9273,7 @@
    61646631 fi
    61656632 fi
    61666633 fi
    61676634-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
    6168 +echo "$as_me:9264: result: $ac_cv_header_stdc" >&5
     6635+echo "$as_me:9276: result: $ac_cv_header_stdc" >&5
    61696636 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    61706637 if test $ac_cv_header_stdc = yes; then
    61716638 
    6172 @@ -9208,28 +9277,28 @@
     6639@@ -9208,28 +9289,28 @@
    61736640                   inttypes.h stdint.h unistd.h
    61746641 do
    61756642 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    61766643-echo "$as_me:9211: checking for $ac_header" >&5
    6177 +echo "$as_me:9280: checking for $ac_header" >&5
     6644+echo "$as_me:9292: checking for $ac_header" >&5
    61786645 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    61796646 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    61826649   cat >conftest.$ac_ext <<_ACEOF
    61836650-#line 9217 "configure"
    6184 +#line 9286 "configure"
     6651+#line 9298 "configure"
    61856652 #include "confdefs.h"
    61866653 $ac_includes_default
    … …  
    61896656 rm -f conftest.$ac_objext
    61906657-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
    6191 +if { (eval echo "$as_me:9292: \"$ac_compile\"") >&5
     6658+if { (eval echo "$as_me:9304: \"$ac_compile\"") >&5
    61926659   (eval $ac_compile) 2>&5
    61936660   ac_status=$?
    61946661-  echo "$as_me:9226: \$? = $ac_status" >&5
    6195 +  echo "$as_me:9295: \$? = $ac_status" >&5
     6662+  echo "$as_me:9307: \$? = $ac_status" >&5
    61966663   (exit $ac_status); } &&
    61976664          { ac_try='test -s conftest.$ac_objext'
    61986665-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
    6199 +  { (eval echo "$as_me:9298: \"$ac_try\"") >&5
     6666+  { (eval echo "$as_me:9310: \"$ac_try\"") >&5
    62006667   (eval $ac_try) 2>&5
    62016668   ac_status=$?
    62026669-  echo "$as_me:9232: \$? = $ac_status" >&5
    6203 +  echo "$as_me:9301: \$? = $ac_status" >&5
     6670+  echo "$as_me:9313: \$? = $ac_status" >&5
    62046671   (exit $ac_status); }; }; then
    62056672   eval "$as_ac_Header=yes"
    62066673 else
    6207 @@ -9239,7 +9308,7 @@
     6674@@ -9239,7 +9320,7 @@
    62086675 fi
    62096676 rm -f conftest.$ac_objext conftest.$ac_ext
    62106677 fi
    62116678-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
    6212 +echo "$as_me:9311: result: `eval echo '${'$as_ac_Header'}'`" >&5
     6679+echo "$as_me:9323: result: `eval echo '${'$as_ac_Header'}'`" >&5
    62136680 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    62146681 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    62156682   cat >>confdefs.h <<EOF
    6216 @@ -9249,13 +9318,13 @@
     6683@@ -9249,13 +9330,13 @@
    62176684 fi
    62186685 done
    62196686 
    62206687-echo "$as_me:9252: checking for signed char" >&5
    6221 +echo "$as_me:9321: checking for signed char" >&5
     6688+echo "$as_me:9333: checking for signed char" >&5
    62226689 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
    62236690 if test "${ac_cv_type_signed_char+set}" = set; then
    … …  
    62266693   cat >conftest.$ac_ext <<_ACEOF
    62276694-#line 9258 "configure"
    6228 +#line 9327 "configure"
     6695+#line 9339 "configure"
    62296696 #include "confdefs.h"
    62306697 $ac_includes_default
    62316698 int
    6232 @@ -9270,16 +9339,16 @@
     6699@@ -9270,16 +9351,16 @@
    62336700 }
    62346701 _ACEOF
    62356702 rm -f conftest.$ac_objext
    62366703-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
    6237 +if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
     6704+if { (eval echo "$as_me:9354: \"$ac_compile\"") >&5
    62386705   (eval $ac_compile) 2>&5
    62396706   ac_status=$?
    62406707-  echo "$as_me:9276: \$? = $ac_status" >&5
    6241 +  echo "$as_me:9345: \$? = $ac_status" >&5
     6708+  echo "$as_me:9357: \$? = $ac_status" >&5
    62426709   (exit $ac_status); } &&
    62436710          { ac_try='test -s conftest.$ac_objext'
    62446711-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
    6245 +  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
     6712+  { (eval echo "$as_me:9360: \"$ac_try\"") >&5
    62466713   (eval $ac_try) 2>&5
    62476714   ac_status=$?
    62486715-  echo "$as_me:9282: \$? = $ac_status" >&5
    6249 +  echo "$as_me:9351: \$? = $ac_status" >&5
     6716+  echo "$as_me:9363: \$? = $ac_status" >&5
    62506717   (exit $ac_status); }; }; then
    62516718   ac_cv_type_signed_char=yes
    62526719 else
    6253 @@ -9289,10 +9358,10 @@
     6720@@ -9289,10 +9370,10 @@
    62546721 fi
    62556722 rm -f conftest.$ac_objext conftest.$ac_ext
    62566723 fi
    62576724-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
    6258 +echo "$as_me:9361: result: $ac_cv_type_signed_char" >&5
     6725+echo "$as_me:9373: result: $ac_cv_type_signed_char" >&5
    62596726 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
    62606727 
    62616728-echo "$as_me:9295: checking size of signed char" >&5
    6262 +echo "$as_me:9364: checking size of signed char" >&5
     6729+echo "$as_me:9376: checking size of signed char" >&5
    62636730 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
    62646731 if test "${ac_cv_sizeof_signed_char+set}" = set; then
    62656732   echo $ECHO_N "(cached) $ECHO_C" >&6
    6266 @@ -9301,7 +9370,7 @@
     6733@@ -9301,7 +9382,7 @@
    62676734   if test "$cross_compiling" = yes; then
    62686735   # Depending upon the size, compute the lo and hi bounds.
    62696736 cat >conftest.$ac_ext <<_ACEOF
    62706737-#line 9304 "configure"
    6271 +#line 9373 "configure"
     6738+#line 9385 "configure"
    62726739 #include "confdefs.h"
    62736740 $ac_includes_default
    62746741 int
    6275 @@ -9313,21 +9382,21 @@
     6742@@ -9313,21 +9394,21 @@
    62766743 }
    62776744 _ACEOF
    62786745 rm -f conftest.$ac_objext
    62796746-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
    6280 +if { (eval echo "$as_me:9385: \"$ac_compile\"") >&5
     6747+if { (eval echo "$as_me:9397: \"$ac_compile\"") >&5
    62816748   (eval $ac_compile) 2>&5
    62826749   ac_status=$?
    62836750-  echo "$as_me:9319: \$? = $ac_status" >&5
    6284 +  echo "$as_me:9388: \$? = $ac_status" >&5
     6751+  echo "$as_me:9400: \$? = $ac_status" >&5
    62856752   (exit $ac_status); } &&
    62866753          { ac_try='test -s conftest.$ac_objext'
    62876754-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
    6288 +  { (eval echo "$as_me:9391: \"$ac_try\"") >&5
     6755+  { (eval echo "$as_me:9403: \"$ac_try\"") >&5
    62896756   (eval $ac_try) 2>&5
    62906757   ac_status=$?
    62916758-  echo "$as_me:9325: \$? = $ac_status" >&5
    6292 +  echo "$as_me:9394: \$? = $ac_status" >&5
     6759+  echo "$as_me:9406: \$? = $ac_status" >&5
    62936760   (exit $ac_status); }; }; then
    62946761   ac_lo=0 ac_mid=0
    … …  
    62966763     cat >conftest.$ac_ext <<_ACEOF
    62976764-#line 9330 "configure"
    6298 +#line 9399 "configure"
     6765+#line 9411 "configure"
    62996766 #include "confdefs.h"
    63006767 $ac_includes_default
    63016768 int
    6302 @@ -9339,16 +9408,16 @@
     6769@@ -9339,16 +9420,16 @@
    63036770 }
    63046771 _ACEOF
    63056772 rm -f conftest.$ac_objext
    63066773-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
    6307 +if { (eval echo "$as_me:9411: \"$ac_compile\"") >&5
     6774+if { (eval echo "$as_me:9423: \"$ac_compile\"") >&5
    63086775   (eval $ac_compile) 2>&5
    63096776   ac_status=$?
    63106777-  echo "$as_me:9345: \$? = $ac_status" >&5
    6311 +  echo "$as_me:9414: \$? = $ac_status" >&5
     6778+  echo "$as_me:9426: \$? = $ac_status" >&5
    63126779   (exit $ac_status); } &&
    63136780          { ac_try='test -s conftest.$ac_objext'
    63146781-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
    6315 +  { (eval echo "$as_me:9417: \"$ac_try\"") >&5
     6782+  { (eval echo "$as_me:9429: \"$ac_try\"") >&5
    63166783   (eval $ac_try) 2>&5
    63176784   ac_status=$?
    63186785-  echo "$as_me:9351: \$? = $ac_status" >&5
    6319 +  echo "$as_me:9420: \$? = $ac_status" >&5
     6786+  echo "$as_me:9432: \$? = $ac_status" >&5
    63206787   (exit $ac_status); }; }; then
    63216788   ac_hi=$ac_mid; break
    63226789 else
    6323 @@ -9364,7 +9433,7 @@
     6790@@ -9364,7 +9445,7 @@
    63246791 ac_hi=-1 ac_mid=-1
    63256792   while :; do
    63266793     cat >conftest.$ac_ext <<_ACEOF
    63276794-#line 9367 "configure"
    6328 +#line 9436 "configure"
     6795+#line 9448 "configure"
    63296796 #include "confdefs.h"
    63306797 $ac_includes_default
    63316798 int
    6332 @@ -9376,16 +9445,16 @@
     6799@@ -9376,16 +9457,16 @@
    63336800 }
    63346801 _ACEOF
    63356802 rm -f conftest.$ac_objext
    63366803-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
    6337 +if { (eval echo "$as_me:9448: \"$ac_compile\"") >&5
     6804+if { (eval echo "$as_me:9460: \"$ac_compile\"") >&5
    63386805   (eval $ac_compile) 2>&5
    63396806   ac_status=$?
    63406807-  echo "$as_me:9382: \$? = $ac_status" >&5
    6341 +  echo "$as_me:9451: \$? = $ac_status" >&5
     6808+  echo "$as_me:9463: \$? = $ac_status" >&5
    63426809   (exit $ac_status); } &&
    63436810          { ac_try='test -s conftest.$ac_objext'
    63446811-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
    6345 +  { (eval echo "$as_me:9454: \"$ac_try\"") >&5
     6812+  { (eval echo "$as_me:9466: \"$ac_try\"") >&5
    63466813   (eval $ac_try) 2>&5
    63476814   ac_status=$?
    63486815-  echo "$as_me:9388: \$? = $ac_status" >&5
    6349 +  echo "$as_me:9457: \$? = $ac_status" >&5
     6816+  echo "$as_me:9469: \$? = $ac_status" >&5
    63506817   (exit $ac_status); }; }; then
    63516818   ac_lo=$ac_mid; break
    63526819 else
    6353 @@ -9401,7 +9470,7 @@
     6820@@ -9401,7 +9482,7 @@
    63546821 while test "x$ac_lo" != "x$ac_hi"; do
    63556822   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    63566823   cat >conftest.$ac_ext <<_ACEOF
    63576824-#line 9404 "configure"
    6358 +#line 9473 "configure"
     6825+#line 9485 "configure"
    63596826 #include "confdefs.h"
    63606827 $ac_includes_default
    63616828 int
    6362 @@ -9413,16 +9482,16 @@
     6829@@ -9413,16 +9494,16 @@
    63636830 }
    63646831 _ACEOF
    63656832 rm -f conftest.$ac_objext
    63666833-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
    6367 +if { (eval echo "$as_me:9485: \"$ac_compile\"") >&5
     6834+if { (eval echo "$as_me:9497: \"$ac_compile\"") >&5
    63686835   (eval $ac_compile) 2>&5
    63696836   ac_status=$?
    63706837-  echo "$as_me:9419: \$? = $ac_status" >&5
    6371 +  echo "$as_me:9488: \$? = $ac_status" >&5
     6838+  echo "$as_me:9500: \$? = $ac_status" >&5
    63726839   (exit $ac_status); } &&
    63736840          { ac_try='test -s conftest.$ac_objext'
    63746841-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
    6375 +  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
     6842+  { (eval echo "$as_me:9503: \"$ac_try\"") >&5
    63766843   (eval $ac_try) 2>&5
    63776844   ac_status=$?
    63786845-  echo "$as_me:9425: \$? = $ac_status" >&5
    6379 +  echo "$as_me:9494: \$? = $ac_status" >&5
     6846+  echo "$as_me:9506: \$? = $ac_status" >&5
    63806847   (exit $ac_status); }; }; then
    63816848   ac_hi=$ac_mid
    63826849 else
    6383 @@ -9435,12 +9504,12 @@
     6850@@ -9435,12 +9516,12 @@
    63846851 ac_cv_sizeof_signed_char=$ac_lo
    63856852 else
    63866853   if test "$cross_compiling" = yes; then
    63876854-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
    6388 +  { { echo "$as_me:9507: error: cannot run test program while cross compiling" >&5
     6855+  { { echo "$as_me:9519: error: cannot run test program while cross compiling" >&5
    63896856 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    63906857    { (exit 1); exit 1; }; }
    … …  
    63926859   cat >conftest.$ac_ext <<_ACEOF
    63936860-#line 9443 "configure"
    6394 +#line 9512 "configure"
     6861+#line 9524 "configure"
    63956862 #include "confdefs.h"
    63966863 $ac_includes_default
    63976864 int
    6398 @@ -9456,15 +9525,15 @@
     6865@@ -9456,15 +9537,15 @@
    63996866 }
    64006867 _ACEOF
    64016868 rm -f conftest$ac_exeext
    64026869-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
    6403 +if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
     6870+if { (eval echo "$as_me:9540: \"$ac_link\"") >&5
    64046871   (eval $ac_link) 2>&5
    64056872   ac_status=$?
    64066873-  echo "$as_me:9462: \$? = $ac_status" >&5
    6407 +  echo "$as_me:9531: \$? = $ac_status" >&5
     6874+  echo "$as_me:9543: \$? = $ac_status" >&5
    64086875   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    64096876-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
    6410 +  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
     6877+  { (eval echo "$as_me:9545: \"$ac_try\"") >&5
    64116878   (eval $ac_try) 2>&5
    64126879   ac_status=$?
    64136880-  echo "$as_me:9467: \$? = $ac_status" >&5
    6414 +  echo "$as_me:9536: \$? = $ac_status" >&5
     6881+  echo "$as_me:9548: \$? = $ac_status" >&5
    64156882   (exit $ac_status); }; }; then
    64166883   ac_cv_sizeof_signed_char=`cat conftest.val`
    64176884 else
    6418 @@ -9480,7 +9549,7 @@
     6885@@ -9480,7 +9561,7 @@
    64196886   ac_cv_sizeof_signed_char=0
    64206887 fi
    64216888 fi
    64226889-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
    6423 +echo "$as_me:9552: result: $ac_cv_sizeof_signed_char" >&5
     6890+echo "$as_me:9564: result: $ac_cv_sizeof_signed_char" >&5
    64246891 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
    64256892 cat >>confdefs.h <<EOF
    64266893 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
    6427 @@ -9491,7 +9560,7 @@
     6894@@ -9491,7 +9572,7 @@
    64286895 else
    64296896        NCURSES_SBOOL="char"
    64306897 fi
    64316898-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
    6432 +echo "$as_me:9563: checking if you want to use signed Boolean array in term.h" >&5
     6899+echo "$as_me:9575: checking if you want to use signed Boolean array in term.h" >&5
    64336900 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
    64346901 
    64356902 # Check whether --enable-signed-char or --disable-signed-char was given.
    6436 @@ -9501,12 +9570,12 @@
     6903@@ -9501,12 +9582,12 @@
    64376904 else
    64386905   with_signed_char=no
    64396906 fi;
    64406907-echo "$as_me:9504: result: $with_signed_char" >&5
    6441 +echo "$as_me:9573: result: $with_signed_char" >&5
     6908+echo "$as_me:9585: result: $with_signed_char" >&5
    64426909 echo "${ECHO_T}$with_signed_char" >&6
    64436910 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
    … …  
    64456912 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
    64466913-echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
    6447 +echo "$as_me:9578: checking if you want SIGWINCH handler" >&5
     6914+echo "$as_me:9590: checking if you want SIGWINCH handler" >&5
    64486915 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
    64496916 
    64506917 # Check whether --enable-sigwinch or --disable-sigwinch was given.
    6451 @@ -9516,14 +9585,14 @@
     6918@@ -9516,14 +9597,14 @@
    64526919 else
    64536920   with_sigwinch=$with_ext_funcs
    64546921 fi;
    64556922-echo "$as_me:9519: result: $with_sigwinch" >&5
    6456 +echo "$as_me:9588: result: $with_sigwinch" >&5
     6923+echo "$as_me:9600: result: $with_sigwinch" >&5
    64576924 echo "${ECHO_T}$with_sigwinch" >&6
    64586925 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
    … …  
    64626929 ###   use option --enable-tcap-names to allow user to define new capabilities
    64636930-echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
    6464 +echo "$as_me:9595: checking if you want user-definable terminal capabilities like termcap" >&5
     6931+echo "$as_me:9607: checking if you want user-definable terminal capabilities like termcap" >&5
    64656932 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
    64666933 
    64676934 # Check whether --enable-tcap-names or --disable-tcap-names was given.
    6468 @@ -9533,7 +9602,7 @@
     6935@@ -9533,7 +9614,7 @@
    64696936 else
    64706937   with_tcap_names=$with_ext_funcs
    64716938 fi;
    64726939-echo "$as_me:9536: result: $with_tcap_names" >&5
    6473 +echo "$as_me:9605: result: $with_tcap_names" >&5
     6940+echo "$as_me:9617: result: $with_tcap_names" >&5
    64746941 echo "${ECHO_T}$with_tcap_names" >&6
    64756942 NCURSES_XNAMES=0
    64766943 test "$with_tcap_names" = yes && NCURSES_XNAMES=1
    6477 @@ -9541,7 +9610,7 @@
     6944@@ -9541,7 +9622,7 @@
    64786945 ###############################################################################
    64796946 # These options are relatively safe to experiment with.
    64806947 
    64816948-echo "$as_me:9544: checking if you want all development code" >&5
    6482 +echo "$as_me:9613: checking if you want all development code" >&5
     6949+echo "$as_me:9625: checking if you want all development code" >&5
    64836950 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
    64846951 
    64856952 # Check whether --with-develop or --without-develop was given.
    6486 @@ -9551,11 +9620,11 @@
     6953@@ -9551,11 +9632,11 @@
    64876954 else
    64886955   with_develop=no
    64896956 fi;
    64906957-echo "$as_me:9554: result: $with_develop" >&5
    6491 +echo "$as_me:9623: result: $with_develop" >&5
     6958+echo "$as_me:9635: result: $with_develop" >&5
    64926959 echo "${ECHO_T}$with_develop" >&6
    64936960 
    64946961 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
    64956962-echo "$as_me:9558: checking if you want hard-tabs code" >&5
    6496 +echo "$as_me:9627: checking if you want hard-tabs code" >&5
     6963+echo "$as_me:9639: checking if you want hard-tabs code" >&5
    64976964 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
    64986965 
    64996966 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
    6500 @@ -9565,14 +9634,14 @@
     6967@@ -9565,14 +9646,14 @@
    65016968 else
    65026969   enable_hard_tabs=$with_develop
    65036970 fi;
    65046971-echo "$as_me:9568: result: $enable_hard_tabs" >&5
    6505 +echo "$as_me:9637: result: $enable_hard_tabs" >&5
     6972+echo "$as_me:9649: result: $enable_hard_tabs" >&5
    65066973 echo "${ECHO_T}$enable_hard_tabs" >&6
    65076974 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
    … …  
    65116978 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
    65126979-echo "$as_me:9575: checking if you want limited support for xmc" >&5
    6513 +echo "$as_me:9644: checking if you want limited support for xmc" >&5
     6980+echo "$as_me:9656: checking if you want limited support for xmc" >&5
    65146981 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
    65156982 
    65166983 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
    6517 @@ -9582,7 +9651,7 @@
     6984@@ -9582,7 +9663,7 @@
    65186985 else
    65196986   enable_xmc_glitch=$with_develop
    65206987 fi;
    65216988-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
    6522 +echo "$as_me:9654: result: $enable_xmc_glitch" >&5
     6989+echo "$as_me:9666: result: $enable_xmc_glitch" >&5
    65236990 echo "${ECHO_T}$enable_xmc_glitch" >&6
    65246991 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
    65256992 #define USE_XMC_SUPPORT 1
    6526 @@ -9591,7 +9660,7 @@
     6993@@ -9591,7 +9672,7 @@
    65276994 ###############################################################################
    65286995 # These are just experimental, probably should not be in a package:
    65296996 
    65306997-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
    6531 +echo "$as_me:9663: checking if you do not want to assume colors are white-on-black" >&5
     6998+echo "$as_me:9675: checking if you do not want to assume colors are white-on-black" >&5
    65326999 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
    65337000 
    65347001 # Check whether --enable-assumed-color or --disable-assumed-color was given.
    6535 @@ -9601,14 +9670,14 @@
     7002@@ -9601,14 +9682,14 @@
    65367003 else
    65377004   with_assumed_color=yes
    65387005 fi;
    65397006-echo "$as_me:9604: result: $with_assumed_color" >&5
    6540 +echo "$as_me:9673: result: $with_assumed_color" >&5
     7007+echo "$as_me:9685: result: $with_assumed_color" >&5
    65417008 echo "${ECHO_T}$with_assumed_color" >&6
    65427009 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
    … …  
    65467013 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
    65477014-echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
    6548 +echo "$as_me:9680: checking if you want hashmap scrolling-optimization code" >&5
     7015+echo "$as_me:9692: checking if you want hashmap scrolling-optimization code" >&5
    65497016 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
    65507017 
    65517018 # Check whether --enable-hashmap or --disable-hashmap was given.
    6552 @@ -9618,14 +9687,14 @@
     7019@@ -9618,14 +9699,14 @@
    65537020 else
    65547021   with_hashmap=yes
    65557022 fi;
    65567023-echo "$as_me:9621: result: $with_hashmap" >&5
    6557 +echo "$as_me:9690: result: $with_hashmap" >&5
     7024+echo "$as_me:9702: result: $with_hashmap" >&5
    65587025 echo "${ECHO_T}$with_hashmap" >&6
    65597026 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
    … …  
    65637030 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
    65647031-echo "$as_me:9628: checking if you want colorfgbg code" >&5
    6565 +echo "$as_me:9697: checking if you want colorfgbg code" >&5
     7032+echo "$as_me:9709: checking if you want colorfgbg code" >&5
    65667033 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
    65677034 
    65687035 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
    6569 @@ -9635,7 +9704,7 @@
     7036@@ -9635,7 +9716,7 @@
    65707037 else
    65717038   with_colorfgbg=no
    65727039 fi;
    65737040-echo "$as_me:9638: result: $with_colorfgbg" >&5
    6574 +echo "$as_me:9707: result: $with_colorfgbg" >&5
     7041+echo "$as_me:9719: result: $with_colorfgbg" >&5
    65757042 echo "${ECHO_T}$with_colorfgbg" >&6
    65767043 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
    65777044 #define USE_COLORFGBG 1
    6578 @@ -9644,7 +9713,7 @@
     7045@@ -9644,7 +9725,7 @@
    65797046 # This is still experimental (20080329), but should ultimately be moved to
    65807047 # the script-block --with-normal, etc.
    65817048 
    65827049-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
    6583 +echo "$as_me:9716: checking if you want to link with the pthread library" >&5
     7050+echo "$as_me:9728: checking if you want to link with the pthread library" >&5
    65847051 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
    65857052 
    65867053 # Check whether --with-pthread or --without-pthread was given.
    6587 @@ -9654,27 +9723,27 @@
     7054@@ -9654,27 +9735,27 @@
    65887055 else
    65897056   with_pthread=no
    65907057 fi;
    65917058-echo "$as_me:9657: result: $with_pthread" >&5
    6592 +echo "$as_me:9726: result: $with_pthread" >&5
     7059+echo "$as_me:9738: result: $with_pthread" >&5
    65937060 echo "${ECHO_T}$with_pthread" >&6
    65947061 
    65957062 if test "$with_pthread" != no ; then
    65967063-    echo "$as_me:9661: checking for pthread.h" >&5
    6597 +    echo "$as_me:9730: checking for pthread.h" >&5
     7064+    echo "$as_me:9742: checking for pthread.h" >&5
    65987065 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
    65997066 if test "${ac_cv_header_pthread_h+set}" = set; then
    … …  
    66027069   cat >conftest.$ac_ext <<_ACEOF
    66037070-#line 9667 "configure"
    6604 +#line 9736 "configure"
     7071+#line 9748 "configure"
    66057072 #include "confdefs.h"
    66067073 #include <pthread.h>
    66077074 _ACEOF
    66087075-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
    6609 +if { (eval echo "$as_me:9740: \"$ac_cpp conftest.$ac_ext\"") >&5
     7076+if { (eval echo "$as_me:9752: \"$ac_cpp conftest.$ac_ext\"") >&5
    66107077   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    66117078   ac_status=$?
    … …  
    66147081   cat conftest.err >&5
    66157082-  echo "$as_me:9677: \$? = $ac_status" >&5
    6616 +  echo "$as_me:9746: \$? = $ac_status" >&5
     7083+  echo "$as_me:9758: \$? = $ac_status" >&5
    66177084   (exit $ac_status); } >/dev/null; then
    66187085   if test -s conftest.err; then
    66197086     ac_cpp_err=$ac_c_preproc_warn_flag
    6620 @@ -9693,7 +9762,7 @@
     7087@@ -9693,7 +9774,7 @@
    66217088 fi
    66227089 rm -f conftest.err conftest.$ac_ext
    66237090 fi
    66247091-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
    6625 +echo "$as_me:9765: result: $ac_cv_header_pthread_h" >&5
     7092+echo "$as_me:9777: result: $ac_cv_header_pthread_h" >&5
    66267093 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
    66277094 if test $ac_cv_header_pthread_h = yes; then
    66287095 
    6629 @@ -9701,12 +9770,12 @@
     7096@@ -9701,12 +9782,12 @@
    66307097 #define HAVE_PTHREADS_H 1
    66317098 EOF
    66327099 
    66337100-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
    6634 +        echo "$as_me:9773: checking if we can link with the pthread library" >&5
     7101+        echo "$as_me:9785: checking if we can link with the pthread library" >&5
    66357102 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
    66367103         cf_save_LIBS="$LIBS"
    … …  
    66387105         cat >conftest.$ac_ext <<_ACEOF
    66397106-#line 9709 "configure"
    6640 +#line 9778 "configure"
     7107+#line 9790 "configure"
    66417108 #include "confdefs.h"
    66427109 
    66437110 #include <pthread.h>
    6644 @@ -9722,16 +9791,16 @@
     7111@@ -9722,16 +9803,16 @@
    66457112 }
    66467113 _ACEOF
    66477114 rm -f conftest.$ac_objext conftest$ac_exeext
    66487115-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
    6649 +if { (eval echo "$as_me:9794: \"$ac_link\"") >&5
     7116+if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
    66507117   (eval $ac_link) 2>&5
    66517118   ac_status=$?
    66527119-  echo "$as_me:9728: \$? = $ac_status" >&5
    6653 +  echo "$as_me:9797: \$? = $ac_status" >&5
     7120+  echo "$as_me:9809: \$? = $ac_status" >&5
    66547121   (exit $ac_status); } &&
    66557122          { ac_try='test -s conftest$ac_exeext'
    66567123-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
    6657 +  { (eval echo "$as_me:9800: \"$ac_try\"") >&5
     7124+  { (eval echo "$as_me:9812: \"$ac_try\"") >&5
    66587125   (eval $ac_try) 2>&5
    66597126   ac_status=$?
    66607127-  echo "$as_me:9734: \$? = $ac_status" >&5
    6661 +  echo "$as_me:9803: \$? = $ac_status" >&5
     7128+  echo "$as_me:9815: \$? = $ac_status" >&5
    66627129   (exit $ac_status); }; }; then
    66637130   with_pthread=yes
    66647131 else
    6665 @@ -9741,7 +9810,7 @@
     7132@@ -9741,7 +9822,7 @@
    66667133 fi
    66677134 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    66687135         LIBS="$cf_save_LIBS"
    66697136-        echo "$as_me:9744: result: $with_pthread" >&5
    6670 +        echo "$as_me:9813: result: $with_pthread" >&5
     7137+        echo "$as_me:9825: result: $with_pthread" >&5
    66717138 echo "${ECHO_T}$with_pthread" >&6
    66727139 
    66737140         if test "$with_pthread" = yes ; then
    6674 @@ -9751,7 +9820,7 @@
     7141@@ -9751,7 +9832,7 @@
    66757142 EOF
    66767143 
    66777144         else
    66787145-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
    6679 +            { { echo "$as_me:9823: error: Cannot link with pthread library" >&5
     7146+            { { echo "$as_me:9835: error: Cannot link with pthread library" >&5
    66807147 echo "$as_me: error: Cannot link with pthread library" >&2;}
    66817148    { (exit 1); exit 1; }; }
    66827149         fi
    6683 @@ -9760,7 +9829,7 @@
     7150@@ -9760,7 +9841,7 @@
    66847151 
    66857152 fi
    66867153 
    66877154-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
    6688 +echo "$as_me:9832: checking if you want to use weak-symbols for pthreads" >&5
     7155+echo "$as_me:9844: checking if you want to use weak-symbols for pthreads" >&5
    66897156 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
    66907157 
    66917158 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
    6692 @@ -9770,18 +9839,18 @@
     7159@@ -9770,18 +9851,18 @@
    66937160 else
    66947161   use_weak_symbols=no
    66957162 fi;
    66967163-echo "$as_me:9773: result: $use_weak_symbols" >&5
    6697 +echo "$as_me:9842: result: $use_weak_symbols" >&5
     7164+echo "$as_me:9854: result: $use_weak_symbols" >&5
    66987165 echo "${ECHO_T}$use_weak_symbols" >&6
    66997166 if test "$use_weak_symbols" = yes ; then
    67007167 
    67017168-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
    6702 +echo "$as_me:9846: checking if $CC supports weak symbols" >&5
     7169+echo "$as_me:9858: checking if $CC supports weak symbols" >&5
    67037170 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
    67047171 if test "${cf_cv_weak_symbols+set}" = set; then
    … …  
    67087175 cat >conftest.$ac_ext <<_ACEOF
    67097176-#line 9784 "configure"
    6710 +#line 9853 "configure"
     7177+#line 9865 "configure"
    67117178 #include "confdefs.h"
    67127179 
    67137180 #include <stdio.h>
    6714 @@ -9807,16 +9876,16 @@
     7181@@ -9807,16 +9888,16 @@
    67157182 }
    67167183 _ACEOF
    67177184 rm -f conftest.$ac_objext
    67187185-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
    6719 +if { (eval echo "$as_me:9879: \"$ac_compile\"") >&5
     7186+if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
    67207187   (eval $ac_compile) 2>&5
    67217188   ac_status=$?
    67227189-  echo "$as_me:9813: \$? = $ac_status" >&5
    6723 +  echo "$as_me:9882: \$? = $ac_status" >&5
     7190+  echo "$as_me:9894: \$? = $ac_status" >&5
    67247191   (exit $ac_status); } &&
    67257192          { ac_try='test -s conftest.$ac_objext'
    67267193-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
    6727 +  { (eval echo "$as_me:9885: \"$ac_try\"") >&5
     7194+  { (eval echo "$as_me:9897: \"$ac_try\"") >&5
    67287195   (eval $ac_try) 2>&5
    67297196   ac_status=$?
    67307197-  echo "$as_me:9819: \$? = $ac_status" >&5
    6731 +  echo "$as_me:9888: \$? = $ac_status" >&5
     7198+  echo "$as_me:9900: \$? = $ac_status" >&5
    67327199   (exit $ac_status); }; }; then
    67337200   cf_cv_weak_symbols=yes
    67347201 else
    6735 @@ -9827,7 +9896,7 @@
     7202@@ -9827,7 +9908,7 @@
    67367203 rm -f conftest.$ac_objext conftest.$ac_ext
    67377204 
    67387205 fi
    67397206-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
    6740 +echo "$as_me:9899: result: $cf_cv_weak_symbols" >&5
     7207+echo "$as_me:9911: result: $cf_cv_weak_symbols" >&5
    67417208 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
    67427209 
    67437210 else
    6744 @@ -9857,7 +9926,7 @@
     7211@@ -9857,7 +9938,7 @@
    67457212 # opaque outside of that, so there is no --enable-opaque option.  We can use
    67467213 # this option without --with-pthreads, but this will be always set for
    67477214 # pthreads.
    67487215-echo "$as_me:9860: checking if you want experimental reentrant code" >&5
    6749 +echo "$as_me:9929: checking if you want experimental reentrant code" >&5
     7216+echo "$as_me:9941: checking if you want experimental reentrant code" >&5
    67507217 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
    67517218 
    67527219 # Check whether --enable-reentrant or --disable-reentrant was given.
    6753 @@ -9867,7 +9936,7 @@
     7220@@ -9867,7 +9948,7 @@
    67547221 else
    67557222   with_reentrant=no
    67567223 fi;
    67577224-echo "$as_me:9870: result: $with_reentrant" >&5
    6758 +echo "$as_me:9939: result: $with_reentrant" >&5
     7225+echo "$as_me:9951: result: $with_reentrant" >&5
    67597226 echo "${ECHO_T}$with_reentrant" >&6
    67607227 if test "$with_reentrant" = yes ; then
    67617228        cf_cv_enable_reentrant=1
    6762 @@ -9891,7 +9960,7 @@
     7229@@ -9891,7 +9972,7 @@
    67637230        5.*)
    67647231                cf_cv_rel_version=6.0
    67657232                cf_cv_abi_version=6
    67667233-               { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    6767 +               { echo "$as_me:9963: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     7234+               { echo "$as_me:9975: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    67687235 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    67697236                ;;
    67707237        esac
    6771 @@ -9904,7 +9973,7 @@
     7238@@ -9904,7 +9985,7 @@
    67727239        NCURSES_SIZE_T=short
    67737240 fi
    67747241 
    67757242-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
    6776 +echo "$as_me:9976: checking if you want experimental safe-sprintf code" >&5
     7243+echo "$as_me:9988: checking if you want experimental safe-sprintf code" >&5
    67777244 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
    67787245 
    67797246 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
    6780 @@ -9914,7 +9983,7 @@
     7247@@ -9914,7 +9995,7 @@
    67817248 else
    67827249   with_safe_sprintf=no
    67837250 fi;
    67847251-echo "$as_me:9917: result: $with_safe_sprintf" >&5
    6785 +echo "$as_me:9986: result: $with_safe_sprintf" >&5
     7252+echo "$as_me:9998: result: $with_safe_sprintf" >&5
    67867253 echo "${ECHO_T}$with_safe_sprintf" >&6
    67877254 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
    67887255 #define USE_SAFE_SPRINTF 1
    6789 @@ -9923,7 +9992,7 @@
     7256@@ -9923,7 +10004,7 @@
    67907257 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
    67917258 # when hashmap is used scroll hints are useless
    67927259 if test "$with_hashmap" = no ; then
    67937260-echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
    6794 +echo "$as_me:9995: checking if you want to experiment without scrolling-hints code" >&5
     7261+echo "$as_me:10007: checking if you want to experiment without scrolling-hints code" >&5
    67957262 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
    67967263 
    67977264 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
    6798 @@ -9933,7 +10002,7 @@
     7265@@ -9933,7 +10014,7 @@
    67997266 else
    68007267   with_scroll_hints=yes
    68017268 fi;
    68027269-echo "$as_me:9936: result: $with_scroll_hints" >&5
    6803 +echo "$as_me:10005: result: $with_scroll_hints" >&5
     7270+echo "$as_me:10017: result: $with_scroll_hints" >&5
    68047271 echo "${ECHO_T}$with_scroll_hints" >&6
    68057272 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
    68067273 #define USE_SCROLL_HINTS 1
    6807 @@ -9941,7 +10010,7 @@
     7274@@ -9941,7 +10022,7 @@
    68087275 
    68097276 fi
    68107277 
    68117278-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
    6812 +echo "$as_me:10013: checking if you want experimental wgetch-events code" >&5
     7279+echo "$as_me:10025: checking if you want experimental wgetch-events code" >&5
    68137280 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
    68147281 
    68157282 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
    6816 @@ -9951,7 +10020,7 @@
     7283@@ -9951,7 +10032,7 @@
    68177284 else
    68187285   with_wgetch_events=no
    68197286 fi;
    68207287-echo "$as_me:9954: result: $with_wgetch_events" >&5
    6821 +echo "$as_me:10023: result: $with_wgetch_events" >&5
     7288+echo "$as_me:10035: result: $with_wgetch_events" >&5
    68227289 echo "${ECHO_T}$with_wgetch_events" >&6
    68237290 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
    68247291 #define NCURSES_WGETCH_EVENTS 1
    6825 @@ -9960,7 +10029,7 @@
     7292@@ -9960,7 +10041,7 @@
    68267293 ###############################################################################
    68277294 
    68287295 ###    use option --disable-echo to suppress full display compiling commands
    68297296-echo "$as_me:9963: checking if you want to display full commands during build" >&5
    6830 +echo "$as_me:10032: checking if you want to display full commands during build" >&5
     7297+echo "$as_me:10044: checking if you want to display full commands during build" >&5
    68317298 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
    68327299 
    68337300 # Check whether --enable-echo or --disable-echo was given.
    6834 @@ -9977,11 +10046,11 @@
     7301@@ -9977,11 +10058,11 @@
    68357302        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
    68367303        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
    68377304 fi
    68387305-echo "$as_me:9980: result: $with_echo" >&5
    6839 +echo "$as_me:10049: result: $with_echo" >&5
     7306+echo "$as_me:10061: result: $with_echo" >&5
    68407307 echo "${ECHO_T}$with_echo" >&6
    68417308 
    68427309 ###    use option --enable-warnings to turn on all gcc warnings
    68437310-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
    6844 +echo "$as_me:10053: checking if you want to see compiler warnings" >&5
     7311+echo "$as_me:10065: checking if you want to see compiler warnings" >&5
    68457312 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
    68467313 
    68477314 # Check whether --enable-warnings or --disable-warnings was given.
    6848 @@ -9989,7 +10058,7 @@
     7315@@ -9989,7 +10070,7 @@
    68497316   enableval="$enable_warnings"
    68507317   with_warnings=$enableval
    68517318 fi;
    68527319-echo "$as_me:9992: result: $with_warnings" >&5
    6853 +echo "$as_me:10061: result: $with_warnings" >&5
     7320+echo "$as_me:10073: result: $with_warnings" >&5
    68547321 echo "${ECHO_T}$with_warnings" >&6
    68557322 
    68567323 if test "x$with_warnings" = "xyes"; then
    6857 @@ -10000,12 +10069,12 @@
     7324@@ -10000,12 +10081,12 @@
    68587325 if test "$GCC" = yes ; then
    68597326        case $host_os in
    68607327        linux*|gnu*)
    68617328-               echo "$as_me:10003: checking if this is really Intel C compiler" >&5
    6862 +               echo "$as_me:10072: checking if this is really Intel C compiler" >&5
     7329+               echo "$as_me:10084: checking if this is really Intel C compiler" >&5
    68637330 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
    68647331                cf_save_CFLAGS="$CFLAGS"
    … …  
    68667333                cat >conftest.$ac_ext <<_ACEOF
    68677334-#line 10008 "configure"
    6868 +#line 10077 "configure"
     7335+#line 10089 "configure"
    68697336 #include "confdefs.h"
    68707337 
    68717338 int
    6872 @@ -10022,16 +10091,16 @@
     7339@@ -10022,16 +10103,16 @@
    68737340 }
    68747341 _ACEOF
    68757342 rm -f conftest.$ac_objext
    68767343-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
    6877 +if { (eval echo "$as_me:10094: \"$ac_compile\"") >&5
     7344+if { (eval echo "$as_me:10106: \"$ac_compile\"") >&5
    68787345   (eval $ac_compile) 2>&5
    68797346   ac_status=$?
    68807347-  echo "$as_me:10028: \$? = $ac_status" >&5
    6881 +  echo "$as_me:10097: \$? = $ac_status" >&5
     7348+  echo "$as_me:10109: \$? = $ac_status" >&5
    68827349   (exit $ac_status); } &&
    68837350          { ac_try='test -s conftest.$ac_objext'
    68847351-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
    6885 +  { (eval echo "$as_me:10100: \"$ac_try\"") >&5
     7352+  { (eval echo "$as_me:10112: \"$ac_try\"") >&5
    68867353   (eval $ac_try) 2>&5
    68877354   ac_status=$?
    68887355-  echo "$as_me:10034: \$? = $ac_status" >&5
    6889 +  echo "$as_me:10103: \$? = $ac_status" >&5
     7356+  echo "$as_me:10115: \$? = $ac_status" >&5
    68907357   (exit $ac_status); }; }; then
    68917358   INTEL_COMPILER=yes
    68927359 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    6893 @@ -10042,14 +10111,14 @@
     7360@@ -10042,14 +10123,14 @@
    68947361 fi
    68957362 rm -f conftest.$ac_objext conftest.$ac_ext
    68967363                CFLAGS="$cf_save_CFLAGS"
    68977364-               echo "$as_me:10045: result: $INTEL_COMPILER" >&5
    6898 +               echo "$as_me:10114: result: $INTEL_COMPILER" >&5
     7365+               echo "$as_me:10126: result: $INTEL_COMPILER" >&5
    68997366 echo "${ECHO_T}$INTEL_COMPILER" >&6
    69007367                ;;
    … …  
    69047371 cat > conftest.$ac_ext <<EOF
    69057372-#line 10052 "${as_me-configure}"
    6906 +#line 10121 "${as_me-configure}"
     7373+#line 10133 "${as_me-configure}"
    69077374 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    69087375 EOF
    69097376 
    6910 @@ -10067,7 +10136,7 @@
     7377@@ -10067,7 +10148,7 @@
    69117378 # remark #981: operands are evaluated in unspecified order
    69127379 # warning #269: invalid format string conversion
    69137380 
    69147381-       { echo "$as_me:10070: checking for $CC warning options..." >&5
    6915 +       { echo "$as_me:10139: checking for $CC warning options..." >&5
     7382+       { echo "$as_me:10151: checking for $CC warning options..." >&5
    69167383 echo "$as_me: checking for $CC warning options..." >&6;}
    69177384        cf_save_CFLAGS="$CFLAGS"
    69187385        EXTRA_CFLAGS="-Wall"
    6919 @@ -10084,12 +10153,12 @@
     7386@@ -10084,12 +10165,12 @@
    69207387                wd981
    69217388        do
    69227389                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    69237390-               if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
    6924 +               if { (eval echo "$as_me:10156: \"$ac_compile\"") >&5
     7391+               if { (eval echo "$as_me:10168: \"$ac_compile\"") >&5
    69257392   (eval $ac_compile) 2>&5
    69267393   ac_status=$?
    69277394-  echo "$as_me:10090: \$? = $ac_status" >&5
    6928 +  echo "$as_me:10159: \$? = $ac_status" >&5
     7395+  echo "$as_me:10171: \$? = $ac_status" >&5
    69297396   (exit $ac_status); }; then
    69307397-                       test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
    6931 +                       test -n "$verbose" && echo "$as_me:10161: result: ... -$cf_opt" >&5
     7398+                       test -n "$verbose" && echo "$as_me:10173: result: ... -$cf_opt" >&5
    69327399 echo "${ECHO_T}... -$cf_opt" >&6
    69337400                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
    69347401                fi
    6935 @@ -10098,7 +10167,7 @@
     7402@@ -10098,7 +10179,7 @@
    69367403 
    69377404 elif test "$GCC" = yes
    69387405 then
    69397406-       { echo "$as_me:10101: checking for $CC warning options..." >&5
    6940 +       { echo "$as_me:10170: checking for $CC warning options..." >&5
     7407+       { echo "$as_me:10182: checking for $CC warning options..." >&5
    69417408 echo "$as_me: checking for $CC warning options..." >&6;}
    69427409        cf_save_CFLAGS="$CFLAGS"
    69437410        EXTRA_CFLAGS="-W -Wall"
    6944 @@ -10118,12 +10187,12 @@
     7411@@ -10118,12 +10199,12 @@
    69457412                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
    69467413        do
    69477414                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    69487415-               if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
    6949 +               if { (eval echo "$as_me:10190: \"$ac_compile\"") >&5
     7416+               if { (eval echo "$as_me:10202: \"$ac_compile\"") >&5
    69507417   (eval $ac_compile) 2>&5
    69517418   ac_status=$?
    69527419-  echo "$as_me:10124: \$? = $ac_status" >&5
    6953 +  echo "$as_me:10193: \$? = $ac_status" >&5
     7420+  echo "$as_me:10205: \$? = $ac_status" >&5
    69547421   (exit $ac_status); }; then
    69557422-                       test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
    6956 +                       test -n "$verbose" && echo "$as_me:10195: result: ... -$cf_opt" >&5
     7423+                       test -n "$verbose" && echo "$as_me:10207: result: ... -$cf_opt" >&5
    69577424 echo "${ECHO_T}... -$cf_opt" >&6
    69587425                        case $cf_opt in #(vi
    69597426                        Wcast-qual) #(vi
    6960 @@ -10134,7 +10203,7 @@
     7427@@ -10134,7 +10215,7 @@
    69617428                                [34].*)
    69627429                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
    69637430 
    69647431-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    6965 +echo "${as_me-configure}:10206: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
     7432+echo "${as_me-configure}:10218: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    69667433 
    69677434                                        continue;;
    69687435                                esac
    6969 @@ -10154,12 +10223,12 @@
     7436@@ -10154,12 +10235,12 @@
    69707437 if test "$GCC" = yes ; then
    69717438        case $host_os in
    69727439        linux*|gnu*)
    69737440-               echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
    6974 +               echo "$as_me:10226: checking if this is really Intel C++ compiler" >&5
     7441+               echo "$as_me:10238: checking if this is really Intel C++ compiler" >&5
    69757442 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
    69767443                cf_save_CFLAGS="$CXXFLAGS"
    … …  
    69787445                cat >conftest.$ac_ext <<_ACEOF
    69797446-#line 10162 "configure"
    6980 +#line 10231 "configure"
     7447+#line 10243 "configure"
    69817448 #include "confdefs.h"
    69827449 
    69837450 int
    6984 @@ -10176,16 +10245,16 @@
     7451@@ -10176,16 +10257,16 @@
    69857452 }
    69867453 _ACEOF
    69877454 rm -f conftest.$ac_objext
    69887455-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
    6989 +if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
     7456+if { (eval echo "$as_me:10260: \"$ac_compile\"") >&5
    69907457   (eval $ac_compile) 2>&5
    69917458   ac_status=$?
    69927459-  echo "$as_me:10182: \$? = $ac_status" >&5
    6993 +  echo "$as_me:10251: \$? = $ac_status" >&5
     7460+  echo "$as_me:10263: \$? = $ac_status" >&5
    69947461   (exit $ac_status); } &&
    69957462          { ac_try='test -s conftest.$ac_objext'
    69967463-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
    6997 +  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
     7464+  { (eval echo "$as_me:10266: \"$ac_try\"") >&5
    69987465   (eval $ac_try) 2>&5
    69997466   ac_status=$?
    70007467-  echo "$as_me:10188: \$? = $ac_status" >&5
    7001 +  echo "$as_me:10257: \$? = $ac_status" >&5
     7468+  echo "$as_me:10269: \$? = $ac_status" >&5
    70027469   (exit $ac_status); }; }; then
    70037470   INTEL_CPLUSPLUS=yes
    70047471 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    7005 @@ -10196,7 +10265,7 @@
     7472@@ -10196,7 +10277,7 @@
    70067473 fi
    70077474 rm -f conftest.$ac_objext conftest.$ac_ext
    70087475                CXXFLAGS="$cf_save_CFLAGS"
    70097476-               echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
    7010 +               echo "$as_me:10268: result: $INTEL_CPLUSPLUS" >&5
     7477+               echo "$as_me:10280: result: $INTEL_CPLUSPLUS" >&5
    70117478 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
    70127479                ;;
    70137480        esac
    7014 @@ -10210,7 +10279,7 @@
     7481@@ -10210,7 +10291,7 @@
    70157482 ac_main_return=return
    70167483 
    70177484 cat > conftest.$ac_ext <<EOF
    70187485-#line 10213 "configure"
    7019 +#line 10282 "configure"
     7486+#line 10294 "configure"
    70207487 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    70217488 EOF
    70227489 
    7023 @@ -10228,7 +10297,7 @@
     7490@@ -10228,7 +10309,7 @@
    70247491 # remark #981: operands are evaluated in unspecified order
    70257492 # warning #269: invalid format string conversion
    70267493 
    70277494-       { echo "$as_me:10231: checking for $CC warning options..." >&5
    7028 +       { echo "$as_me:10300: checking for $CC warning options..." >&5
     7495+       { echo "$as_me:10312: checking for $CC warning options..." >&5
    70297496 echo "$as_me: checking for $CC warning options..." >&6;}
    70307497        cf_save_CXXFLAGS="$CXXFLAGS"
    70317498        EXTRA_CXXFLAGS="-Wall"
    7032 @@ -10245,12 +10314,12 @@
     7499@@ -10245,12 +10326,12 @@
    70337500                wd981
    70347501        do
    70357502                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
    70367503-               if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
    7037 +               if { (eval echo "$as_me:10317: \"$ac_compile\"") >&5
     7504+               if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5
    70387505   (eval $ac_compile) 2>&5
    70397506   ac_status=$?
    70407507-  echo "$as_me:10251: \$? = $ac_status" >&5
    7041 +  echo "$as_me:10320: \$? = $ac_status" >&5
     7508+  echo "$as_me:10332: \$? = $ac_status" >&5
    70427509   (exit $ac_status); }; then
    70437510-                       test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
    7044 +                       test -n "$verbose" && echo "$as_me:10322: result: ... -$cf_opt" >&5
     7511+                       test -n "$verbose" && echo "$as_me:10334: result: ... -$cf_opt" >&5
    70457512 echo "${ECHO_T}... -$cf_opt" >&6
    70467513                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    70477514                fi
    7048 @@ -10259,7 +10328,7 @@
     7515@@ -10259,7 +10340,7 @@
    70497516 
    70507517 elif test "$GXX" = yes
    70517518 then
    70527519-       { echo "$as_me:10262: checking for $CXX warning options..." >&5
    7053 +       { echo "$as_me:10331: checking for $CXX warning options..." >&5
     7520+       { echo "$as_me:10343: checking for $CXX warning options..." >&5
    70547521 echo "$as_me: checking for $CXX warning options..." >&6;}
    70557522        cf_save_CXXFLAGS="$CXXFLAGS"
    70567523        EXTRA_CXXFLAGS="-W -Wall"
    7057 @@ -10288,16 +10357,16 @@
     7524@@ -10288,16 +10369,16 @@
    70587525                Wundef $cf_gxx_extra_warnings Wno-unused
    70597526        do
    70607527                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
    70617528-               if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
    7062 +               if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5
     7529+               if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
    70637530   (eval $ac_compile) 2>&5
    70647531   ac_status=$?
    70657532-  echo "$as_me:10294: \$? = $ac_status" >&5
    7066 +  echo "$as_me:10363: \$? = $ac_status" >&5
     7533+  echo "$as_me:10375: \$? = $ac_status" >&5
    70677534   (exit $ac_status); }; then
    70687535-                       test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
    7069 +                       test -n "$verbose" && echo "$as_me:10365: result: ... -$cf_opt" >&5
     7536+                       test -n "$verbose" && echo "$as_me:10377: result: ... -$cf_opt" >&5
    70707537 echo "${ECHO_T}... -$cf_opt" >&6
    70717538                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    70727539                else
    70737540-                       test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
    7074 +                       test -n "$verbose" && echo "$as_me:10369: result: ... no -$cf_opt" >&5
     7541+                       test -n "$verbose" && echo "$as_me:10381: result: ... no -$cf_opt" >&5
    70757542 echo "${ECHO_T}... no -$cf_opt" >&6
    70767543                fi
    70777544        done
    7078 @@ -10333,10 +10402,10 @@
     7545@@ -10333,10 +10414,10 @@
    70797546 EOF
    70807547 if test "$GCC" = yes
    70817548 then
    70827549-       { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
    7083 +       { echo "$as_me:10405: checking for $CC __attribute__ directives..." >&5
     7550+       { echo "$as_me:10417: checking for $CC __attribute__ directives..." >&5
    70847551 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
    70857552 cat > conftest.$ac_ext <<EOF
    70867553-#line 10339 "${as_me-configure}"
    7087 +#line 10408 "${as_me-configure}"
     7554+#line 10420 "${as_me-configure}"
    70887555 #include "confdefs.h"
    70897556 #include "conftest.h"
    70907557 #include "conftest.i"
    7091 @@ -10374,12 +10443,12 @@
     7558@@ -10374,12 +10455,12 @@
    70927559 EOF
    70937560                        ;;
    70947561                esac
    70957562-               if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
    7096 +               if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5
     7563+               if { (eval echo "$as_me:10458: \"$ac_compile\"") >&5
    70977564   (eval $ac_compile) 2>&5
    70987565   ac_status=$?
    70997566-  echo "$as_me:10380: \$? = $ac_status" >&5
    7100 +  echo "$as_me:10449: \$? = $ac_status" >&5
     7567+  echo "$as_me:10461: \$? = $ac_status" >&5
    71017568   (exit $ac_status); }; then
    71027569-                       test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
    7103 +                       test -n "$verbose" && echo "$as_me:10451: result: ... $cf_attribute" >&5
     7570+                       test -n "$verbose" && echo "$as_me:10463: result: ... $cf_attribute" >&5
    71047571 echo "${ECHO_T}... $cf_attribute" >&6
    71057572                        cat conftest.h >>confdefs.h
    71067573                fi
    7107 @@ -10391,7 +10460,7 @@
     7574@@ -10391,7 +10472,7 @@
    71087575 fi
    71097576 
    71107577 ###    use option --enable-assertions to turn on generation of assertion code
    71117578-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
    7112 +echo "$as_me:10463: checking if you want to enable runtime assertions" >&5
     7579+echo "$as_me:10475: checking if you want to enable runtime assertions" >&5
    71137580 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
    71147581 
    71157582 # Check whether --enable-assertions or --disable-assertions was given.
    7116 @@ -10401,7 +10470,7 @@
     7583@@ -10401,7 +10482,7 @@
    71177584 else
    71187585   with_assertions=no
    71197586 fi;
    71207587-echo "$as_me:10404: result: $with_assertions" >&5
    7121 +echo "$as_me:10473: result: $with_assertions" >&5
     7588+echo "$as_me:10485: result: $with_assertions" >&5
    71227589 echo "${ECHO_T}$with_assertions" >&6
    71237590 if test -n "$GCC"
    71247591 then
    7125 @@ -10419,7 +10488,7 @@
     7592@@ -10419,7 +10500,7 @@
    71267593 
    71277594 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
    71287595 
    71297596-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
    7130 +echo "$as_me:10491: checking if you want to use dmalloc for testing" >&5
     7597+echo "$as_me:10503: checking if you want to use dmalloc for testing" >&5
    71317598 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
    71327599 
    71337600 # Check whether --with-dmalloc or --without-dmalloc was given.
    7134 @@ -10435,7 +10504,7 @@
     7601@@ -10435,7 +10516,7 @@
    71357602 else
    71367603   with_dmalloc=
    71377604 fi;
    71387605-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
    7139 +echo "$as_me:10507: result: ${with_dmalloc:-no}" >&5
     7606+echo "$as_me:10519: result: ${with_dmalloc:-no}" >&5
    71407607 echo "${ECHO_T}${with_dmalloc:-no}" >&6
    71417608 
    71427609 case .$with_cflags in #(vi
    7143 @@ -10519,23 +10588,23 @@
     7610@@ -10519,23 +10600,23 @@
    71447611 esac
    71457612 
    71467613 if test "$with_dmalloc" = yes ; then
    71477614-       echo "$as_me:10522: checking for dmalloc.h" >&5
    7148 +       echo "$as_me:10591: checking for dmalloc.h" >&5
     7615+       echo "$as_me:10603: checking for dmalloc.h" >&5
    71497616 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
    71507617 if test "${ac_cv_header_dmalloc_h+set}" = set; then
    … …  
    71537620   cat >conftest.$ac_ext <<_ACEOF
    71547621-#line 10528 "configure"
    7155 +#line 10597 "configure"
     7622+#line 10609 "configure"
    71567623 #include "confdefs.h"
    71577624 #include <dmalloc.h>
    71587625 _ACEOF
    71597626-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
    7160 +if { (eval echo "$as_me:10601: \"$ac_cpp conftest.$ac_ext\"") >&5
     7627+if { (eval echo "$as_me:10613: \"$ac_cpp conftest.$ac_ext\"") >&5
    71617628   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    71627629   ac_status=$?
    … …  
    71657632   cat conftest.err >&5
    71667633-  echo "$as_me:10538: \$? = $ac_status" >&5
    7167 +  echo "$as_me:10607: \$? = $ac_status" >&5
     7634+  echo "$as_me:10619: \$? = $ac_status" >&5
    71687635   (exit $ac_status); } >/dev/null; then
    71697636   if test -s conftest.err; then
    71707637     ac_cpp_err=$ac_c_preproc_warn_flag
    7171 @@ -10554,11 +10623,11 @@
     7638@@ -10554,11 +10635,11 @@
    71727639 fi
    71737640 rm -f conftest.err conftest.$ac_ext
    71747641 fi
    71757642-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
    7176 +echo "$as_me:10626: result: $ac_cv_header_dmalloc_h" >&5
     7643+echo "$as_me:10638: result: $ac_cv_header_dmalloc_h" >&5
    71777644 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
    71787645 if test $ac_cv_header_dmalloc_h = yes; then
    71797646 
    71807647-echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
    7181 +echo "$as_me:10630: checking for dmalloc_debug in -ldmalloc" >&5
     7648+echo "$as_me:10642: checking for dmalloc_debug in -ldmalloc" >&5
    71827649 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
    71837650 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
    71847651   echo $ECHO_N "(cached) $ECHO_C" >&6
    7185 @@ -10566,7 +10635,7 @@
     7652@@ -10566,7 +10647,7 @@
    71867653   ac_check_lib_save_LIBS=$LIBS
    71877654 LIBS="-ldmalloc  $LIBS"
    71887655 cat >conftest.$ac_ext <<_ACEOF
    71897656-#line 10569 "configure"
    7190 +#line 10638 "configure"
     7657+#line 10650 "configure"
    71917658 #include "confdefs.h"
    71927659 
    71937660 /* Override any gcc2 internal prototype to avoid an error.  */
    7194 @@ -10585,16 +10654,16 @@
     7661@@ -10585,16 +10666,16 @@
    71957662 }
    71967663 _ACEOF
    71977664 rm -f conftest.$ac_objext conftest$ac_exeext
    71987665-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
    7199 +if { (eval echo "$as_me:10657: \"$ac_link\"") >&5
     7666+if { (eval echo "$as_me:10669: \"$ac_link\"") >&5
    72007667   (eval $ac_link) 2>&5
    72017668   ac_status=$?
    72027669-  echo "$as_me:10591: \$? = $ac_status" >&5
    7203 +  echo "$as_me:10660: \$? = $ac_status" >&5
     7670+  echo "$as_me:10672: \$? = $ac_status" >&5
    72047671   (exit $ac_status); } &&
    72057672          { ac_try='test -s conftest$ac_exeext'
    72067673-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
    7207 +  { (eval echo "$as_me:10663: \"$ac_try\"") >&5
     7674+  { (eval echo "$as_me:10675: \"$ac_try\"") >&5
    72087675   (eval $ac_try) 2>&5
    72097676   ac_status=$?
    72107677-  echo "$as_me:10597: \$? = $ac_status" >&5
    7211 +  echo "$as_me:10666: \$? = $ac_status" >&5
     7678+  echo "$as_me:10678: \$? = $ac_status" >&5
    72127679   (exit $ac_status); }; }; then
    72137680   ac_cv_lib_dmalloc_dmalloc_debug=yes
    72147681 else
    7215 @@ -10605,7 +10674,7 @@
     7682@@ -10605,7 +10686,7 @@
    72167683 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    72177684 LIBS=$ac_check_lib_save_LIBS
    72187685 fi
    72197686-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    7220 +echo "$as_me:10677: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
     7687+echo "$as_me:10689: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    72217688 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
    72227689 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    72237690   cat >>confdefs.h <<EOF
    7224 @@ -10620,7 +10689,7 @@
     7691@@ -10620,7 +10701,7 @@
    72257692 
    72267693 fi
    72277694 
    72287695-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
    7229 +echo "$as_me:10692: checking if you want to use dbmalloc for testing" >&5
     7696+echo "$as_me:10704: checking if you want to use dbmalloc for testing" >&5
    72307697 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
    72317698 
    72327699 # Check whether --with-dbmalloc or --without-dbmalloc was given.
    7233 @@ -10636,7 +10705,7 @@
     7700@@ -10636,7 +10717,7 @@
    72347701 else
    72357702   with_dbmalloc=
    72367703 fi;
    72377704-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
    7238 +echo "$as_me:10708: result: ${with_dbmalloc:-no}" >&5
     7705+echo "$as_me:10720: result: ${with_dbmalloc:-no}" >&5
    72397706 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
    72407707 
    72417708 case .$with_cflags in #(vi
    7242 @@ -10720,23 +10789,23 @@
     7709@@ -10720,23 +10801,23 @@
    72437710 esac
    72447711 
    72457712 if test "$with_dbmalloc" = yes ; then
    72467713-       echo "$as_me:10723: checking for dbmalloc.h" >&5
    7247 +       echo "$as_me:10792: checking for dbmalloc.h" >&5
     7714+       echo "$as_me:10804: checking for dbmalloc.h" >&5
    72487715 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
    72497716 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
    … …  
    72527719   cat >conftest.$ac_ext <<_ACEOF
    72537720-#line 10729 "configure"
    7254 +#line 10798 "configure"
     7721+#line 10810 "configure"
    72557722 #include "confdefs.h"
    72567723 #include <dbmalloc.h>
    72577724 _ACEOF
    72587725-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
    7259 +if { (eval echo "$as_me:10802: \"$ac_cpp conftest.$ac_ext\"") >&5
     7726+if { (eval echo "$as_me:10814: \"$ac_cpp conftest.$ac_ext\"") >&5
    72607727   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    72617728   ac_status=$?
    … …  
    72647731   cat conftest.err >&5
    72657732-  echo "$as_me:10739: \$? = $ac_status" >&5
    7266 +  echo "$as_me:10808: \$? = $ac_status" >&5
     7733+  echo "$as_me:10820: \$? = $ac_status" >&5
    72677734   (exit $ac_status); } >/dev/null; then
    72687735   if test -s conftest.err; then
    72697736     ac_cpp_err=$ac_c_preproc_warn_flag
    7270 @@ -10755,11 +10824,11 @@
     7737@@ -10755,11 +10836,11 @@
    72717738 fi
    72727739 rm -f conftest.err conftest.$ac_ext
    72737740 fi
    72747741-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
    7275 +echo "$as_me:10827: result: $ac_cv_header_dbmalloc_h" >&5
     7742+echo "$as_me:10839: result: $ac_cv_header_dbmalloc_h" >&5
    72767743 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
    72777744 if test $ac_cv_header_dbmalloc_h = yes; then
    72787745 
    72797746-echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
    7280 +echo "$as_me:10831: checking for debug_malloc in -ldbmalloc" >&5
     7747+echo "$as_me:10843: checking for debug_malloc in -ldbmalloc" >&5
    72817748 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
    72827749 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
    72837750   echo $ECHO_N "(cached) $ECHO_C" >&6
    7284 @@ -10767,7 +10836,7 @@
     7751@@ -10767,7 +10848,7 @@
    72857752   ac_check_lib_save_LIBS=$LIBS
    72867753 LIBS="-ldbmalloc  $LIBS"
    72877754 cat >conftest.$ac_ext <<_ACEOF
    72887755-#line 10770 "configure"
    7289 +#line 10839 "configure"
     7756+#line 10851 "configure"
    72907757 #include "confdefs.h"
    72917758 
    72927759 /* Override any gcc2 internal prototype to avoid an error.  */
    7293 @@ -10786,16 +10855,16 @@
     7760@@ -10786,16 +10867,16 @@
    72947761 }
    72957762 _ACEOF
    72967763 rm -f conftest.$ac_objext conftest$ac_exeext
    72977764-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
    7298 +if { (eval echo "$as_me:10858: \"$ac_link\"") >&5
     7765+if { (eval echo "$as_me:10870: \"$ac_link\"") >&5
    72997766   (eval $ac_link) 2>&5
    73007767   ac_status=$?
    73017768-  echo "$as_me:10792: \$? = $ac_status" >&5
    7302 +  echo "$as_me:10861: \$? = $ac_status" >&5
     7769+  echo "$as_me:10873: \$? = $ac_status" >&5
    73037770   (exit $ac_status); } &&
    73047771          { ac_try='test -s conftest$ac_exeext'
    73057772-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
    7306 +  { (eval echo "$as_me:10864: \"$ac_try\"") >&5
     7773+  { (eval echo "$as_me:10876: \"$ac_try\"") >&5
    73077774   (eval $ac_try) 2>&5
    73087775   ac_status=$?
    73097776-  echo "$as_me:10798: \$? = $ac_status" >&5
    7310 +  echo "$as_me:10867: \$? = $ac_status" >&5
     7777+  echo "$as_me:10879: \$? = $ac_status" >&5
    73117778   (exit $ac_status); }; }; then
    73127779   ac_cv_lib_dbmalloc_debug_malloc=yes
    73137780 else
    7314 @@ -10806,7 +10875,7 @@
     7781@@ -10806,7 +10887,7 @@
    73157782 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    73167783 LIBS=$ac_check_lib_save_LIBS
    73177784 fi
    73187785-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    7319 +echo "$as_me:10878: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
     7786+echo "$as_me:10890: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    73207787 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
    73217788 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    73227789   cat >>confdefs.h <<EOF
    7323 @@ -10821,7 +10890,7 @@
     7790@@ -10821,7 +10902,7 @@
    73247791 
    73257792 fi
    73267793 
    73277794-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
    7328 +echo "$as_me:10893: checking if you want to use valgrind for testing" >&5
     7795+echo "$as_me:10905: checking if you want to use valgrind for testing" >&5
    73297796 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
    73307797 
    73317798 # Check whether --with-valgrind or --without-valgrind was given.
    7332 @@ -10837,7 +10906,7 @@
     7799@@ -10837,7 +10918,7 @@
    73337800 else
    73347801   with_valgrind=
    73357802 fi;
    73367803-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
    7337 +echo "$as_me:10909: result: ${with_valgrind:-no}" >&5
     7804+echo "$as_me:10921: result: ${with_valgrind:-no}" >&5
    73387805 echo "${ECHO_T}${with_valgrind:-no}" >&6
    73397806 
    73407807 case .$with_cflags in #(vi
    7341 @@ -10920,7 +10989,7 @@
     7808@@ -10920,7 +11001,7 @@
    73427809        ;;
    73437810 esac
    73447811 
    73457812-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
    7346 +echo "$as_me:10992: checking if you want to perform memory-leak testing" >&5
     7813+echo "$as_me:11004: checking if you want to perform memory-leak testing" >&5
    73477814 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
    73487815 
    73497816 # Check whether --enable-leaks or --disable-leaks was given.
    7350 @@ -10930,7 +10999,7 @@
     7817@@ -10930,7 +11011,7 @@
    73517818 else
    73527819   : ${with_no_leaks:=no}
    73537820 fi;
    73547821-echo "$as_me:10933: result: $with_no_leaks" >&5
    7355 +echo "$as_me:11002: result: $with_no_leaks" >&5
     7822+echo "$as_me:11014: result: $with_no_leaks" >&5
    73567823 echo "${ECHO_T}$with_no_leaks" >&6
    73577824 
    73587825 if test "$with_no_leaks" = yes ; then
    7359 @@ -10975,7 +11044,7 @@
     7826@@ -10975,7 +11056,7 @@
    73607827        ;;
    73617828 esac
    73627829 
    73637830-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
    7364 +echo "$as_me:11047: checking whether to add trace feature to all models" >&5
     7831+echo "$as_me:11059: checking whether to add trace feature to all models" >&5
    73657832 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
    73667833 
    73677834 # Check whether --with-trace or --without-trace was given.
    7368 @@ -10985,7 +11054,7 @@
     7835@@ -10985,7 +11066,7 @@
    73697836 else
    73707837   cf_with_trace=$cf_all_traces
    73717838 fi;
    73727839-echo "$as_me:10988: result: $cf_with_trace" >&5
    7373 +echo "$as_me:11057: result: $cf_with_trace" >&5
     7840+echo "$as_me:11069: result: $cf_with_trace" >&5
    73747841 echo "${ECHO_T}$cf_with_trace" >&6
    73757842 
    73767843 if test "$cf_with_trace" = yes ; then
    7377 @@ -11066,13 +11135,13 @@
     7844@@ -11066,13 +11147,13 @@
    73787845 fi
    73797846 
    73807847 ###    Checks for libraries.
    73817848-echo "$as_me:11069: checking for gettimeofday" >&5
    7382 +echo "$as_me:11138: checking for gettimeofday" >&5
     7849+echo "$as_me:11150: checking for gettimeofday" >&5
    73837850 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
    73847851 if test "${ac_cv_func_gettimeofday+set}" = set; then
    … …  
    73877854   cat >conftest.$ac_ext <<_ACEOF
    73887855-#line 11075 "configure"
    7389 +#line 11144 "configure"
     7856+#line 11156 "configure"
    73907857 #include "confdefs.h"
    73917858 /* System header to define __stub macros and hopefully few prototypes,
    73927859     which can conflict with char gettimeofday (); below.  */
    7393 @@ -11103,16 +11172,16 @@
     7860@@ -11103,16 +11184,16 @@
    73947861 }
    73957862 _ACEOF
    73967863 rm -f conftest.$ac_objext conftest$ac_exeext
    73977864-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
    7398 +if { (eval echo "$as_me:11175: \"$ac_link\"") >&5
     7865+if { (eval echo "$as_me:11187: \"$ac_link\"") >&5
    73997866   (eval $ac_link) 2>&5
    74007867   ac_status=$?
    74017868-  echo "$as_me:11109: \$? = $ac_status" >&5
    7402 +  echo "$as_me:11178: \$? = $ac_status" >&5
     7869+  echo "$as_me:11190: \$? = $ac_status" >&5
    74037870   (exit $ac_status); } &&
    74047871          { ac_try='test -s conftest$ac_exeext'
    74057872-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
    7406 +  { (eval echo "$as_me:11181: \"$ac_try\"") >&5
     7873+  { (eval echo "$as_me:11193: \"$ac_try\"") >&5
    74077874   (eval $ac_try) 2>&5
    74087875   ac_status=$?
    74097876-  echo "$as_me:11115: \$? = $ac_status" >&5
    7410 +  echo "$as_me:11184: \$? = $ac_status" >&5
     7877+  echo "$as_me:11196: \$? = $ac_status" >&5
    74117878   (exit $ac_status); }; }; then
    74127879   ac_cv_func_gettimeofday=yes
    74137880 else
    7414 @@ -11122,7 +11191,7 @@
     7881@@ -11122,7 +11203,7 @@
    74157882 fi
    74167883 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    74177884 fi
    74187885-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
    7419 +echo "$as_me:11194: result: $ac_cv_func_gettimeofday" >&5
     7886+echo "$as_me:11206: result: $ac_cv_func_gettimeofday" >&5
    74207887 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
    74217888 if test $ac_cv_func_gettimeofday = yes; then
    74227889   cat >>confdefs.h <<\EOF
    7423 @@ -11131,7 +11200,7 @@
     7890@@ -11131,7 +11212,7 @@
    74247891 
    74257892 else
    74267893 
    74277894-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
    7428 +echo "$as_me:11203: checking for gettimeofday in -lbsd" >&5
     7895+echo "$as_me:11215: checking for gettimeofday in -lbsd" >&5
    74297896 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
    74307897 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    74317898   echo $ECHO_N "(cached) $ECHO_C" >&6
    7432 @@ -11139,7 +11208,7 @@
     7899@@ -11139,7 +11220,7 @@
    74337900   ac_check_lib_save_LIBS=$LIBS
    74347901 LIBS="-lbsd  $LIBS"
    74357902 cat >conftest.$ac_ext <<_ACEOF
    74367903-#line 11142 "configure"
    7437 +#line 11211 "configure"
     7904+#line 11223 "configure"
    74387905 #include "confdefs.h"
    74397906 
    74407907 /* Override any gcc2 internal prototype to avoid an error.  */
    7441 @@ -11158,16 +11227,16 @@
     7908@@ -11158,16 +11239,16 @@
    74427909 }
    74437910 _ACEOF
    74447911 rm -f conftest.$ac_objext conftest$ac_exeext
    74457912-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    7446 +if { (eval echo "$as_me:11230: \"$ac_link\"") >&5
     7913+if { (eval echo "$as_me:11242: \"$ac_link\"") >&5
    74477914   (eval $ac_link) 2>&5
    74487915   ac_status=$?
    74497916-  echo "$as_me:11164: \$? = $ac_status" >&5
    7450 +  echo "$as_me:11233: \$? = $ac_status" >&5
     7917+  echo "$as_me:11245: \$? = $ac_status" >&5
    74517918   (exit $ac_status); } &&
    74527919          { ac_try='test -s conftest$ac_exeext'
    74537920-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    7454 +  { (eval echo "$as_me:11236: \"$ac_try\"") >&5
     7921+  { (eval echo "$as_me:11248: \"$ac_try\"") >&5
    74557922   (eval $ac_try) 2>&5
    74567923   ac_status=$?
    74577924-  echo "$as_me:11170: \$? = $ac_status" >&5
    7458 +  echo "$as_me:11239: \$? = $ac_status" >&5
     7925+  echo "$as_me:11251: \$? = $ac_status" >&5
    74597926   (exit $ac_status); }; }; then
    74607927   ac_cv_lib_bsd_gettimeofday=yes
    74617928 else
    7462 @@ -11178,7 +11247,7 @@
     7929@@ -11178,7 +11259,7 @@
    74637930 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    74647931 LIBS=$ac_check_lib_save_LIBS
    74657932 fi
    74667933-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
    7467 +echo "$as_me:11250: result: $ac_cv_lib_bsd_gettimeofday" >&5
     7934+echo "$as_me:11262: result: $ac_cv_lib_bsd_gettimeofday" >&5
    74687935 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
    74697936 if test $ac_cv_lib_bsd_gettimeofday = yes; then
    74707937   cat >>confdefs.h <<\EOF
    7471 @@ -11190,14 +11259,14 @@
     7938@@ -11190,14 +11271,14 @@
    74727939 
    74737940 fi
    74747941 
    74757942-echo "$as_me:11193: checking if -lm needed for math functions" >&5
    7476 +echo "$as_me:11262: checking if -lm needed for math functions" >&5
     7943+echo "$as_me:11274: checking if -lm needed for math functions" >&5
    74777944 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
    74787945 if test "${cf_cv_need_libm+set}" = set; then
    … …  
    74827949        cat >conftest.$ac_ext <<_ACEOF
    74837950-#line 11200 "configure"
    7484 +#line 11269 "configure"
     7951+#line 11281 "configure"
    74857952 #include "confdefs.h"
    74867953 
    74877954        #include <stdio.h>
    7488 @@ -11212,16 +11281,16 @@
     7955@@ -11212,16 +11293,16 @@
    74897956 }
    74907957 _ACEOF
    74917958 rm -f conftest.$ac_objext conftest$ac_exeext
    74927959-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
    7493 +if { (eval echo "$as_me:11284: \"$ac_link\"") >&5
     7960+if { (eval echo "$as_me:11296: \"$ac_link\"") >&5
    74947961   (eval $ac_link) 2>&5
    74957962   ac_status=$?
    74967963-  echo "$as_me:11218: \$? = $ac_status" >&5
    7497 +  echo "$as_me:11287: \$? = $ac_status" >&5
     7964+  echo "$as_me:11299: \$? = $ac_status" >&5
    74987965   (exit $ac_status); } &&
    74997966          { ac_try='test -s conftest$ac_exeext'
    75007967-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
    7501 +  { (eval echo "$as_me:11290: \"$ac_try\"") >&5
     7968+  { (eval echo "$as_me:11302: \"$ac_try\"") >&5
    75027969   (eval $ac_try) 2>&5
    75037970   ac_status=$?
    75047971-  echo "$as_me:11224: \$? = $ac_status" >&5
    7505 +  echo "$as_me:11293: \$? = $ac_status" >&5
     7972+  echo "$as_me:11305: \$? = $ac_status" >&5
    75067973   (exit $ac_status); }; }; then
    75077974   cf_cv_need_libm=no
    75087975 else
    7509 @@ -11231,7 +11300,7 @@
     7976@@ -11231,7 +11312,7 @@
    75107977 fi
    75117978 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    75127979 fi
    75137980-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
    7514 +echo "$as_me:11303: result: $cf_cv_need_libm" >&5
     7981+echo "$as_me:11315: result: $cf_cv_need_libm" >&5
    75157982 echo "${ECHO_T}$cf_cv_need_libm" >&6
    75167983 if test "$cf_cv_need_libm" = yes
    75177984 then
    7518 @@ -11239,13 +11308,13 @@
     7985@@ -11239,13 +11320,13 @@
    75197986 fi
    75207987 
    75217988 ###    Checks for header files.
    75227989-echo "$as_me:11242: checking for ANSI C header files" >&5
    7523 +echo "$as_me:11311: checking for ANSI C header files" >&5
     7990+echo "$as_me:11323: checking for ANSI C header files" >&5
    75247991 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    75257992 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    75287995   cat >conftest.$ac_ext <<_ACEOF
    75297996-#line 11248 "configure"
    7530 +#line 11317 "configure"
     7997+#line 11329 "configure"
    75317998 #include "confdefs.h"
    75327999 #include <stdlib.h>
    75338000 #include <stdarg.h>
    7534 @@ -11253,13 +11322,13 @@
     8001@@ -11253,13 +11334,13 @@
    75358002 #include <float.h>
    75368003 
    75378004 _ACEOF
    75388005-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
    7539 +if { (eval echo "$as_me:11325: \"$ac_cpp conftest.$ac_ext\"") >&5
     8006+if { (eval echo "$as_me:11337: \"$ac_cpp conftest.$ac_ext\"") >&5
    75408007   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    75418008   ac_status=$?
    … …  
    75448011   cat conftest.err >&5
    75458012-  echo "$as_me:11262: \$? = $ac_status" >&5
    7546 +  echo "$as_me:11331: \$? = $ac_status" >&5
     8013+  echo "$as_me:11343: \$? = $ac_status" >&5
    75478014   (exit $ac_status); } >/dev/null; then
    75488015   if test -s conftest.err; then
    75498016     ac_cpp_err=$ac_c_preproc_warn_flag
    7550 @@ -11281,7 +11350,7 @@
     8017@@ -11281,7 +11362,7 @@
    75518018 if test $ac_cv_header_stdc = yes; then
    75528019   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    75538020   cat >conftest.$ac_ext <<_ACEOF
    75548021-#line 11284 "configure"
    7555 +#line 11353 "configure"
     8022+#line 11365 "configure"
    75568023 #include "confdefs.h"
    75578024 #include <string.h>
    75588025 
    7559 @@ -11299,7 +11368,7 @@
     8026@@ -11299,7 +11380,7 @@
    75608027 if test $ac_cv_header_stdc = yes; then
    75618028   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    75628029   cat >conftest.$ac_ext <<_ACEOF
    75638030-#line 11302 "configure"
    7564 +#line 11371 "configure"
     8031+#line 11383 "configure"
    75658032 #include "confdefs.h"
    75668033 #include <stdlib.h>
    75678034 
    7568 @@ -11320,7 +11389,7 @@
     8035@@ -11320,7 +11401,7 @@
    75698036   :
    75708037 else
    75718038   cat >conftest.$ac_ext <<_ACEOF
    75728039-#line 11323 "configure"
    7573 +#line 11392 "configure"
     8040+#line 11404 "configure"
    75748041 #include "confdefs.h"
    75758042 #include <ctype.h>
    75768043 #if ((' ' & 0x0FF) == 0x020)
    7577 @@ -11346,15 +11415,15 @@
     8044@@ -11346,15 +11427,15 @@
    75788045 }
    75798046 _ACEOF
    75808047 rm -f conftest$ac_exeext
    75818048-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
    7582 +if { (eval echo "$as_me:11418: \"$ac_link\"") >&5
     8049+if { (eval echo "$as_me:11430: \"$ac_link\"") >&5
    75838050   (eval $ac_link) 2>&5
    75848051   ac_status=$?
    75858052-  echo "$as_me:11352: \$? = $ac_status" >&5
    7586 +  echo "$as_me:11421: \$? = $ac_status" >&5
     8053+  echo "$as_me:11433: \$? = $ac_status" >&5
    75878054   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    75888055-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
    7589 +  { (eval echo "$as_me:11423: \"$ac_try\"") >&5
     8056+  { (eval echo "$as_me:11435: \"$ac_try\"") >&5
    75908057   (eval $ac_try) 2>&5
    75918058   ac_status=$?
    75928059-  echo "$as_me:11357: \$? = $ac_status" >&5
    7593 +  echo "$as_me:11426: \$? = $ac_status" >&5
     8060+  echo "$as_me:11438: \$? = $ac_status" >&5
    75948061   (exit $ac_status); }; }; then
    75958062   :
    75968063 else
    7597 @@ -11367,7 +11436,7 @@
     8064@@ -11367,7 +11448,7 @@
    75988065 fi
    75998066 fi
    76008067 fi
    76018068-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
    7602 +echo "$as_me:11439: result: $ac_cv_header_stdc" >&5
     8069+echo "$as_me:11451: result: $ac_cv_header_stdc" >&5
    76038070 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    76048071 if test $ac_cv_header_stdc = yes; then
    76058072 
    7606 @@ -11380,13 +11449,13 @@
     8073@@ -11380,13 +11461,13 @@
    76078074 ac_header_dirent=no
    76088075 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    76098076   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
    76108077-echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
    7611 +echo "$as_me:11452: checking for $ac_hdr that defines DIR" >&5
     8078+echo "$as_me:11464: checking for $ac_hdr that defines DIR" >&5
    76128079 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
    76138080 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    76168083   cat >conftest.$ac_ext <<_ACEOF
    76178084-#line 11389 "configure"
    7618 +#line 11458 "configure"
     8085+#line 11470 "configure"
    76198086 #include "confdefs.h"
    76208087 #include <sys/types.h>
    76218088 #include <$ac_hdr>
    7622 @@ -11401,16 +11470,16 @@
     8089@@ -11401,16 +11482,16 @@
    76238090 }
    76248091 _ACEOF
    76258092 rm -f conftest.$ac_objext
    76268093-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
    7627 +if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
     8094+if { (eval echo "$as_me:11485: \"$ac_compile\"") >&5
    76288095   (eval $ac_compile) 2>&5
    76298096   ac_status=$?
    76308097-  echo "$as_me:11407: \$? = $ac_status" >&5
    7631 +  echo "$as_me:11476: \$? = $ac_status" >&5
     8098+  echo "$as_me:11488: \$? = $ac_status" >&5
    76328099   (exit $ac_status); } &&
    76338100          { ac_try='test -s conftest.$ac_objext'
    76348101-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
    7635 +  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
     8102+  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
    76368103   (eval $ac_try) 2>&5
    76378104   ac_status=$?
    76388105-  echo "$as_me:11413: \$? = $ac_status" >&5
    7639 +  echo "$as_me:11482: \$? = $ac_status" >&5
     8106+  echo "$as_me:11494: \$? = $ac_status" >&5
    76408107   (exit $ac_status); }; }; then
    76418108   eval "$as_ac_Header=yes"
    76428109 else
    7643 @@ -11420,7 +11489,7 @@
     8110@@ -11420,7 +11501,7 @@
    76448111 fi
    76458112 rm -f conftest.$ac_objext conftest.$ac_ext
    76468113 fi
    76478114-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7648 +echo "$as_me:11492: result: `eval echo '${'$as_ac_Header'}'`" >&5
     8115+echo "$as_me:11504: result: `eval echo '${'$as_ac_Header'}'`" >&5
    76498116 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    76508117 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    76518118   cat >>confdefs.h <<EOF
    7652 @@ -11433,7 +11502,7 @@
     8119@@ -11433,7 +11514,7 @@
    76538120 done
    76548121 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
    76558122 if test $ac_header_dirent = dirent.h; then
    76568123-  echo "$as_me:11436: checking for opendir in -ldir" >&5
    7657 +  echo "$as_me:11505: checking for opendir in -ldir" >&5
     8124+  echo "$as_me:11517: checking for opendir in -ldir" >&5
    76588125 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
    76598126 if test "${ac_cv_lib_dir_opendir+set}" = set; then
    76608127   echo $ECHO_N "(cached) $ECHO_C" >&6
    7661 @@ -11441,7 +11510,7 @@
     8128@@ -11441,7 +11522,7 @@
    76628129   ac_check_lib_save_LIBS=$LIBS
    76638130 LIBS="-ldir  $LIBS"
    76648131 cat >conftest.$ac_ext <<_ACEOF
    76658132-#line 11444 "configure"
    7666 +#line 11513 "configure"
     8133+#line 11525 "configure"
    76678134 #include "confdefs.h"
    76688135 
    76698136 /* Override any gcc2 internal prototype to avoid an error.  */
    7670 @@ -11460,16 +11529,16 @@
     8137@@ -11460,16 +11541,16 @@
    76718138 }
    76728139 _ACEOF
    76738140 rm -f conftest.$ac_objext conftest$ac_exeext
    76748141-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
    7675 +if { (eval echo "$as_me:11532: \"$ac_link\"") >&5
     8142+if { (eval echo "$as_me:11544: \"$ac_link\"") >&5
    76768143   (eval $ac_link) 2>&5
    76778144   ac_status=$?
    76788145-  echo "$as_me:11466: \$? = $ac_status" >&5
    7679 +  echo "$as_me:11535: \$? = $ac_status" >&5
     8146+  echo "$as_me:11547: \$? = $ac_status" >&5
    76808147   (exit $ac_status); } &&
    76818148          { ac_try='test -s conftest$ac_exeext'
    76828149-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
    7683 +  { (eval echo "$as_me:11538: \"$ac_try\"") >&5
     8150+  { (eval echo "$as_me:11550: \"$ac_try\"") >&5
    76848151   (eval $ac_try) 2>&5
    76858152   ac_status=$?
    76868153-  echo "$as_me:11472: \$? = $ac_status" >&5
    7687 +  echo "$as_me:11541: \$? = $ac_status" >&5
     8154+  echo "$as_me:11553: \$? = $ac_status" >&5
    76888155   (exit $ac_status); }; }; then
    76898156   ac_cv_lib_dir_opendir=yes
    76908157 else
    7691 @@ -11480,14 +11549,14 @@
     8158@@ -11480,14 +11561,14 @@
    76928159 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    76938160 LIBS=$ac_check_lib_save_LIBS
    76948161 fi
    76958162-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
    7696 +echo "$as_me:11552: result: $ac_cv_lib_dir_opendir" >&5
     8163+echo "$as_me:11564: result: $ac_cv_lib_dir_opendir" >&5
    76978164 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
    76988165 if test $ac_cv_lib_dir_opendir = yes; then
    … …  
    77028169 else
    77038170-  echo "$as_me:11490: checking for opendir in -lx" >&5
    7704 +  echo "$as_me:11559: checking for opendir in -lx" >&5
     8171+  echo "$as_me:11571: checking for opendir in -lx" >&5
    77058172 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
    77068173 if test "${ac_cv_lib_x_opendir+set}" = set; then
    77078174   echo $ECHO_N "(cached) $ECHO_C" >&6
    7708 @@ -11495,7 +11564,7 @@
     8175@@ -11495,7 +11576,7 @@
    77098176   ac_check_lib_save_LIBS=$LIBS
    77108177 LIBS="-lx  $LIBS"
    77118178 cat >conftest.$ac_ext <<_ACEOF
    77128179-#line 11498 "configure"
    7713 +#line 11567 "configure"
     8180+#line 11579 "configure"
    77148181 #include "confdefs.h"
    77158182 
    77168183 /* Override any gcc2 internal prototype to avoid an error.  */
    7717 @@ -11514,16 +11583,16 @@
     8184@@ -11514,16 +11595,16 @@
    77188185 }
    77198186 _ACEOF
    77208187 rm -f conftest.$ac_objext conftest$ac_exeext
    77218188-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
    7722 +if { (eval echo "$as_me:11586: \"$ac_link\"") >&5
     8189+if { (eval echo "$as_me:11598: \"$ac_link\"") >&5
    77238190   (eval $ac_link) 2>&5
    77248191   ac_status=$?
    77258192-  echo "$as_me:11520: \$? = $ac_status" >&5
    7726 +  echo "$as_me:11589: \$? = $ac_status" >&5
     8193+  echo "$as_me:11601: \$? = $ac_status" >&5
    77278194   (exit $ac_status); } &&
    77288195          { ac_try='test -s conftest$ac_exeext'
    77298196-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
    7730 +  { (eval echo "$as_me:11592: \"$ac_try\"") >&5
     8197+  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
    77318198   (eval $ac_try) 2>&5
    77328199   ac_status=$?
    77338200-  echo "$as_me:11526: \$? = $ac_status" >&5
    7734 +  echo "$as_me:11595: \$? = $ac_status" >&5
     8201+  echo "$as_me:11607: \$? = $ac_status" >&5
    77358202   (exit $ac_status); }; }; then
    77368203   ac_cv_lib_x_opendir=yes
    77378204 else
    7738 @@ -11534,7 +11603,7 @@
     8205@@ -11534,7 +11615,7 @@
    77398206 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    77408207 LIBS=$ac_check_lib_save_LIBS
    77418208 fi
    77428209-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
    7743 +echo "$as_me:11606: result: $ac_cv_lib_x_opendir" >&5
     8210+echo "$as_me:11618: result: $ac_cv_lib_x_opendir" >&5
    77448211 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
    77458212 if test $ac_cv_lib_x_opendir = yes; then
    77468213   LIBS="$LIBS -lx"
    7747 @@ -11542,13 +11611,13 @@
     8214@@ -11542,13 +11623,13 @@
    77488215 
    77498216 fi
    77508217 
    77518218-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
    7752 +echo "$as_me:11614: checking whether time.h and sys/time.h may both be included" >&5
     8219+echo "$as_me:11626: checking whether time.h and sys/time.h may both be included" >&5
    77538220 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
    77548221 if test "${ac_cv_header_time+set}" = set; then
    … …  
    77578224   cat >conftest.$ac_ext <<_ACEOF
    77588225-#line 11551 "configure"
    7759 +#line 11620 "configure"
     8226+#line 11632 "configure"
    77608227 #include "confdefs.h"
    77618228 #include <sys/types.h>
    77628229 #include <sys/time.h>
    7763 @@ -11564,16 +11633,16 @@
     8230@@ -11564,16 +11645,16 @@
    77648231 }
    77658232 _ACEOF
    77668233 rm -f conftest.$ac_objext
    77678234-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
    7768 +if { (eval echo "$as_me:11636: \"$ac_compile\"") >&5
     8235+if { (eval echo "$as_me:11648: \"$ac_compile\"") >&5
    77698236   (eval $ac_compile) 2>&5
    77708237   ac_status=$?
    77718238-  echo "$as_me:11570: \$? = $ac_status" >&5
    7772 +  echo "$as_me:11639: \$? = $ac_status" >&5
     8239+  echo "$as_me:11651: \$? = $ac_status" >&5
    77738240   (exit $ac_status); } &&
    77748241          { ac_try='test -s conftest.$ac_objext'
    77758242-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
    7776 +  { (eval echo "$as_me:11642: \"$ac_try\"") >&5
     8243+  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
    77778244   (eval $ac_try) 2>&5
    77788245   ac_status=$?
    77798246-  echo "$as_me:11576: \$? = $ac_status" >&5
    7780 +  echo "$as_me:11645: \$? = $ac_status" >&5
     8247+  echo "$as_me:11657: \$? = $ac_status" >&5
    77818248   (exit $ac_status); }; }; then
    77828249   ac_cv_header_time=yes
    77838250 else
    7784 @@ -11583,7 +11652,7 @@
     8251@@ -11583,7 +11664,7 @@
    77858252 fi
    77868253 rm -f conftest.$ac_objext conftest.$ac_ext
    77878254 fi
    77888255-echo "$as_me:11586: result: $ac_cv_header_time" >&5
    7789 +echo "$as_me:11655: result: $ac_cv_header_time" >&5
     8256+echo "$as_me:11667: result: $ac_cv_header_time" >&5
    77908257 echo "${ECHO_T}$ac_cv_header_time" >&6
    77918258 if test $ac_cv_header_time = yes; then
    77928259 
    7793 @@ -11593,14 +11662,14 @@
     8260@@ -11593,14 +11674,14 @@
    77948261 
    77958262 fi
    77968263 
    77978264-echo "$as_me:11596: checking for regular-expression headers" >&5
    7798 +echo "$as_me:11665: checking for regular-expression headers" >&5
     8265+echo "$as_me:11677: checking for regular-expression headers" >&5
    77998266 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
    78008267 if test "${cf_cv_regex+set}" = set; then
    … …  
    78048271 cat >conftest.$ac_ext <<_ACEOF
    78058272-#line 11603 "configure"
    7806 +#line 11672 "configure"
     8273+#line 11684 "configure"
    78078274 #include "confdefs.h"
    78088275 #include <sys/types.h>
    78098276 #include <regex.h>
    7810 @@ -11618,16 +11687,16 @@
     8277@@ -11618,16 +11699,16 @@
    78118278 }
    78128279 _ACEOF
    78138280 rm -f conftest.$ac_objext conftest$ac_exeext
    78148281-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
    7815 +if { (eval echo "$as_me:11690: \"$ac_link\"") >&5
     8282+if { (eval echo "$as_me:11702: \"$ac_link\"") >&5
    78168283   (eval $ac_link) 2>&5
    78178284   ac_status=$?
    78188285-  echo "$as_me:11624: \$? = $ac_status" >&5
    7819 +  echo "$as_me:11693: \$? = $ac_status" >&5
     8286+  echo "$as_me:11705: \$? = $ac_status" >&5
    78208287   (exit $ac_status); } &&
    78218288          { ac_try='test -s conftest$ac_exeext'
    78228289-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
    7823 +  { (eval echo "$as_me:11696: \"$ac_try\"") >&5
     8290+  { (eval echo "$as_me:11708: \"$ac_try\"") >&5
    78248291   (eval $ac_try) 2>&5
    78258292   ac_status=$?
    78268293-  echo "$as_me:11630: \$? = $ac_status" >&5
    7827 +  echo "$as_me:11699: \$? = $ac_status" >&5
     8294+  echo "$as_me:11711: \$? = $ac_status" >&5
    78288295   (exit $ac_status); }; }; then
    78298296   cf_cv_regex="regex.h"
    78308297 else
    7831 @@ -11635,7 +11704,7 @@
     8298@@ -11635,7 +11716,7 @@
    78328299 cat conftest.$ac_ext >&5
    78338300 
    78348301        cat >conftest.$ac_ext <<_ACEOF
    78358302-#line 11638 "configure"
    7836 +#line 11707 "configure"
     8303+#line 11719 "configure"
    78378304 #include "confdefs.h"
    78388305 #include <regexp.h>
    78398306 int
    7840 @@ -11650,16 +11719,16 @@
     8307@@ -11650,16 +11731,16 @@
    78418308 }
    78428309 _ACEOF
    78438310 rm -f conftest.$ac_objext conftest$ac_exeext
    78448311-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
    7845 +if { (eval echo "$as_me:11722: \"$ac_link\"") >&5
     8312+if { (eval echo "$as_me:11734: \"$ac_link\"") >&5
    78468313   (eval $ac_link) 2>&5
    78478314   ac_status=$?
    78488315-  echo "$as_me:11656: \$? = $ac_status" >&5
    7849 +  echo "$as_me:11725: \$? = $ac_status" >&5
     8316+  echo "$as_me:11737: \$? = $ac_status" >&5
    78508317   (exit $ac_status); } &&
    78518318          { ac_try='test -s conftest$ac_exeext'
    78528319-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
    7853 +  { (eval echo "$as_me:11728: \"$ac_try\"") >&5
     8320+  { (eval echo "$as_me:11740: \"$ac_try\"") >&5
    78548321   (eval $ac_try) 2>&5
    78558322   ac_status=$?
    78568323-  echo "$as_me:11662: \$? = $ac_status" >&5
    7857 +  echo "$as_me:11731: \$? = $ac_status" >&5
     8324+  echo "$as_me:11743: \$? = $ac_status" >&5
    78588325   (exit $ac_status); }; }; then
    78598326   cf_cv_regex="regexp.h"
    78608327 else
    7861 @@ -11669,7 +11738,7 @@
     8328@@ -11669,7 +11750,7 @@
    78628329                cf_save_LIBS="$LIBS"
    78638330                LIBS="-lgen $LIBS"
    78648331                cat >conftest.$ac_ext <<_ACEOF
    78658332-#line 11672 "configure"
    7866 +#line 11741 "configure"
     8333+#line 11753 "configure"
    78678334 #include "confdefs.h"
    78688335 #include <regexpr.h>
    78698336 int
    7870 @@ -11684,16 +11753,16 @@
     8337@@ -11684,16 +11765,16 @@
    78718338 }
    78728339 _ACEOF
    78738340 rm -f conftest.$ac_objext conftest$ac_exeext
    78748341-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
    7875 +if { (eval echo "$as_me:11756: \"$ac_link\"") >&5
     8342+if { (eval echo "$as_me:11768: \"$ac_link\"") >&5
    78768343   (eval $ac_link) 2>&5
    78778344   ac_status=$?
    78788345-  echo "$as_me:11690: \$? = $ac_status" >&5
    7879 +  echo "$as_me:11759: \$? = $ac_status" >&5
     8346+  echo "$as_me:11771: \$? = $ac_status" >&5
    78808347   (exit $ac_status); } &&
    78818348          { ac_try='test -s conftest$ac_exeext'
    78828349-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
    7883 +  { (eval echo "$as_me:11762: \"$ac_try\"") >&5
     8350+  { (eval echo "$as_me:11774: \"$ac_try\"") >&5
    78848351   (eval $ac_try) 2>&5
    78858352   ac_status=$?
    78868353-  echo "$as_me:11696: \$? = $ac_status" >&5
    7887 +  echo "$as_me:11765: \$? = $ac_status" >&5
     8354+  echo "$as_me:11777: \$? = $ac_status" >&5
    78888355   (exit $ac_status); }; }; then
    78898356   cf_cv_regex="regexpr.h"
    78908357 else
    7891 @@ -11709,7 +11778,7 @@
     8358@@ -11709,7 +11790,7 @@
    78928359 
    78938360 fi
    78948361 
    78958362-echo "$as_me:11712: result: $cf_cv_regex" >&5
    7896 +echo "$as_me:11781: result: $cf_cv_regex" >&5
     8363+echo "$as_me:11793: result: $cf_cv_regex" >&5
    78978364 echo "${ECHO_T}$cf_cv_regex" >&6
    78988365 case $cf_cv_regex in
    78998366        regex.h)   cat >>confdefs.h <<\EOF
    7900 @@ -11745,23 +11814,23 @@
     8367@@ -11745,23 +11826,23 @@
    79018368 
    79028369 do
    79038370 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    79048371-echo "$as_me:11748: checking for $ac_header" >&5
    7905 +echo "$as_me:11817: checking for $ac_header" >&5
     8372+echo "$as_me:11829: checking for $ac_header" >&5
    79068373 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    79078374 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    79108377   cat >conftest.$ac_ext <<_ACEOF
    79118378-#line 11754 "configure"
    7912 +#line 11823 "configure"
     8379+#line 11835 "configure"
    79138380 #include "confdefs.h"
    79148381 #include <$ac_header>
    79158382 _ACEOF
    79168383-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
    7917 +if { (eval echo "$as_me:11827: \"$ac_cpp conftest.$ac_ext\"") >&5
     8384+if { (eval echo "$as_me:11839: \"$ac_cpp conftest.$ac_ext\"") >&5
    79188385   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    79198386   ac_status=$?
    … …  
    79228389   cat conftest.err >&5
    79238390-  echo "$as_me:11764: \$? = $ac_status" >&5
    7924 +  echo "$as_me:11833: \$? = $ac_status" >&5
     8391+  echo "$as_me:11845: \$? = $ac_status" >&5
    79258392   (exit $ac_status); } >/dev/null; then
    79268393   if test -s conftest.err; then
    79278394     ac_cpp_err=$ac_c_preproc_warn_flag
    7928 @@ -11780,7 +11849,7 @@
     8395@@ -11780,7 +11861,7 @@
    79298396 fi
    79308397 rm -f conftest.err conftest.$ac_ext
    79318398 fi
    79328399-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7933 +echo "$as_me:11852: result: `eval echo '${'$as_ac_Header'}'`" >&5
     8400+echo "$as_me:11864: result: `eval echo '${'$as_ac_Header'}'`" >&5
    79348401 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    79358402 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    79368403   cat >>confdefs.h <<EOF
    7937 @@ -11794,7 +11863,7 @@
     8404@@ -11794,7 +11875,7 @@
    79388405 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
    79398406 if test "$ISC" = yes ; then
    79408407 
    79418408-echo "$as_me:11797: checking for main in -lcposix" >&5
    7942 +echo "$as_me:11866: checking for main in -lcposix" >&5
     8409+echo "$as_me:11878: checking for main in -lcposix" >&5
    79438410 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
    79448411 if test "${ac_cv_lib_cposix_main+set}" = set; then
    79458412   echo $ECHO_N "(cached) $ECHO_C" >&6
    7946 @@ -11802,7 +11871,7 @@
     8413@@ -11802,7 +11883,7 @@
    79478414   ac_check_lib_save_LIBS=$LIBS
    79488415 LIBS="-lcposix  $LIBS"
    79498416 cat >conftest.$ac_ext <<_ACEOF
    79508417-#line 11805 "configure"
    7951 +#line 11874 "configure"
     8418+#line 11886 "configure"
    79528419 #include "confdefs.h"
    79538420 
    79548421 int
    7955 @@ -11814,16 +11883,16 @@
     8422@@ -11814,16 +11895,16 @@
    79568423 }
    79578424 _ACEOF
    79588425 rm -f conftest.$ac_objext conftest$ac_exeext
    79598426-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
    7960 +if { (eval echo "$as_me:11886: \"$ac_link\"") >&5
     8427+if { (eval echo "$as_me:11898: \"$ac_link\"") >&5
    79618428   (eval $ac_link) 2>&5
    79628429   ac_status=$?
    79638430-  echo "$as_me:11820: \$? = $ac_status" >&5
    7964 +  echo "$as_me:11889: \$? = $ac_status" >&5
     8431+  echo "$as_me:11901: \$? = $ac_status" >&5
    79658432   (exit $ac_status); } &&
    79668433          { ac_try='test -s conftest$ac_exeext'
    79678434-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
    7968 +  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
     8435+  { (eval echo "$as_me:11904: \"$ac_try\"") >&5
    79698436   (eval $ac_try) 2>&5
    79708437   ac_status=$?
    79718438-  echo "$as_me:11826: \$? = $ac_status" >&5
    7972 +  echo "$as_me:11895: \$? = $ac_status" >&5
     8439+  echo "$as_me:11907: \$? = $ac_status" >&5
    79738440   (exit $ac_status); }; }; then
    79748441   ac_cv_lib_cposix_main=yes
    79758442 else
    7976 @@ -11834,7 +11903,7 @@
     8443@@ -11834,7 +11915,7 @@
    79778444 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    79788445 LIBS=$ac_check_lib_save_LIBS
    79798446 fi
    79808447-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
    7981 +echo "$as_me:11906: result: $ac_cv_lib_cposix_main" >&5
     8448+echo "$as_me:11918: result: $ac_cv_lib_cposix_main" >&5
    79828449 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
    79838450 if test $ac_cv_lib_cposix_main = yes; then
    79848451   cat >>confdefs.h <<EOF
    7985 @@ -11845,7 +11914,7 @@
     8452@@ -11845,7 +11926,7 @@
    79868453 
    79878454 fi
    79888455 
    79898456-       echo "$as_me:11848: checking for bzero in -linet" >&5
    7990 +       echo "$as_me:11917: checking for bzero in -linet" >&5
     8457+       echo "$as_me:11929: checking for bzero in -linet" >&5
    79918458 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
    79928459 if test "${ac_cv_lib_inet_bzero+set}" = set; then
    79938460   echo $ECHO_N "(cached) $ECHO_C" >&6
    7994 @@ -11853,7 +11922,7 @@
     8461@@ -11853,7 +11934,7 @@
    79958462   ac_check_lib_save_LIBS=$LIBS
    79968463 LIBS="-linet  $LIBS"
    79978464 cat >conftest.$ac_ext <<_ACEOF
    79988465-#line 11856 "configure"
    7999 +#line 11925 "configure"
     8466+#line 11937 "configure"
    80008467 #include "confdefs.h"
    80018468 
    80028469 /* Override any gcc2 internal prototype to avoid an error.  */
    8003 @@ -11872,16 +11941,16 @@
     8470@@ -11872,16 +11953,16 @@
    80048471 }
    80058472 _ACEOF
    80068473 rm -f conftest.$ac_objext conftest$ac_exeext
    80078474-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
    8008 +if { (eval echo "$as_me:11944: \"$ac_link\"") >&5
     8475+if { (eval echo "$as_me:11956: \"$ac_link\"") >&5
    80098476   (eval $ac_link) 2>&5
    80108477   ac_status=$?
    80118478-  echo "$as_me:11878: \$? = $ac_status" >&5
    8012 +  echo "$as_me:11947: \$? = $ac_status" >&5
     8479+  echo "$as_me:11959: \$? = $ac_status" >&5
    80138480   (exit $ac_status); } &&
    80148481          { ac_try='test -s conftest$ac_exeext'
    80158482-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
    8016 +  { (eval echo "$as_me:11950: \"$ac_try\"") >&5
     8483+  { (eval echo "$as_me:11962: \"$ac_try\"") >&5
    80178484   (eval $ac_try) 2>&5
    80188485   ac_status=$?
    80198486-  echo "$as_me:11884: \$? = $ac_status" >&5
    8020 +  echo "$as_me:11953: \$? = $ac_status" >&5
     8487+  echo "$as_me:11965: \$? = $ac_status" >&5
    80218488   (exit $ac_status); }; }; then
    80228489   ac_cv_lib_inet_bzero=yes
    80238490 else
    8024 @@ -11892,21 +11961,21 @@
     8491@@ -11892,21 +11973,21 @@
    80258492 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    80268493 LIBS=$ac_check_lib_save_LIBS
    80278494 fi
    80288495-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
    8029 +echo "$as_me:11964: result: $ac_cv_lib_inet_bzero" >&5
     8496+echo "$as_me:11976: result: $ac_cv_lib_inet_bzero" >&5
    80308497 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
    80318498 if test $ac_cv_lib_inet_bzero = yes; then
    … …  
    80358502 
    80368503-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
    8037 +echo "$as_me:11971: checking if sys/time.h works with sys/select.h" >&5
     8504+echo "$as_me:11983: checking if sys/time.h works with sys/select.h" >&5
    80388505 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
    80398506 if test "${cf_cv_sys_time_select+set}" = set; then
    … …  
    80438510 cat >conftest.$ac_ext <<_ACEOF
    80448511-#line 11909 "configure"
    8045 +#line 11978 "configure"
     8512+#line 11990 "configure"
    80468513 #include "confdefs.h"
    80478514 
    80488515 #include <sys/types.h>
    8049 @@ -11926,16 +11995,16 @@
     8516@@ -11926,16 +12007,16 @@
    80508517 }
    80518518 _ACEOF
    80528519 rm -f conftest.$ac_objext
    80538520-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
    8054 +if { (eval echo "$as_me:11998: \"$ac_compile\"") >&5
     8521+if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
    80558522   (eval $ac_compile) 2>&5
    80568523   ac_status=$?
    80578524-  echo "$as_me:11932: \$? = $ac_status" >&5
    8058 +  echo "$as_me:12001: \$? = $ac_status" >&5
     8525+  echo "$as_me:12013: \$? = $ac_status" >&5
    80598526   (exit $ac_status); } &&
    80608527          { ac_try='test -s conftest.$ac_objext'
    80618528-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
    8062 +  { (eval echo "$as_me:12004: \"$ac_try\"") >&5
     8529+  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
    80638530   (eval $ac_try) 2>&5
    80648531   ac_status=$?
    80658532-  echo "$as_me:11938: \$? = $ac_status" >&5
    8066 +  echo "$as_me:12007: \$? = $ac_status" >&5
     8533+  echo "$as_me:12019: \$? = $ac_status" >&5
    80678534   (exit $ac_status); }; }; then
    80688535   cf_cv_sys_time_select=yes
    80698536 else
    8070 @@ -11947,7 +12016,7 @@
     8537@@ -11947,7 +12028,7 @@
    80718538 
    80728539 fi
    80738540 
    80748541-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
    8075 +echo "$as_me:12019: result: $cf_cv_sys_time_select" >&5
     8542+echo "$as_me:12031: result: $cf_cv_sys_time_select" >&5
    80768543 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
    80778544 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
    80788545 #define HAVE_SYS_TIME_SELECT 1
    8079 @@ -11961,7 +12030,7 @@
     8546@@ -11961,7 +12042,7 @@
    80808547 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    80818548 ac_main_return=return
    80828549 
    80838550-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
    8084 +echo "$as_me:12033: checking for $CC option to accept ANSI C" >&5
     8551+echo "$as_me:12045: checking for $CC option to accept ANSI C" >&5
    80858552 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
    80868553 if test "${ac_cv_prog_cc_stdc+set}" = set; then
    80878554   echo $ECHO_N "(cached) $ECHO_C" >&6
    8088 @@ -11969,7 +12038,7 @@
     8555@@ -11969,7 +12050,7 @@
    80898556   ac_cv_prog_cc_stdc=no
    80908557 ac_save_CC=$CC
    80918558 cat >conftest.$ac_ext <<_ACEOF
    80928559-#line 11972 "configure"
    8093 +#line 12041 "configure"
     8560+#line 12053 "configure"
    80948561 #include "confdefs.h"
    80958562 #include <stdarg.h>
    80968563 #include <stdio.h>
    8097 @@ -12018,16 +12087,16 @@
     8564@@ -12018,16 +12099,16 @@
    80988565 do
    80998566   CC="$ac_save_CC $ac_arg"
    81008567   rm -f conftest.$ac_objext
    81018568-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
    8102 +if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
     8569+if { (eval echo "$as_me:12102: \"$ac_compile\"") >&5
    81038570   (eval $ac_compile) 2>&5
    81048571   ac_status=$?
    81058572-  echo "$as_me:12024: \$? = $ac_status" >&5
    8106 +  echo "$as_me:12093: \$? = $ac_status" >&5
     8573+  echo "$as_me:12105: \$? = $ac_status" >&5
    81078574   (exit $ac_status); } &&
    81088575          { ac_try='test -s conftest.$ac_objext'
    81098576-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
    8110 +  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
     8577+  { (eval echo "$as_me:12108: \"$ac_try\"") >&5
    81118578   (eval $ac_try) 2>&5
    81128579   ac_status=$?
    81138580-  echo "$as_me:12030: \$? = $ac_status" >&5
    8114 +  echo "$as_me:12099: \$? = $ac_status" >&5
     8581+  echo "$as_me:12111: \$? = $ac_status" >&5
    81158582   (exit $ac_status); }; }; then
    81168583   ac_cv_prog_cc_stdc=$ac_arg
    81178584 break
    8118 @@ -12044,21 +12113,21 @@
     8585@@ -12044,21 +12125,21 @@
    81198586 
    81208587 case "x$ac_cv_prog_cc_stdc" in
    81218588   x|xno)
    81228589-    echo "$as_me:12047: result: none needed" >&5
    8123 +    echo "$as_me:12116: result: none needed" >&5
     8590+    echo "$as_me:12128: result: none needed" >&5
    81248591 echo "${ECHO_T}none needed" >&6 ;;
    81258592   *)
    81268593-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
    8127 +    echo "$as_me:12119: result: $ac_cv_prog_cc_stdc" >&5
     8594+    echo "$as_me:12131: result: $ac_cv_prog_cc_stdc" >&5
    81288595 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    81298596     CC="$CC $ac_cv_prog_cc_stdc" ;;
    … …  
    81318598 
    81328599-echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
    8133 +echo "$as_me:12124: checking for an ANSI C-conforming const" >&5
     8600+echo "$as_me:12136: checking for an ANSI C-conforming const" >&5
    81348601 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
    81358602 if test "${ac_cv_c_const+set}" = set; then
    … …  
    81388605   cat >conftest.$ac_ext <<_ACEOF
    81398606-#line 12061 "configure"
    8140 +#line 12130 "configure"
     8607+#line 12142 "configure"
    81418608 #include "confdefs.h"
    81428609 
    81438610 int
    8144 @@ -12116,16 +12185,16 @@
     8611@@ -12116,16 +12197,16 @@
    81458612 }
    81468613 _ACEOF
    81478614 rm -f conftest.$ac_objext
    81488615-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
    8149 +if { (eval echo "$as_me:12188: \"$ac_compile\"") >&5
     8616+if { (eval echo "$as_me:12200: \"$ac_compile\"") >&5
    81508617   (eval $ac_compile) 2>&5
    81518618   ac_status=$?
    81528619-  echo "$as_me:12122: \$? = $ac_status" >&5
    8153 +  echo "$as_me:12191: \$? = $ac_status" >&5
     8620+  echo "$as_me:12203: \$? = $ac_status" >&5
    81548621   (exit $ac_status); } &&
    81558622          { ac_try='test -s conftest.$ac_objext'
    81568623-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
    8157 +  { (eval echo "$as_me:12194: \"$ac_try\"") >&5
     8624+  { (eval echo "$as_me:12206: \"$ac_try\"") >&5
    81588625   (eval $ac_try) 2>&5
    81598626   ac_status=$?
    81608627-  echo "$as_me:12128: \$? = $ac_status" >&5
    8161 +  echo "$as_me:12197: \$? = $ac_status" >&5
     8628+  echo "$as_me:12209: \$? = $ac_status" >&5
    81628629   (exit $ac_status); }; }; then
    81638630   ac_cv_c_const=yes
    81648631 else
    8165 @@ -12135,7 +12204,7 @@
     8632@@ -12135,7 +12216,7 @@
    81668633 fi
    81678634 rm -f conftest.$ac_objext conftest.$ac_ext
    81688635 fi
    81698636-echo "$as_me:12138: result: $ac_cv_c_const" >&5
    8170 +echo "$as_me:12207: result: $ac_cv_c_const" >&5
     8637+echo "$as_me:12219: result: $ac_cv_c_const" >&5
    81718638 echo "${ECHO_T}$ac_cv_c_const" >&6
    81728639 if test $ac_cv_c_const = no; then
    81738640 
    8174 @@ -12145,7 +12214,7 @@
     8641@@ -12145,7 +12226,7 @@
    81758642 
    81768643 fi
    81778644 
    81788645-echo "$as_me:12148: checking for inline" >&5
    8179 +echo "$as_me:12217: checking for inline" >&5
     8646+echo "$as_me:12229: checking for inline" >&5
    81808647 echo $ECHO_N "checking for inline... $ECHO_C" >&6
    81818648 if test "${ac_cv_c_inline+set}" = set; then
    81828649   echo $ECHO_N "(cached) $ECHO_C" >&6
    8183 @@ -12153,7 +12222,7 @@
     8650@@ -12153,7 +12234,7 @@
    81848651   ac_cv_c_inline=no
    81858652 for ac_kw in inline __inline__ __inline; do
    81868653   cat >conftest.$ac_ext <<_ACEOF
    81878654-#line 12156 "configure"
    8188 +#line 12225 "configure"
     8655+#line 12237 "configure"
    81898656 #include "confdefs.h"
    81908657 #ifndef __cplusplus
    81918658 static $ac_kw int static_foo () {return 0; }
    8192 @@ -12162,16 +12231,16 @@
     8659@@ -12162,16 +12243,16 @@
    81938660 
    81948661 _ACEOF
    81958662 rm -f conftest.$ac_objext
    81968663-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
    8197 +if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5
     8664+if { (eval echo "$as_me:12246: \"$ac_compile\"") >&5
    81988665   (eval $ac_compile) 2>&5
    81998666   ac_status=$?
    82008667-  echo "$as_me:12168: \$? = $ac_status" >&5
    8201 +  echo "$as_me:12237: \$? = $ac_status" >&5
     8668+  echo "$as_me:12249: \$? = $ac_status" >&5
    82028669   (exit $ac_status); } &&
    82038670          { ac_try='test -s conftest.$ac_objext'
    82048671-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
    8205 +  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
     8672+  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
    82068673   (eval $ac_try) 2>&5
    82078674   ac_status=$?
    82088675-  echo "$as_me:12174: \$? = $ac_status" >&5
    8209 +  echo "$as_me:12243: \$? = $ac_status" >&5
     8676+  echo "$as_me:12255: \$? = $ac_status" >&5
    82108677   (exit $ac_status); }; }; then
    82118678   ac_cv_c_inline=$ac_kw; break
    82128679 else
    8213 @@ -12182,7 +12251,7 @@
     8680@@ -12182,7 +12263,7 @@
    82148681 done
    82158682 
    82168683 fi
    82178684-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
    8218 +echo "$as_me:12254: result: $ac_cv_c_inline" >&5
     8685+echo "$as_me:12266: result: $ac_cv_c_inline" >&5
    82198686 echo "${ECHO_T}$ac_cv_c_inline" >&6
    82208687 case $ac_cv_c_inline in
    82218688   inline | yes) ;;
    8222 @@ -12205,7 +12274,7 @@
     8689@@ -12205,7 +12286,7 @@
    82238690     :
    82248691   elif test "$GCC" = yes
    82258692   then
    82268693-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
    8227 +    echo "$as_me:12277: checking if gcc supports options to tune inlining" >&5
     8694+    echo "$as_me:12289: checking if gcc supports options to tune inlining" >&5
    82288695 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
    82298696 if test "${cf_cv_gcc_inline+set}" = set; then
    82308697   echo $ECHO_N "(cached) $ECHO_C" >&6
    8231 @@ -12214,7 +12283,7 @@
     8698@@ -12214,7 +12295,7 @@
    82328699       cf_save_CFLAGS=$CFLAGS
    82338700       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
    82348701       cat >conftest.$ac_ext <<_ACEOF
    82358702-#line 12217 "configure"
    8236 +#line 12286 "configure"
     8703+#line 12298 "configure"
    82378704 #include "confdefs.h"
    82388705 inline int foo(void) { return 1; }
    82398706 int
    8240 @@ -12226,16 +12295,16 @@
     8707@@ -12226,16 +12307,16 @@
    82418708 }
    82428709 _ACEOF
    82438710 rm -f conftest.$ac_objext
    82448711-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
    8245 +if { (eval echo "$as_me:12298: \"$ac_compile\"") >&5
     8712+if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
    82468713   (eval $ac_compile) 2>&5
    82478714   ac_status=$?
    82488715-  echo "$as_me:12232: \$? = $ac_status" >&5
    8249 +  echo "$as_me:12301: \$? = $ac_status" >&5
     8716+  echo "$as_me:12313: \$? = $ac_status" >&5
    82508717   (exit $ac_status); } &&
    82518718          { ac_try='test -s conftest.$ac_objext'
    82528719-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
    8253 +  { (eval echo "$as_me:12304: \"$ac_try\"") >&5
     8720+  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
    82548721   (eval $ac_try) 2>&5
    82558722   ac_status=$?
    82568723-  echo "$as_me:12238: \$? = $ac_status" >&5
    8257 +  echo "$as_me:12307: \$? = $ac_status" >&5
     8724+  echo "$as_me:12319: \$? = $ac_status" >&5
    82588725   (exit $ac_status); }; }; then
    82598726   cf_cv_gcc_inline=yes
    82608727 else
    8261 @@ -12247,7 +12316,7 @@
     8728@@ -12247,7 +12328,7 @@
    82628729       CFLAGS=$cf_save_CFLAGS
    82638730 
    82648731 fi
    82658732-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
    8266 +echo "$as_me:12319: result: $cf_cv_gcc_inline" >&5
     8733+echo "$as_me:12331: result: $cf_cv_gcc_inline" >&5
    82678734 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
    82688735     if test "$cf_cv_gcc_inline" = yes ; then
    82698736 
    8270 @@ -12323,7 +12392,7 @@
     8737@@ -12323,7 +12404,7 @@
    82718738   fi
    82728739 fi
    82738740 
    82748741-echo "$as_me:12326: checking for signal global datatype" >&5
    8275 +echo "$as_me:12395: checking for signal global datatype" >&5
     8742+echo "$as_me:12407: checking for signal global datatype" >&5
    82768743 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
    82778744 if test "${cf_cv_sig_atomic_t+set}" = set; then
    82788745   echo $ECHO_N "(cached) $ECHO_C" >&6
    8279 @@ -12335,7 +12404,7 @@
     8746@@ -12335,7 +12416,7 @@
    82808747                "int"
    82818748        do
    82828749        cat >conftest.$ac_ext <<_ACEOF
    82838750-#line 12338 "configure"
    8284 +#line 12407 "configure"
     8751+#line 12419 "configure"
    82858752 #include "confdefs.h"
    82868753 
    82878754 #include <sys/types.h>
    8288 @@ -12358,16 +12427,16 @@
     8755@@ -12358,16 +12439,16 @@
    82898756 }
    82908757 _ACEOF
    82918758 rm -f conftest.$ac_objext
    82928759-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
    8293 +if { (eval echo "$as_me:12430: \"$ac_compile\"") >&5
     8760+if { (eval echo "$as_me:12442: \"$ac_compile\"") >&5
    82948761   (eval $ac_compile) 2>&5
    82958762   ac_status=$?
    82968763-  echo "$as_me:12364: \$? = $ac_status" >&5
    8297 +  echo "$as_me:12433: \$? = $ac_status" >&5
     8764+  echo "$as_me:12445: \$? = $ac_status" >&5
    82988765   (exit $ac_status); } &&
    82998766          { ac_try='test -s conftest.$ac_objext'
    83008767-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
    8301 +  { (eval echo "$as_me:12436: \"$ac_try\"") >&5
     8768+  { (eval echo "$as_me:12448: \"$ac_try\"") >&5
    83028769   (eval $ac_try) 2>&5
    83038770   ac_status=$?
    83048771-  echo "$as_me:12370: \$? = $ac_status" >&5
    8305 +  echo "$as_me:12439: \$? = $ac_status" >&5
     8772+  echo "$as_me:12451: \$? = $ac_status" >&5
    83068773   (exit $ac_status); }; }; then
    83078774   cf_cv_sig_atomic_t=$cf_type
    83088775 else
    8309 @@ -12381,7 +12450,7 @@
     8776@@ -12381,7 +12462,7 @@
    83108777 
    83118778 fi
    83128779 
    83138780-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
    8314 +echo "$as_me:12453: result: $cf_cv_sig_atomic_t" >&5
     8781+echo "$as_me:12465: result: $cf_cv_sig_atomic_t" >&5
    83158782 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
    83168783 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
    83178784 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
    8318 @@ -12389,7 +12458,7 @@
     8785@@ -12389,7 +12470,7 @@
    83198786 
    83208787 if test $NCURSES_CHTYPE = auto ; then
    83218788 
    83228789-echo "$as_me:12392: checking for type of chtype" >&5
    8323 +echo "$as_me:12461: checking for type of chtype" >&5
     8790+echo "$as_me:12473: checking for type of chtype" >&5
    83248791 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    83258792 if test "${cf_cv_typeof_chtype+set}" = set; then
    83268793   echo $ECHO_N "(cached) $ECHO_C" >&6
    8327 @@ -12399,7 +12468,7 @@
     8794@@ -12399,7 +12480,7 @@
    83288795   cf_cv_typeof_chtype=long
    83298796 else
    83308797   cat >conftest.$ac_ext <<_ACEOF
    83318798-#line 12402 "configure"
    8332 +#line 12471 "configure"
     8799+#line 12483 "configure"
    83338800 #include "confdefs.h"
    83348801 
    83358802 #define WANT_BITS 31
    8336 @@ -12434,15 +12503,15 @@
     8803@@ -12434,15 +12515,15 @@
    83378804 
    83388805 _ACEOF
    83398806 rm -f conftest$ac_exeext
    83408807-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
    8341 +if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
     8808+if { (eval echo "$as_me:12518: \"$ac_link\"") >&5
    83428809   (eval $ac_link) 2>&5
    83438810   ac_status=$?
    83448811-  echo "$as_me:12440: \$? = $ac_status" >&5
    8345 +  echo "$as_me:12509: \$? = $ac_status" >&5
     8812+  echo "$as_me:12521: \$? = $ac_status" >&5
    83468813   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    83478814-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
    8348 +  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
     8815+  { (eval echo "$as_me:12523: \"$ac_try\"") >&5
    83498816   (eval $ac_try) 2>&5
    83508817   ac_status=$?
    83518818-  echo "$as_me:12445: \$? = $ac_status" >&5
    8352 +  echo "$as_me:12514: \$? = $ac_status" >&5
     8819+  echo "$as_me:12526: \$? = $ac_status" >&5
    83538820   (exit $ac_status); }; }; then
    83548821   cf_cv_typeof_chtype=`cat cf_test.out`
    83558822 else
    8356 @@ -12457,7 +12526,7 @@
     8823@@ -12457,7 +12538,7 @@
    83578824 
    83588825 fi
    83598826 
    83608827-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
    8361 +echo "$as_me:12529: result: $cf_cv_typeof_chtype" >&5
     8828+echo "$as_me:12541: result: $cf_cv_typeof_chtype" >&5
    83628829 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
    83638830 
    83648831 cat >>confdefs.h <<EOF
    8365 @@ -12469,14 +12538,14 @@
     8832@@ -12469,14 +12550,14 @@
    83668833 fi
    83678834 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
    83688835 
    83698836-echo "$as_me:12472: checking if unsigned literals are legal" >&5
    8370 +echo "$as_me:12541: checking if unsigned literals are legal" >&5
     8837+echo "$as_me:12553: checking if unsigned literals are legal" >&5
    83718838 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
    83728839 if test "${cf_cv_unsigned_literals+set}" = set; then
    … …  
    83768843        cat >conftest.$ac_ext <<_ACEOF
    83778844-#line 12479 "configure"
    8378 +#line 12548 "configure"
     8845+#line 12560 "configure"
    83798846 #include "confdefs.h"
    83808847 
    83818848 int
    8382 @@ -12488,16 +12557,16 @@
     8849@@ -12488,16 +12569,16 @@
    83838850 }
    83848851 _ACEOF
    83858852 rm -f conftest.$ac_objext
    83868853-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
    8387 +if { (eval echo "$as_me:12560: \"$ac_compile\"") >&5
     8854+if { (eval echo "$as_me:12572: \"$ac_compile\"") >&5
    83888855   (eval $ac_compile) 2>&5
    83898856   ac_status=$?
    83908857-  echo "$as_me:12494: \$? = $ac_status" >&5
    8391 +  echo "$as_me:12563: \$? = $ac_status" >&5
     8858+  echo "$as_me:12575: \$? = $ac_status" >&5
    83928859   (exit $ac_status); } &&
    83938860          { ac_try='test -s conftest.$ac_objext'
    83948861-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
    8395 +  { (eval echo "$as_me:12566: \"$ac_try\"") >&5
     8862+  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
    83968863   (eval $ac_try) 2>&5
    83978864   ac_status=$?
    83988865-  echo "$as_me:12500: \$? = $ac_status" >&5
    8399 +  echo "$as_me:12569: \$? = $ac_status" >&5
     8866+  echo "$as_me:12581: \$? = $ac_status" >&5
    84008867   (exit $ac_status); }; }; then
    84018868   cf_cv_unsigned_literals=yes
    84028869 else
    8403 @@ -12509,7 +12578,7 @@
     8870@@ -12509,7 +12590,7 @@
    84048871 
    84058872 fi
    84068873 
    84078874-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
    8408 +echo "$as_me:12581: result: $cf_cv_unsigned_literals" >&5
     8875+echo "$as_me:12593: result: $cf_cv_unsigned_literals" >&5
    84098876 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
    84108877 
    84118878 cf_cv_1UL="1"
    8412 @@ -12525,14 +12594,14 @@
     8879@@ -12525,14 +12606,14 @@
    84138880 
    84148881 ###    Checks for external-data
    84158882 
    84168883-echo "$as_me:12528: checking if external errno is declared" >&5
    8417 +echo "$as_me:12597: checking if external errno is declared" >&5
     8884+echo "$as_me:12609: checking if external errno is declared" >&5
    84188885 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
    84198886 if test "${cf_cv_dcl_errno+set}" = set; then
    … …  
    84238890     cat >conftest.$ac_ext <<_ACEOF
    84248891-#line 12535 "configure"
    8425 +#line 12604 "configure"
     8892+#line 12616 "configure"
    84268893 #include "confdefs.h"
    84278894 
    84288895 #ifdef HAVE_STDLIB_H
    8429 @@ -12550,16 +12619,16 @@
     8896@@ -12550,16 +12631,16 @@
    84308897 }
    84318898 _ACEOF
    84328899 rm -f conftest.$ac_objext
    84338900-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
    8434 +if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
     8901+if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
    84358902   (eval $ac_compile) 2>&5
    84368903   ac_status=$?
    84378904-  echo "$as_me:12556: \$? = $ac_status" >&5
    8438 +  echo "$as_me:12625: \$? = $ac_status" >&5
     8905+  echo "$as_me:12637: \$? = $ac_status" >&5
    84398906   (exit $ac_status); } &&
    84408907          { ac_try='test -s conftest.$ac_objext'
    84418908-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
    8442 +  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
     8909+  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
    84438910   (eval $ac_try) 2>&5
    84448911   ac_status=$?
    84458912-  echo "$as_me:12562: \$? = $ac_status" >&5
    8446 +  echo "$as_me:12631: \$? = $ac_status" >&5
     8913+  echo "$as_me:12643: \$? = $ac_status" >&5
    84478914   (exit $ac_status); }; }; then
    84488915   cf_cv_dcl_errno=yes
    84498916 else
    8450 @@ -12570,7 +12639,7 @@
     8917@@ -12570,7 +12651,7 @@
    84518918 rm -f conftest.$ac_objext conftest.$ac_ext
    84528919 
    84538920 fi
    84548921-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
    8455 +echo "$as_me:12642: result: $cf_cv_dcl_errno" >&5
     8922+echo "$as_me:12654: result: $cf_cv_dcl_errno" >&5
    84568923 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
    84578924 
    84588925 if test "$cf_cv_dcl_errno" = no ; then
    8459 @@ -12585,14 +12654,14 @@
     8926@@ -12585,14 +12666,14 @@
    84608927 
    84618928 # It's possible (for near-UNIX clones) that the data doesn't exist
    84628929 
    84638930-echo "$as_me:12588: checking if external errno exists" >&5
    8464 +echo "$as_me:12657: checking if external errno exists" >&5
     8931+echo "$as_me:12669: checking if external errno exists" >&5
    84658932 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
    84668933 if test "${cf_cv_have_errno+set}" = set; then
    … …  
    84708937     cat >conftest.$ac_ext <<_ACEOF
    84718938-#line 12595 "configure"
    8472 +#line 12664 "configure"
     8939+#line 12676 "configure"
    84738940 #include "confdefs.h"
    84748941 
    84758942 #undef errno
    8476 @@ -12607,16 +12676,16 @@
     8943@@ -12607,16 +12688,16 @@
    84778944 }
    84788945 _ACEOF
    84798946 rm -f conftest.$ac_objext conftest$ac_exeext
    84808947-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
    8481 +if { (eval echo "$as_me:12679: \"$ac_link\"") >&5
     8948+if { (eval echo "$as_me:12691: \"$ac_link\"") >&5
    84828949   (eval $ac_link) 2>&5
    84838950   ac_status=$?
    84848951-  echo "$as_me:12613: \$? = $ac_status" >&5
    8485 +  echo "$as_me:12682: \$? = $ac_status" >&5
     8952+  echo "$as_me:12694: \$? = $ac_status" >&5
    84868953   (exit $ac_status); } &&
    84878954          { ac_try='test -s conftest$ac_exeext'
    84888955-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
    8489 +  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
     8956+  { (eval echo "$as_me:12697: \"$ac_try\"") >&5
    84908957   (eval $ac_try) 2>&5
    84918958   ac_status=$?
    84928959-  echo "$as_me:12619: \$? = $ac_status" >&5
    8493 +  echo "$as_me:12688: \$? = $ac_status" >&5
     8960+  echo "$as_me:12700: \$? = $ac_status" >&5
    84948961   (exit $ac_status); }; }; then
    84958962   cf_cv_have_errno=yes
    84968963 else
    8497 @@ -12627,7 +12696,7 @@
     8964@@ -12627,7 +12708,7 @@
    84988965 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    84998966 
    85008967 fi
    85018968-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
    8502 +echo "$as_me:12699: result: $cf_cv_have_errno" >&5
     8969+echo "$as_me:12711: result: $cf_cv_have_errno" >&5
    85038970 echo "${ECHO_T}$cf_cv_have_errno" >&6
    85048971 
    85058972 if test "$cf_cv_have_errno" = yes ; then
    8506 @@ -12640,7 +12709,7 @@
     8973@@ -12640,7 +12721,7 @@
    85078974 
    85088975 fi
    85098976 
    85108977-echo "$as_me:12643: checking if data-only library module links" >&5
    8511 +echo "$as_me:12712: checking if data-only library module links" >&5
     8978+echo "$as_me:12724: checking if data-only library module links" >&5
    85128979 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
    85138980 if test "${cf_cv_link_dataonly+set}" = set; then
    85148981   echo $ECHO_N "(cached) $ECHO_C" >&6
    8515 @@ -12648,20 +12717,20 @@
     8982@@ -12648,20 +12729,20 @@
    85168983 
    85178984        rm -f conftest.a
    85188985        cat >conftest.$ac_ext <<EOF
    85198986-#line 12651 "configure"
    8520 +#line 12720 "configure"
     8987+#line 12732 "configure"
    85218988 int    testdata[3] = { 123, 456, 789 };
    85228989 EOF
    85238990-       if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
    8524 +       if { (eval echo "$as_me:12723: \"$ac_compile\"") >&5
     8991+       if { (eval echo "$as_me:12735: \"$ac_compile\"") >&5
    85258992   (eval $ac_compile) 2>&5
    85268993   ac_status=$?
    85278994-  echo "$as_me:12657: \$? = $ac_status" >&5
    8528 +  echo "$as_me:12726: \$? = $ac_status" >&5
     8995+  echo "$as_me:12738: \$? = $ac_status" >&5
    85298996   (exit $ac_status); } ; then
    85308997                mv conftest.o data.o && \
    … …  
    85349001        cat >conftest.$ac_ext <<EOF
    85359002-#line 12664 "configure"
    8536 +#line 12733 "configure"
     9003+#line 12745 "configure"
    85379004 int    testfunc()
    85389005 {
    85399006 #if defined(NeXT)
    8540 @@ -12674,10 +12743,10 @@
     9007@@ -12674,10 +12755,10 @@
    85419008 #endif
    85429009 }
    85439010 EOF
    85449011-       if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
    8545 +       if { (eval echo "$as_me:12746: \"$ac_compile\"") >&5
     9012+       if { (eval echo "$as_me:12758: \"$ac_compile\"") >&5
    85469013   (eval $ac_compile) 2>&5
    85479014   ac_status=$?
    85489015-  echo "$as_me:12680: \$? = $ac_status" >&5
    8549 +  echo "$as_me:12749: \$? = $ac_status" >&5
     9016+  echo "$as_me:12761: \$? = $ac_status" >&5
    85509017   (exit $ac_status); }; then
    85519018                mv conftest.o func.o && \
    85529019                ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
    8553 @@ -12690,7 +12759,7 @@
     9020@@ -12690,7 +12771,7 @@
    85549021   cf_cv_link_dataonly=unknown
    85559022 else
    85569023   cat >conftest.$ac_ext <<_ACEOF
    85579024-#line 12693 "configure"
    8558 +#line 12762 "configure"
     9025+#line 12774 "configure"
    85599026 #include "confdefs.h"
    85609027 
    85619028        int main()
    8562 @@ -12701,15 +12770,15 @@
     9029@@ -12701,15 +12782,15 @@
    85639030 
    85649031 _ACEOF
    85659032 rm -f conftest$ac_exeext
    85669033-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
    8567 +if { (eval echo "$as_me:12773: \"$ac_link\"") >&5
     9034+if { (eval echo "$as_me:12785: \"$ac_link\"") >&5
    85689035   (eval $ac_link) 2>&5
    85699036   ac_status=$?
    85709037-  echo "$as_me:12707: \$? = $ac_status" >&5
    8571 +  echo "$as_me:12776: \$? = $ac_status" >&5
     9038+  echo "$as_me:12788: \$? = $ac_status" >&5
    85729039   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    85739040-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
    8574 +  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
     9041+  { (eval echo "$as_me:12790: \"$ac_try\"") >&5
    85759042   (eval $ac_try) 2>&5
    85769043   ac_status=$?
    85779044-  echo "$as_me:12712: \$? = $ac_status" >&5
    8578 +  echo "$as_me:12781: \$? = $ac_status" >&5
     9045+  echo "$as_me:12793: \$? = $ac_status" >&5
    85799046   (exit $ac_status); }; }; then
    85809047   cf_cv_link_dataonly=yes
    85819048 else
    8582 @@ -12724,7 +12793,7 @@
     9049@@ -12724,7 +12805,7 @@
    85839050 
    85849051 fi
    85859052 
    85869053-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
    8587 +echo "$as_me:12796: result: $cf_cv_link_dataonly" >&5
     9054+echo "$as_me:12808: result: $cf_cv_link_dataonly" >&5
    85889055 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
    85899056 
    85909057 if test "$cf_cv_link_dataonly" = no ; then
    8591 @@ -12759,13 +12828,13 @@
     9058@@ -12759,13 +12840,13 @@
    85929059 
    85939060 do
    85949061 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    85959062-echo "$as_me:12762: checking for $ac_func" >&5
    8596 +echo "$as_me:12831: checking for $ac_func" >&5
     9063+echo "$as_me:12843: checking for $ac_func" >&5
    85979064 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    85989065 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    86019068   cat >conftest.$ac_ext <<_ACEOF
    86029069-#line 12768 "configure"
    8603 +#line 12837 "configure"
     9070+#line 12849 "configure"
    86049071 #include "confdefs.h"
    86059072 /* System header to define __stub macros and hopefully few prototypes,
    86069073     which can conflict with char $ac_func (); below.  */
    8607 @@ -12796,16 +12865,16 @@
     9074@@ -12796,16 +12877,16 @@
    86089075 }
    86099076 _ACEOF
    86109077 rm -f conftest.$ac_objext conftest$ac_exeext
    86119078-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
    8612 +if { (eval echo "$as_me:12868: \"$ac_link\"") >&5
     9079+if { (eval echo "$as_me:12880: \"$ac_link\"") >&5
    86139080   (eval $ac_link) 2>&5
    86149081   ac_status=$?
    86159082-  echo "$as_me:12802: \$? = $ac_status" >&5
    8616 +  echo "$as_me:12871: \$? = $ac_status" >&5
     9083+  echo "$as_me:12883: \$? = $ac_status" >&5
    86179084   (exit $ac_status); } &&
    86189085          { ac_try='test -s conftest$ac_exeext'
    86199086-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
    8620 +  { (eval echo "$as_me:12874: \"$ac_try\"") >&5
     9087+  { (eval echo "$as_me:12886: \"$ac_try\"") >&5
    86219088   (eval $ac_try) 2>&5
    86229089   ac_status=$?
    86239090-  echo "$as_me:12808: \$? = $ac_status" >&5
    8624 +  echo "$as_me:12877: \$? = $ac_status" >&5
     9091+  echo "$as_me:12889: \$? = $ac_status" >&5
    86259092   (exit $ac_status); }; }; then
    86269093   eval "$as_ac_var=yes"
    86279094 else
    8628 @@ -12815,7 +12884,7 @@
     9095@@ -12815,7 +12896,7 @@
    86299096 fi
    86309097 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    86319098 fi
    86329099-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
    8633 +echo "$as_me:12887: result: `eval echo '${'$as_ac_var'}'`" >&5
     9100+echo "$as_me:12899: result: `eval echo '${'$as_ac_var'}'`" >&5
    86349101 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    86359102 if test `eval echo '${'$as_ac_var'}'` = yes; then
    86369103   cat >>confdefs.h <<EOF
    8637 @@ -12827,14 +12896,14 @@
     9104@@ -12827,14 +12908,14 @@
    86389105 
    86399106 if test "$with_getcap" = "yes" ; then
    86409107 
    86419108-echo "$as_me:12830: checking for terminal-capability database functions" >&5
    8642 +echo "$as_me:12899: checking for terminal-capability database functions" >&5
     9109+echo "$as_me:12911: checking for terminal-capability database functions" >&5
    86439110 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
    86449111 if test "${cf_cv_cgetent+set}" = set; then
    … …  
    86489115 cat >conftest.$ac_ext <<_ACEOF
    86499116-#line 12837 "configure"
    8650 +#line 12906 "configure"
     9117+#line 12918 "configure"
    86519118 #include "confdefs.h"
    86529119 
    86539120 #include <stdlib.h>
    8654 @@ -12854,16 +12923,16 @@
     9121@@ -12854,16 +12935,16 @@
    86559122 }
    86569123 _ACEOF
    86579124 rm -f conftest.$ac_objext conftest$ac_exeext
    86589125-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
    8659 +if { (eval echo "$as_me:12926: \"$ac_link\"") >&5
     9126+if { (eval echo "$as_me:12938: \"$ac_link\"") >&5
    86609127   (eval $ac_link) 2>&5
    86619128   ac_status=$?
    86629129-  echo "$as_me:12860: \$? = $ac_status" >&5
    8663 +  echo "$as_me:12929: \$? = $ac_status" >&5
     9130+  echo "$as_me:12941: \$? = $ac_status" >&5
    86649131   (exit $ac_status); } &&
    86659132          { ac_try='test -s conftest$ac_exeext'
    86669133-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
    8667 +  { (eval echo "$as_me:12932: \"$ac_try\"") >&5
     9134+  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
    86689135   (eval $ac_try) 2>&5
    86699136   ac_status=$?
    86709137-  echo "$as_me:12866: \$? = $ac_status" >&5
    8671 +  echo "$as_me:12935: \$? = $ac_status" >&5
     9138+  echo "$as_me:12947: \$? = $ac_status" >&5
    86729139   (exit $ac_status); }; }; then
    86739140   cf_cv_cgetent=yes
    86749141 else
    8675 @@ -12875,7 +12944,7 @@
     9142@@ -12875,7 +12956,7 @@
    86769143 
    86779144 fi
    86789145 
    86799146-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
    8680 +echo "$as_me:12947: result: $cf_cv_cgetent" >&5
     9147+echo "$as_me:12959: result: $cf_cv_cgetent" >&5
    86819148 echo "${ECHO_T}$cf_cv_cgetent" >&6
    86829149 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
    86839150 #define HAVE_BSD_CGETENT 1
    8684 @@ -12883,14 +12952,14 @@
     9151@@ -12883,14 +12964,14 @@
    86859152 
    86869153 fi
    86879154 
    86889155-echo "$as_me:12886: checking for isascii" >&5
    8689 +echo "$as_me:12955: checking for isascii" >&5
     9156+echo "$as_me:12967: checking for isascii" >&5
    86909157 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
    86919158 if test "${cf_cv_have_isascii+set}" = set; then
    … …  
    86959162        cat >conftest.$ac_ext <<_ACEOF
    86969163-#line 12893 "configure"
    8697 +#line 12962 "configure"
     9164+#line 12974 "configure"
    86989165 #include "confdefs.h"
    86999166 #include <ctype.h>
    87009167 int
    8701 @@ -12902,16 +12971,16 @@
     9168@@ -12902,16 +12983,16 @@
    87029169 }
    87039170 _ACEOF
    87049171 rm -f conftest.$ac_objext conftest$ac_exeext
    87059172-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
    8706 +if { (eval echo "$as_me:12974: \"$ac_link\"") >&5
     9173+if { (eval echo "$as_me:12986: \"$ac_link\"") >&5
    87079174   (eval $ac_link) 2>&5
    87089175   ac_status=$?
    87099176-  echo "$as_me:12908: \$? = $ac_status" >&5
    8710 +  echo "$as_me:12977: \$? = $ac_status" >&5
     9177+  echo "$as_me:12989: \$? = $ac_status" >&5
    87119178   (exit $ac_status); } &&
    87129179          { ac_try='test -s conftest$ac_exeext'
    87139180-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
    8714 +  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
     9181+  { (eval echo "$as_me:12992: \"$ac_try\"") >&5
    87159182   (eval $ac_try) 2>&5
    87169183   ac_status=$?
    87179184-  echo "$as_me:12914: \$? = $ac_status" >&5
    8718 +  echo "$as_me:12983: \$? = $ac_status" >&5
     9185+  echo "$as_me:12995: \$? = $ac_status" >&5
    87199186   (exit $ac_status); }; }; then
    87209187   cf_cv_have_isascii=yes
    87219188 else
    8722 @@ -12922,17 +12991,17 @@
     9189@@ -12922,17 +13003,17 @@
    87239190 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    87249191 
    87259192 fi
    87269193-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
    8727 +echo "$as_me:12994: result: $cf_cv_have_isascii" >&5
     9194+echo "$as_me:13006: result: $cf_cv_have_isascii" >&5
    87289195 echo "${ECHO_T}$cf_cv_have_isascii" >&6
    87299196 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
    … …  
    87339200 if test "$ac_cv_func_sigaction" = yes; then
    87349201-echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
    8735 +echo "$as_me:13001: checking whether sigaction needs _POSIX_SOURCE" >&5
     9202+echo "$as_me:13013: checking whether sigaction needs _POSIX_SOURCE" >&5
    87369203 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
    87379204 cat >conftest.$ac_ext <<_ACEOF
    87389205-#line 12935 "configure"
    8739 +#line 13004 "configure"
     9206+#line 13016 "configure"
    87409207 #include "confdefs.h"
    87419208 
    87429209 #include <sys/types.h>
    8743 @@ -12946,16 +13015,16 @@
     9210@@ -12946,16 +13027,16 @@
    87449211 }
    87459212 _ACEOF
    87469213 rm -f conftest.$ac_objext
    87479214-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
    8748 +if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5
     9215+if { (eval echo "$as_me:13030: \"$ac_compile\"") >&5
    87499216   (eval $ac_compile) 2>&5
    87509217   ac_status=$?
    87519218-  echo "$as_me:12952: \$? = $ac_status" >&5
    8752 +  echo "$as_me:13021: \$? = $ac_status" >&5
     9219+  echo "$as_me:13033: \$? = $ac_status" >&5
    87539220   (exit $ac_status); } &&
    87549221          { ac_try='test -s conftest.$ac_objext'
    87559222-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
    8756 +  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
     9223+  { (eval echo "$as_me:13036: \"$ac_try\"") >&5
    87579224   (eval $ac_try) 2>&5
    87589225   ac_status=$?
    87599226-  echo "$as_me:12958: \$? = $ac_status" >&5
    8760 +  echo "$as_me:13027: \$? = $ac_status" >&5
     9227+  echo "$as_me:13039: \$? = $ac_status" >&5
    87619228   (exit $ac_status); }; }; then
    87629229   sigact_bad=no
    87639230 else
    8764 @@ -12963,7 +13032,7 @@
     9231@@ -12963,7 +13044,7 @@
    87659232 cat conftest.$ac_ext >&5
    87669233 
    87679234 cat >conftest.$ac_ext <<_ACEOF
    87689235-#line 12966 "configure"
    8769 +#line 13035 "configure"
     9236+#line 13047 "configure"
    87709237 #include "confdefs.h"
    87719238 
    87729239 #define _POSIX_SOURCE
    8773 @@ -12978,16 +13047,16 @@
     9240@@ -12978,16 +13059,16 @@
    87749241 }
    87759242 _ACEOF
    87769243 rm -f conftest.$ac_objext
    87779244-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
    8778 +if { (eval echo "$as_me:13050: \"$ac_compile\"") >&5
     9245+if { (eval echo "$as_me:13062: \"$ac_compile\"") >&5
    87799246   (eval $ac_compile) 2>&5
    87809247   ac_status=$?
    87819248-  echo "$as_me:12984: \$? = $ac_status" >&5
    8782 +  echo "$as_me:13053: \$? = $ac_status" >&5
     9249+  echo "$as_me:13065: \$? = $ac_status" >&5
    87839250   (exit $ac_status); } &&
    87849251          { ac_try='test -s conftest.$ac_objext'
    87859252-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
    8786 +  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
     9253+  { (eval echo "$as_me:13068: \"$ac_try\"") >&5
    87879254   (eval $ac_try) 2>&5
    87889255   ac_status=$?
    87899256-  echo "$as_me:12990: \$? = $ac_status" >&5
    8790 +  echo "$as_me:13059: \$? = $ac_status" >&5
     9257+  echo "$as_me:13071: \$? = $ac_status" >&5
    87919258   (exit $ac_status); }; }; then
    87929259   sigact_bad=yes
    87939260         cat >>confdefs.h <<\EOF
    8794 @@ -13002,11 +13071,11 @@
     9261@@ -13002,11 +13083,11 @@
    87959262 rm -f conftest.$ac_objext conftest.$ac_ext
    87969263 fi
    87979264 rm -f conftest.$ac_objext conftest.$ac_ext
    87989265-echo "$as_me:13005: result: $sigact_bad" >&5
    8799 +echo "$as_me:13074: result: $sigact_bad" >&5
     9266+echo "$as_me:13086: result: $sigact_bad" >&5
    88009267 echo "${ECHO_T}$sigact_bad" >&6
    88019268 fi
    88029269 
    88039270-echo "$as_me:13009: checking if nanosleep really works" >&5
    8804 +echo "$as_me:13078: checking if nanosleep really works" >&5
     9271+echo "$as_me:13090: checking if nanosleep really works" >&5
    88059272 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
    88069273 if test "${cf_cv_func_nanosleep+set}" = set; then
    88079274   echo $ECHO_N "(cached) $ECHO_C" >&6
    8808 @@ -13016,7 +13085,7 @@
     9275@@ -13016,7 +13097,7 @@
    88099276   cf_cv_func_nanosleep=unknown
    88109277 else
    88119278   cat >conftest.$ac_ext <<_ACEOF
    88129279-#line 13019 "configure"
    8813 +#line 13088 "configure"
     9280+#line 13100 "configure"
    88149281 #include "confdefs.h"
    88159282 
    88169283 #include <stdio.h>
    8817 @@ -13041,15 +13110,15 @@
     9284@@ -13041,15 +13122,15 @@
    88189285 
    88199286 _ACEOF
    88209287 rm -f conftest$ac_exeext
    88219288-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
    8822 +if { (eval echo "$as_me:13113: \"$ac_link\"") >&5
     9289+if { (eval echo "$as_me:13125: \"$ac_link\"") >&5
    88239290   (eval $ac_link) 2>&5
    88249291   ac_status=$?
    88259292-  echo "$as_me:13047: \$? = $ac_status" >&5
    8826 +  echo "$as_me:13116: \$? = $ac_status" >&5
     9293+  echo "$as_me:13128: \$? = $ac_status" >&5
    88279294   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    88289295-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
    8829 +  { (eval echo "$as_me:13118: \"$ac_try\"") >&5
     9296+  { (eval echo "$as_me:13130: \"$ac_try\"") >&5
    88309297   (eval $ac_try) 2>&5
    88319298   ac_status=$?
    88329299-  echo "$as_me:13052: \$? = $ac_status" >&5
    8833 +  echo "$as_me:13121: \$? = $ac_status" >&5
     9300+  echo "$as_me:13133: \$? = $ac_status" >&5
    88349301   (exit $ac_status); }; }; then
    88359302   cf_cv_func_nanosleep=yes
    88369303 else
    8837 @@ -13061,7 +13130,7 @@
     9304@@ -13061,7 +13142,7 @@
    88389305 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    88399306 fi
    88409307 fi
    88419308-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
    8842 +echo "$as_me:13133: result: $cf_cv_func_nanosleep" >&5
     9309+echo "$as_me:13145: result: $cf_cv_func_nanosleep" >&5
    88439310 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
    88449311 
    88459312 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
    8846 @@ -13075,23 +13144,23 @@
     9313@@ -13075,23 +13156,23 @@
    88479314 
    88489315 do
    88499316 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    88509317-echo "$as_me:13078: checking for $ac_header" >&5
    8851 +echo "$as_me:13147: checking for $ac_header" >&5
     9318+echo "$as_me:13159: checking for $ac_header" >&5
    88529319 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    88539320 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    88569323   cat >conftest.$ac_ext <<_ACEOF
    88579324-#line 13084 "configure"
    8858 +#line 13153 "configure"
     9325+#line 13165 "configure"
    88599326 #include "confdefs.h"
    88609327 #include <$ac_header>
    88619328 _ACEOF
    88629329-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
    8863 +if { (eval echo "$as_me:13157: \"$ac_cpp conftest.$ac_ext\"") >&5
     9330+if { (eval echo "$as_me:13169: \"$ac_cpp conftest.$ac_ext\"") >&5
    88649331   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    88659332   ac_status=$?
    … …  
    88689335   cat conftest.err >&5
    88699336-  echo "$as_me:13094: \$? = $ac_status" >&5
    8870 +  echo "$as_me:13163: \$? = $ac_status" >&5
     9337+  echo "$as_me:13175: \$? = $ac_status" >&5
    88719338   (exit $ac_status); } >/dev/null; then
    88729339   if test -s conftest.err; then
    88739340     ac_cpp_err=$ac_c_preproc_warn_flag
    8874 @@ -13110,7 +13179,7 @@
     9341@@ -13110,7 +13191,7 @@
    88759342 fi
    88769343 rm -f conftest.err conftest.$ac_ext
    88779344 fi
    88789345-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
    8879 +echo "$as_me:13182: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9346+echo "$as_me:13194: result: `eval echo '${'$as_ac_Header'}'`" >&5
    88809347 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    88819348 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    88829349   cat >>confdefs.h <<EOF
    8883 @@ -13125,23 +13194,23 @@
     9350@@ -13125,23 +13206,23 @@
    88849351 for ac_header in sys/termio.h
    88859352 do
    88869353 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    88879354-echo "$as_me:13128: checking for $ac_header" >&5
    8888 +echo "$as_me:13197: checking for $ac_header" >&5
     9355+echo "$as_me:13209: checking for $ac_header" >&5
    88899356 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    88909357 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    88939360   cat >conftest.$ac_ext <<_ACEOF
    88949361-#line 13134 "configure"
    8895 +#line 13203 "configure"
     9362+#line 13215 "configure"
    88969363 #include "confdefs.h"
    88979364 #include <$ac_header>
    88989365 _ACEOF
    88999366-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
    8900 +if { (eval echo "$as_me:13207: \"$ac_cpp conftest.$ac_ext\"") >&5
     9367+if { (eval echo "$as_me:13219: \"$ac_cpp conftest.$ac_ext\"") >&5
    89019368   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    89029369   ac_status=$?
    … …  
    89059372   cat conftest.err >&5
    89069373-  echo "$as_me:13144: \$? = $ac_status" >&5
    8907 +  echo "$as_me:13213: \$? = $ac_status" >&5
     9374+  echo "$as_me:13225: \$? = $ac_status" >&5
    89089375   (exit $ac_status); } >/dev/null; then
    89099376   if test -s conftest.err; then
    89109377     ac_cpp_err=$ac_c_preproc_warn_flag
    8911 @@ -13160,7 +13229,7 @@
     9378@@ -13160,7 +13241,7 @@
    89129379 fi
    89139380 rm -f conftest.err conftest.$ac_ext
    89149381 fi
    89159382-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
    8916 +echo "$as_me:13232: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9383+echo "$as_me:13244: result: `eval echo '${'$as_ac_Header'}'`" >&5
    89179384 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    89189385 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    89199386   cat >>confdefs.h <<EOF
    8920 @@ -13178,10 +13247,10 @@
     9387@@ -13178,10 +13259,10 @@
    89219388        *)      termios_bad=maybe ;;
    89229389        esac
    89239390        if test "$termios_bad" = maybe ; then
    89249391-       echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
    8925 +       echo "$as_me:13250: checking whether termios.h needs _POSIX_SOURCE" >&5
     9392+       echo "$as_me:13262: checking whether termios.h needs _POSIX_SOURCE" >&5
    89269393 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
    89279394        cat >conftest.$ac_ext <<_ACEOF
    89289395-#line 13184 "configure"
    8929 +#line 13253 "configure"
     9396+#line 13265 "configure"
    89309397 #include "confdefs.h"
    89319398 #include <termios.h>
    89329399 int
    8933 @@ -13193,16 +13262,16 @@
     9400@@ -13193,16 +13274,16 @@
    89349401 }
    89359402 _ACEOF
    89369403 rm -f conftest.$ac_objext
    89379404-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
    8938 +if { (eval echo "$as_me:13265: \"$ac_compile\"") >&5
     9405+if { (eval echo "$as_me:13277: \"$ac_compile\"") >&5
    89399406   (eval $ac_compile) 2>&5
    89409407   ac_status=$?
    89419408-  echo "$as_me:13199: \$? = $ac_status" >&5
    8942 +  echo "$as_me:13268: \$? = $ac_status" >&5
     9409+  echo "$as_me:13280: \$? = $ac_status" >&5
    89439410   (exit $ac_status); } &&
    89449411          { ac_try='test -s conftest.$ac_objext'
    89459412-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
    8946 +  { (eval echo "$as_me:13271: \"$ac_try\"") >&5
     9413+  { (eval echo "$as_me:13283: \"$ac_try\"") >&5
    89479414   (eval $ac_try) 2>&5
    89489415   ac_status=$?
    89499416-  echo "$as_me:13205: \$? = $ac_status" >&5
    8950 +  echo "$as_me:13274: \$? = $ac_status" >&5
     9417+  echo "$as_me:13286: \$? = $ac_status" >&5
    89519418   (exit $ac_status); }; }; then
    89529419   termios_bad=no
    89539420 else
    8954 @@ -13210,7 +13279,7 @@
     9421@@ -13210,7 +13291,7 @@
    89559422 cat conftest.$ac_ext >&5
    89569423 
    89579424                cat >conftest.$ac_ext <<_ACEOF
    89589425-#line 13213 "configure"
    8959 +#line 13282 "configure"
     9426+#line 13294 "configure"
    89609427 #include "confdefs.h"
    89619428 
    89629429 #define _POSIX_SOURCE
    8963 @@ -13224,16 +13293,16 @@
     9430@@ -13224,16 +13305,16 @@
    89649431 }
    89659432 _ACEOF
    89669433 rm -f conftest.$ac_objext
    89679434-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
    8968 +if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
     9435+if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
    89699436   (eval $ac_compile) 2>&5
    89709437   ac_status=$?
    89719438-  echo "$as_me:13230: \$? = $ac_status" >&5
    8972 +  echo "$as_me:13299: \$? = $ac_status" >&5
     9439+  echo "$as_me:13311: \$? = $ac_status" >&5
    89739440   (exit $ac_status); } &&
    89749441          { ac_try='test -s conftest.$ac_objext'
    89759442-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
    8976 +  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
     9443+  { (eval echo "$as_me:13314: \"$ac_try\"") >&5
    89779444   (eval $ac_try) 2>&5
    89789445   ac_status=$?
    89799446-  echo "$as_me:13236: \$? = $ac_status" >&5
    8980 +  echo "$as_me:13305: \$? = $ac_status" >&5
     9447+  echo "$as_me:13317: \$? = $ac_status" >&5
    89819448   (exit $ac_status); }; }; then
    89829449   termios_bad=unknown
    89839450 else
    8984 @@ -13248,19 +13317,19 @@
     9451@@ -13248,19 +13329,19 @@
    89859452 
    89869453 fi
    89879454 rm -f conftest.$ac_objext conftest.$ac_ext
    89889455-       echo "$as_me:13251: result: $termios_bad" >&5
    8989 +       echo "$as_me:13320: result: $termios_bad" >&5
     9456+       echo "$as_me:13332: result: $termios_bad" >&5
    89909457 echo "${ECHO_T}$termios_bad" >&6
    89919458        fi
    … …  
    89939460 
    89949461-echo "$as_me:13256: checking for tcgetattr" >&5
    8995 +echo "$as_me:13325: checking for tcgetattr" >&5
     9462+echo "$as_me:13337: checking for tcgetattr" >&5
    89969463 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
    89979464 if test "${cf_cv_have_tcgetattr+set}" = set; then
    … …  
    90019468 cat >conftest.$ac_ext <<_ACEOF
    90029469-#line 13263 "configure"
    9003 +#line 13332 "configure"
     9470+#line 13344 "configure"
    90049471 #include "confdefs.h"
    90059472 
    90069473 #include <sys/types.h>
    9007 @@ -13288,16 +13357,16 @@
     9474@@ -13288,16 +13369,16 @@
    90089475 }
    90099476 _ACEOF
    90109477 rm -f conftest.$ac_objext conftest$ac_exeext
    90119478-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
    9012 +if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
     9479+if { (eval echo "$as_me:13372: \"$ac_link\"") >&5
    90139480   (eval $ac_link) 2>&5
    90149481   ac_status=$?
    90159482-  echo "$as_me:13294: \$? = $ac_status" >&5
    9016 +  echo "$as_me:13363: \$? = $ac_status" >&5
     9483+  echo "$as_me:13375: \$? = $ac_status" >&5
    90179484   (exit $ac_status); } &&
    90189485          { ac_try='test -s conftest$ac_exeext'
    90199486-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
    9020 +  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
     9487+  { (eval echo "$as_me:13378: \"$ac_try\"") >&5
    90219488   (eval $ac_try) 2>&5
    90229489   ac_status=$?
    90239490-  echo "$as_me:13300: \$? = $ac_status" >&5
    9024 +  echo "$as_me:13369: \$? = $ac_status" >&5
     9491+  echo "$as_me:13381: \$? = $ac_status" >&5
    90259492   (exit $ac_status); }; }; then
    90269493   cf_cv_have_tcgetattr=yes
    90279494 else
    9028 @@ -13307,20 +13376,20 @@
     9495@@ -13307,20 +13388,20 @@
    90299496 fi
    90309497 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    90319498 fi
    90329499-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
    9033 +echo "$as_me:13379: result: $cf_cv_have_tcgetattr" >&5
     9500+echo "$as_me:13391: result: $cf_cv_have_tcgetattr" >&5
    90349501 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
    90359502 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
    … …  
    90389505 
    90399506-echo "$as_me:13316: checking for vsscanf function or workaround" >&5
    9040 +echo "$as_me:13385: checking for vsscanf function or workaround" >&5
     9507+echo "$as_me:13397: checking for vsscanf function or workaround" >&5
    90419508 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
    90429509 if test "${cf_cv_func_vsscanf+set}" = set; then
    … …  
    90469513 cat >conftest.$ac_ext <<_ACEOF
    90479514-#line 13323 "configure"
    9048 +#line 13392 "configure"
     9515+#line 13404 "configure"
    90499516 #include "confdefs.h"
    90509517 
    90519518 #include <stdarg.h>
    9052 @@ -13336,16 +13405,16 @@
     9519@@ -13336,16 +13417,16 @@
    90539520 }
    90549521 _ACEOF
    90559522 rm -f conftest.$ac_objext conftest$ac_exeext
    90569523-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
    9057 +if { (eval echo "$as_me:13408: \"$ac_link\"") >&5
     9524+if { (eval echo "$as_me:13420: \"$ac_link\"") >&5
    90589525   (eval $ac_link) 2>&5
    90599526   ac_status=$?
    90609527-  echo "$as_me:13342: \$? = $ac_status" >&5
    9061 +  echo "$as_me:13411: \$? = $ac_status" >&5
     9528+  echo "$as_me:13423: \$? = $ac_status" >&5
    90629529   (exit $ac_status); } &&
    90639530          { ac_try='test -s conftest$ac_exeext'
    90649531-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
    9065 +  { (eval echo "$as_me:13414: \"$ac_try\"") >&5
     9532+  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
    90669533   (eval $ac_try) 2>&5
    90679534   ac_status=$?
    90689535-  echo "$as_me:13348: \$? = $ac_status" >&5
    9069 +  echo "$as_me:13417: \$? = $ac_status" >&5
     9536+  echo "$as_me:13429: \$? = $ac_status" >&5
    90709537   (exit $ac_status); }; }; then
    90719538   cf_cv_func_vsscanf=vsscanf
    90729539 else
    9073 @@ -13353,7 +13422,7 @@
     9540@@ -13353,7 +13434,7 @@
    90749541 cat conftest.$ac_ext >&5
    90759542 
    90769543 cat >conftest.$ac_ext <<_ACEOF
    90779544-#line 13356 "configure"
    9078 +#line 13425 "configure"
     9545+#line 13437 "configure"
    90799546 #include "confdefs.h"
    90809547 
    90819548 #include <stdarg.h>
    9082 @@ -13375,16 +13444,16 @@
     9549@@ -13375,16 +13456,16 @@
    90839550 }
    90849551 _ACEOF
    90859552 rm -f conftest.$ac_objext conftest$ac_exeext
    90869553-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
    9087 +if { (eval echo "$as_me:13447: \"$ac_link\"") >&5
     9554+if { (eval echo "$as_me:13459: \"$ac_link\"") >&5
    90889555   (eval $ac_link) 2>&5
    90899556   ac_status=$?
    90909557-  echo "$as_me:13381: \$? = $ac_status" >&5
    9091 +  echo "$as_me:13450: \$? = $ac_status" >&5
     9558+  echo "$as_me:13462: \$? = $ac_status" >&5
    90929559   (exit $ac_status); } &&
    90939560          { ac_try='test -s conftest$ac_exeext'
    90949561-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
    9095 +  { (eval echo "$as_me:13453: \"$ac_try\"") >&5
     9562+  { (eval echo "$as_me:13465: \"$ac_try\"") >&5
    90969563   (eval $ac_try) 2>&5
    90979564   ac_status=$?
    90989565-  echo "$as_me:13387: \$? = $ac_status" >&5
    9099 +  echo "$as_me:13456: \$? = $ac_status" >&5
     9566+  echo "$as_me:13468: \$? = $ac_status" >&5
    91009567   (exit $ac_status); }; }; then
    91019568   cf_cv_func_vsscanf=vfscanf
    91029569 else
    9103 @@ -13392,7 +13461,7 @@
     9570@@ -13392,7 +13473,7 @@
    91049571 cat conftest.$ac_ext >&5
    91059572 
    91069573 cat >conftest.$ac_ext <<_ACEOF
    91079574-#line 13395 "configure"
    9108 +#line 13464 "configure"
     9575+#line 13476 "configure"
    91099576 #include "confdefs.h"
    91109577 
    91119578 #include <stdarg.h>
    9112 @@ -13414,16 +13483,16 @@
     9579@@ -13414,16 +13495,16 @@
    91139580 }
    91149581 _ACEOF
    91159582 rm -f conftest.$ac_objext conftest$ac_exeext
    91169583-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
    9117 +if { (eval echo "$as_me:13486: \"$ac_link\"") >&5
     9584+if { (eval echo "$as_me:13498: \"$ac_link\"") >&5
    91189585   (eval $ac_link) 2>&5
    91199586   ac_status=$?
    91209587-  echo "$as_me:13420: \$? = $ac_status" >&5
    9121 +  echo "$as_me:13489: \$? = $ac_status" >&5
     9588+  echo "$as_me:13501: \$? = $ac_status" >&5
    91229589   (exit $ac_status); } &&
    91239590          { ac_try='test -s conftest$ac_exeext'
    91249591-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
    9125 +  { (eval echo "$as_me:13492: \"$ac_try\"") >&5
     9592+  { (eval echo "$as_me:13504: \"$ac_try\"") >&5
    91269593   (eval $ac_try) 2>&5
    91279594   ac_status=$?
    91289595-  echo "$as_me:13426: \$? = $ac_status" >&5
    9129 +  echo "$as_me:13495: \$? = $ac_status" >&5
     9596+  echo "$as_me:13507: \$? = $ac_status" >&5
    91309597   (exit $ac_status); }; }; then
    91319598   cf_cv_func_vsscanf=_doscan
    91329599 else
    9133 @@ -13438,7 +13507,7 @@
     9600@@ -13438,7 +13519,7 @@
    91349601 fi
    91359602 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    91369603 fi
    91379604-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
    9138 +echo "$as_me:13510: result: $cf_cv_func_vsscanf" >&5
     9605+echo "$as_me:13522: result: $cf_cv_func_vsscanf" >&5
    91399606 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
    91409607 
    91419608 case $cf_cv_func_vsscanf in #(vi
    9142 @@ -13456,7 +13525,7 @@
     9609@@ -13456,7 +13537,7 @@
    91439610 ;;
    91449611 esac
    91459612 
    91469613-echo "$as_me:13459: checking for working mkstemp" >&5
    9147 +echo "$as_me:13528: checking for working mkstemp" >&5
     9614+echo "$as_me:13540: checking for working mkstemp" >&5
    91489615 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
    91499616 if test "${cf_cv_func_mkstemp+set}" = set; then
    91509617   echo $ECHO_N "(cached) $ECHO_C" >&6
    9151 @@ -13464,13 +13533,13 @@
     9618@@ -13464,13 +13545,13 @@
    91529619 
    91539620 rm -f conftest*
    91549621 if test "$cross_compiling" = yes; then
    91559622-  echo "$as_me:13467: checking for mkstemp" >&5
    9156 +  echo "$as_me:13536: checking for mkstemp" >&5
     9623+  echo "$as_me:13548: checking for mkstemp" >&5
    91579624 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
    91589625 if test "${ac_cv_func_mkstemp+set}" = set; then
    … …  
    91619628   cat >conftest.$ac_ext <<_ACEOF
    91629629-#line 13473 "configure"
    9163 +#line 13542 "configure"
     9630+#line 13554 "configure"
    91649631 #include "confdefs.h"
    91659632 /* System header to define __stub macros and hopefully few prototypes,
    91669633     which can conflict with char mkstemp (); below.  */
    9167 @@ -13501,16 +13570,16 @@
     9634@@ -13501,16 +13582,16 @@
    91689635 }
    91699636 _ACEOF
    91709637 rm -f conftest.$ac_objext conftest$ac_exeext
    91719638-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
    9172 +if { (eval echo "$as_me:13573: \"$ac_link\"") >&5
     9639+if { (eval echo "$as_me:13585: \"$ac_link\"") >&5
    91739640   (eval $ac_link) 2>&5
    91749641   ac_status=$?
    91759642-  echo "$as_me:13507: \$? = $ac_status" >&5
    9176 +  echo "$as_me:13576: \$? = $ac_status" >&5
     9643+  echo "$as_me:13588: \$? = $ac_status" >&5
    91779644   (exit $ac_status); } &&
    91789645          { ac_try='test -s conftest$ac_exeext'
    91799646-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
    9180 +  { (eval echo "$as_me:13579: \"$ac_try\"") >&5
     9647+  { (eval echo "$as_me:13591: \"$ac_try\"") >&5
    91819648   (eval $ac_try) 2>&5
    91829649   ac_status=$?
    91839650-  echo "$as_me:13513: \$? = $ac_status" >&5
    9184 +  echo "$as_me:13582: \$? = $ac_status" >&5
     9651+  echo "$as_me:13594: \$? = $ac_status" >&5
    91859652   (exit $ac_status); }; }; then
    91869653   ac_cv_func_mkstemp=yes
    91879654 else
    9188 @@ -13520,12 +13589,12 @@
     9655@@ -13520,12 +13601,12 @@
    91899656 fi
    91909657 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    91919658 fi
    91929659-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
    9193 +echo "$as_me:13592: result: $ac_cv_func_mkstemp" >&5
     9660+echo "$as_me:13604: result: $ac_cv_func_mkstemp" >&5
    91949661 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
    91959662 
    … …  
    91979664   cat >conftest.$ac_ext <<_ACEOF
    91989665-#line 13528 "configure"
    9199 +#line 13597 "configure"
     9666+#line 13609 "configure"
    92009667 #include "confdefs.h"
    92019668 
    92029669 #include <sys/types.h>
    9203 @@ -13563,15 +13632,15 @@
     9670@@ -13563,15 +13644,15 @@
    92049671 
    92059672 _ACEOF
    92069673 rm -f conftest$ac_exeext
    92079674-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
    9208 +if { (eval echo "$as_me:13635: \"$ac_link\"") >&5
     9675+if { (eval echo "$as_me:13647: \"$ac_link\"") >&5
    92099676   (eval $ac_link) 2>&5
    92109677   ac_status=$?
    92119678-  echo "$as_me:13569: \$? = $ac_status" >&5
    9212 +  echo "$as_me:13638: \$? = $ac_status" >&5
     9679+  echo "$as_me:13650: \$? = $ac_status" >&5
    92139680   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    92149681-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
    9215 +  { (eval echo "$as_me:13640: \"$ac_try\"") >&5
     9682+  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
    92169683   (eval $ac_try) 2>&5
    92179684   ac_status=$?
    92189685-  echo "$as_me:13574: \$? = $ac_status" >&5
    9219 +  echo "$as_me:13643: \$? = $ac_status" >&5
     9686+  echo "$as_me:13655: \$? = $ac_status" >&5
    92209687   (exit $ac_status); }; }; then
    92219688   cf_cv_func_mkstemp=yes
    92229689 
    9223 @@ -13586,7 +13655,7 @@
     9690@@ -13586,7 +13667,7 @@
    92249691 fi
    92259692 
    92269693 fi
    92279694-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
    9228 +echo "$as_me:13658: result: $cf_cv_func_mkstemp" >&5
     9695+echo "$as_me:13670: result: $cf_cv_func_mkstemp" >&5
    92299696 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
    92309697 if test "$cf_cv_func_mkstemp" = yes ; then
    92319698        cat >>confdefs.h <<\EOF
    9232 @@ -13604,21 +13673,21 @@
     9699@@ -13604,21 +13685,21 @@
    92339700 fi
    92349701 
    92359702 if test "$cross_compiling" = yes ; then
    92369703-       { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    9237 +       { echo "$as_me:13676: WARNING: cross compiling: assume setvbuf params not reversed" >&5
     9704+       { echo "$as_me:13688: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    92389705 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
    92399706 else
    92409707-       echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
    9241 +       echo "$as_me:13679: checking whether setvbuf arguments are reversed" >&5
     9708+       echo "$as_me:13691: checking whether setvbuf arguments are reversed" >&5
    92429709 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
    92439710 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
    … …  
    92469713   if test "$cross_compiling" = yes; then
    92479714-  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
    9248 +  { { echo "$as_me:13685: error: cannot run test program while cross compiling" >&5
     9715+  { { echo "$as_me:13697: error: cannot run test program while cross compiling" >&5
    92499716 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    92509717    { (exit 1); exit 1; }; }
    … …  
    92529719   cat >conftest.$ac_ext <<_ACEOF
    92539720-#line 13621 "configure"
    9254 +#line 13690 "configure"
     9721+#line 13702 "configure"
    92559722 #include "confdefs.h"
    92569723 #include <stdio.h>
    92579724 /* If setvbuf has the reversed format, exit 0. */
    9258 @@ -13635,15 +13704,15 @@
     9725@@ -13635,15 +13716,15 @@
    92599726 }
    92609727 _ACEOF
    92619728 rm -f conftest$ac_exeext
    92629729-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
    9263 +if { (eval echo "$as_me:13707: \"$ac_link\"") >&5
     9730+if { (eval echo "$as_me:13719: \"$ac_link\"") >&5
    92649731   (eval $ac_link) 2>&5
    92659732   ac_status=$?
    92669733-  echo "$as_me:13641: \$? = $ac_status" >&5
    9267 +  echo "$as_me:13710: \$? = $ac_status" >&5
     9734+  echo "$as_me:13722: \$? = $ac_status" >&5
    92689735   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    92699736-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
    9270 +  { (eval echo "$as_me:13712: \"$ac_try\"") >&5
     9737+  { (eval echo "$as_me:13724: \"$ac_try\"") >&5
    92719738   (eval $ac_try) 2>&5
    92729739   ac_status=$?
    92739740-  echo "$as_me:13646: \$? = $ac_status" >&5
    9274 +  echo "$as_me:13715: \$? = $ac_status" >&5
     9741+  echo "$as_me:13727: \$? = $ac_status" >&5
    92759742   (exit $ac_status); }; }; then
    92769743   ac_cv_func_setvbuf_reversed=yes
    92779744 else
    9278 @@ -13656,7 +13725,7 @@
     9745@@ -13656,7 +13737,7 @@
    92799746 fi
    92809747 rm -f core core.* *.core
    92819748 fi
    92829749-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
    9283 +echo "$as_me:13728: result: $ac_cv_func_setvbuf_reversed" >&5
     9750+echo "$as_me:13740: result: $ac_cv_func_setvbuf_reversed" >&5
    92849751 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
    92859752 if test $ac_cv_func_setvbuf_reversed = yes; then
    92869753 
    9287 @@ -13667,13 +13736,13 @@
     9754@@ -13667,13 +13748,13 @@
    92889755 fi
    92899756 
    92909757 fi
    92919758-echo "$as_me:13670: checking return type of signal handlers" >&5
    9292 +echo "$as_me:13739: checking return type of signal handlers" >&5
     9759+echo "$as_me:13751: checking return type of signal handlers" >&5
    92939760 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
    92949761 if test "${ac_cv_type_signal+set}" = set; then
    … …  
    92979764   cat >conftest.$ac_ext <<_ACEOF
    92989765-#line 13676 "configure"
    9299 +#line 13745 "configure"
     9766+#line 13757 "configure"
    93009767 #include "confdefs.h"
    93019768 #include <sys/types.h>
    93029769 #include <signal.h>
    9303 @@ -13695,16 +13764,16 @@
     9770@@ -13695,16 +13776,16 @@
    93049771 }
    93059772 _ACEOF
    93069773 rm -f conftest.$ac_objext
    93079774-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
    9308 +if { (eval echo "$as_me:13767: \"$ac_compile\"") >&5
     9775+if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
    93099776   (eval $ac_compile) 2>&5
    93109777   ac_status=$?
    93119778-  echo "$as_me:13701: \$? = $ac_status" >&5
    9312 +  echo "$as_me:13770: \$? = $ac_status" >&5
     9779+  echo "$as_me:13782: \$? = $ac_status" >&5
    93139780   (exit $ac_status); } &&
    93149781          { ac_try='test -s conftest.$ac_objext'
    93159782-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
    9316 +  { (eval echo "$as_me:13773: \"$ac_try\"") >&5
     9783+  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
    93179784   (eval $ac_try) 2>&5
    93189785   ac_status=$?
    93199786-  echo "$as_me:13707: \$? = $ac_status" >&5
    9320 +  echo "$as_me:13776: \$? = $ac_status" >&5
     9787+  echo "$as_me:13788: \$? = $ac_status" >&5
    93219788   (exit $ac_status); }; }; then
    93229789   ac_cv_type_signal=void
    93239790 else
    9324 @@ -13714,21 +13783,21 @@
     9791@@ -13714,21 +13795,21 @@
    93259792 fi
    93269793 rm -f conftest.$ac_objext conftest.$ac_ext
    93279794 fi
    93289795-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
    9329 +echo "$as_me:13786: result: $ac_cv_type_signal" >&5
     9796+echo "$as_me:13798: result: $ac_cv_type_signal" >&5
    93309797 echo "${ECHO_T}$ac_cv_type_signal" >&6
    93319798 
    … …  
    93359802 
    93369803-echo "$as_me:13724: checking for type sigaction_t" >&5
    9337 +echo "$as_me:13793: checking for type sigaction_t" >&5
     9804+echo "$as_me:13805: checking for type sigaction_t" >&5
    93389805 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
    93399806 if test "${cf_cv_type_sigaction+set}" = set; then
    … …  
    93439810        cat >conftest.$ac_ext <<_ACEOF
    93449811-#line 13731 "configure"
    9345 +#line 13800 "configure"
     9812+#line 13812 "configure"
    93469813 #include "confdefs.h"
    93479814 
    93489815 #include <signal.h>
    9349 @@ -13741,16 +13810,16 @@
     9816@@ -13741,16 +13822,16 @@
    93509817 }
    93519818 _ACEOF
    93529819 rm -f conftest.$ac_objext
    93539820-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
    9354 +if { (eval echo "$as_me:13813: \"$ac_compile\"") >&5
     9821+if { (eval echo "$as_me:13825: \"$ac_compile\"") >&5
    93559822   (eval $ac_compile) 2>&5
    93569823   ac_status=$?
    93579824-  echo "$as_me:13747: \$? = $ac_status" >&5
    9358 +  echo "$as_me:13816: \$? = $ac_status" >&5
     9825+  echo "$as_me:13828: \$? = $ac_status" >&5
    93599826   (exit $ac_status); } &&
    93609827          { ac_try='test -s conftest.$ac_objext'
    93619828-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
    9362 +  { (eval echo "$as_me:13819: \"$ac_try\"") >&5
     9829+  { (eval echo "$as_me:13831: \"$ac_try\"") >&5
    93639830   (eval $ac_try) 2>&5
    93649831   ac_status=$?
    93659832-  echo "$as_me:13753: \$? = $ac_status" >&5
    9366 +  echo "$as_me:13822: \$? = $ac_status" >&5
     9833+  echo "$as_me:13834: \$? = $ac_status" >&5
    93679834   (exit $ac_status); }; }; then
    93689835   cf_cv_type_sigaction=yes
    93699836 else
    9370 @@ -13761,13 +13830,13 @@
     9837@@ -13761,13 +13842,13 @@
    93719838 rm -f conftest.$ac_objext conftest.$ac_ext
    93729839 fi
    93739840 
    93749841-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
    9375 +echo "$as_me:13833: result: $cf_cv_type_sigaction" >&5
     9842+echo "$as_me:13845: result: $cf_cv_type_sigaction" >&5
    93769843 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
    93779844 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
    … …  
    93809847 
    93819848-echo "$as_me:13770: checking declaration of size-change" >&5
    9382 +echo "$as_me:13839: checking declaration of size-change" >&5
     9849+echo "$as_me:13851: checking declaration of size-change" >&5
    93839850 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
    93849851 if test "${cf_cv_sizechange+set}" = set; then
    93859852   echo $ECHO_N "(cached) $ECHO_C" >&6
    9386 @@ -13782,7 +13851,7 @@
     9853@@ -13782,7 +13863,7 @@
    93879854     CPPFLAGS="$cf_save_CPPFLAGS"
    93889855     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
    93899856     cat >conftest.$ac_ext <<_ACEOF
    93909857-#line 13785 "configure"
    9391 +#line 13854 "configure"
     9858+#line 13866 "configure"
    93929859 #include "confdefs.h"
    93939860 #include <sys/types.h>
    93949861 #ifdef HAVE_TERMIOS_H
    9395 @@ -13826,16 +13895,16 @@
     9862@@ -13826,16 +13907,16 @@
    93969863 }
    93979864 _ACEOF
    93989865 rm -f conftest.$ac_objext
    93999866-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
    9400 +if { (eval echo "$as_me:13898: \"$ac_compile\"") >&5
     9867+if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
    94019868   (eval $ac_compile) 2>&5
    94029869   ac_status=$?
    94039870-  echo "$as_me:13832: \$? = $ac_status" >&5
    9404 +  echo "$as_me:13901: \$? = $ac_status" >&5
     9871+  echo "$as_me:13913: \$? = $ac_status" >&5
    94059872   (exit $ac_status); } &&
    94069873          { ac_try='test -s conftest.$ac_objext'
    94079874-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
    9408 +  { (eval echo "$as_me:13904: \"$ac_try\"") >&5
     9875+  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
    94099876   (eval $ac_try) 2>&5
    94109877   ac_status=$?
    94119878-  echo "$as_me:13838: \$? = $ac_status" >&5
    9412 +  echo "$as_me:13907: \$? = $ac_status" >&5
     9879+  echo "$as_me:13919: \$? = $ac_status" >&5
    94139880   (exit $ac_status); }; }; then
    94149881   cf_cv_sizechange=yes
    94159882 else
    9416 @@ -13854,7 +13923,7 @@
     9883@@ -13854,7 +13935,7 @@
    94179884 done
    94189885 
    94199886 fi
    94209887-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
    9421 +echo "$as_me:13926: result: $cf_cv_sizechange" >&5
     9888+echo "$as_me:13938: result: $cf_cv_sizechange" >&5
    94229889 echo "${ECHO_T}$cf_cv_sizechange" >&6
    94239890 if test "$cf_cv_sizechange" != no ; then
    94249891        cat >>confdefs.h <<\EOF
    9425 @@ -13871,13 +13940,13 @@
     9892@@ -13871,13 +13952,13 @@
    94269893        esac
    94279894 fi
    94289895 
    94299896-echo "$as_me:13874: checking for memmove" >&5
    9430 +echo "$as_me:13943: checking for memmove" >&5
     9897+echo "$as_me:13955: checking for memmove" >&5
    94319898 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
    94329899 if test "${ac_cv_func_memmove+set}" = set; then
    … …  
    94359902   cat >conftest.$ac_ext <<_ACEOF
    94369903-#line 13880 "configure"
    9437 +#line 13949 "configure"
     9904+#line 13961 "configure"
    94389905 #include "confdefs.h"
    94399906 /* System header to define __stub macros and hopefully few prototypes,
    94409907     which can conflict with char memmove (); below.  */
    9441 @@ -13908,16 +13977,16 @@
     9908@@ -13908,16 +13989,16 @@
    94429909 }
    94439910 _ACEOF
    94449911 rm -f conftest.$ac_objext conftest$ac_exeext
    94459912-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
    9446 +if { (eval echo "$as_me:13980: \"$ac_link\"") >&5
     9913+if { (eval echo "$as_me:13992: \"$ac_link\"") >&5
    94479914   (eval $ac_link) 2>&5
    94489915   ac_status=$?
    94499916-  echo "$as_me:13914: \$? = $ac_status" >&5
    9450 +  echo "$as_me:13983: \$? = $ac_status" >&5
     9917+  echo "$as_me:13995: \$? = $ac_status" >&5
    94519918   (exit $ac_status); } &&
    94529919          { ac_try='test -s conftest$ac_exeext'
    94539920-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
    9454 +  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
     9921+  { (eval echo "$as_me:13998: \"$ac_try\"") >&5
    94559922   (eval $ac_try) 2>&5
    94569923   ac_status=$?
    94579924-  echo "$as_me:13920: \$? = $ac_status" >&5
    9458 +  echo "$as_me:13989: \$? = $ac_status" >&5
     9925+  echo "$as_me:14001: \$? = $ac_status" >&5
    94599926   (exit $ac_status); }; }; then
    94609927   ac_cv_func_memmove=yes
    94619928 else
    9462 @@ -13927,19 +13996,19 @@
     9929@@ -13927,19 +14008,19 @@
    94639930 fi
    94649931 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    94659932 fi
    94669933-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
    9467 +echo "$as_me:13999: result: $ac_cv_func_memmove" >&5
     9934+echo "$as_me:14011: result: $ac_cv_func_memmove" >&5
    94689935 echo "${ECHO_T}$ac_cv_func_memmove" >&6
    94699936 if test $ac_cv_func_memmove = yes; then
    … …  
    94729939 
    94739940-echo "$as_me:13936: checking for bcopy" >&5
    9474 +echo "$as_me:14005: checking for bcopy" >&5
     9941+echo "$as_me:14017: checking for bcopy" >&5
    94759942 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
    94769943 if test "${ac_cv_func_bcopy+set}" = set; then
    … …  
    94799946   cat >conftest.$ac_ext <<_ACEOF
    94809947-#line 13942 "configure"
    9481 +#line 14011 "configure"
     9948+#line 14023 "configure"
    94829949 #include "confdefs.h"
    94839950 /* System header to define __stub macros and hopefully few prototypes,
    94849951     which can conflict with char bcopy (); below.  */
    9485 @@ -13970,16 +14039,16 @@
     9952@@ -13970,16 +14051,16 @@
    94869953 }
    94879954 _ACEOF
    94889955 rm -f conftest.$ac_objext conftest$ac_exeext
    94899956-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
    9490 +if { (eval echo "$as_me:14042: \"$ac_link\"") >&5
     9957+if { (eval echo "$as_me:14054: \"$ac_link\"") >&5
    94919958   (eval $ac_link) 2>&5
    94929959   ac_status=$?
    94939960-  echo "$as_me:13976: \$? = $ac_status" >&5
    9494 +  echo "$as_me:14045: \$? = $ac_status" >&5
     9961+  echo "$as_me:14057: \$? = $ac_status" >&5
    94959962   (exit $ac_status); } &&
    94969963          { ac_try='test -s conftest$ac_exeext'
    94979964-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
    9498 +  { (eval echo "$as_me:14048: \"$ac_try\"") >&5
     9965+  { (eval echo "$as_me:14060: \"$ac_try\"") >&5
    94999966   (eval $ac_try) 2>&5
    95009967   ac_status=$?
    95019968-  echo "$as_me:13982: \$? = $ac_status" >&5
    9502 +  echo "$as_me:14051: \$? = $ac_status" >&5
     9969+  echo "$as_me:14063: \$? = $ac_status" >&5
    95039970   (exit $ac_status); }; }; then
    95049971   ac_cv_func_bcopy=yes
    95059972 else
    9506 @@ -13989,11 +14058,11 @@
     9973@@ -13989,11 +14070,11 @@
    95079974 fi
    95089975 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    95099976 fi
    95109977-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
    9511 +echo "$as_me:14061: result: $ac_cv_func_bcopy" >&5
     9978+echo "$as_me:14073: result: $ac_cv_func_bcopy" >&5
    95129979 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
    95139980 if test $ac_cv_func_bcopy = yes; then
    95149981 
    95159982-       echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
    9516 +       echo "$as_me:14065: checking if bcopy does overlapping moves" >&5
     9983+       echo "$as_me:14077: checking if bcopy does overlapping moves" >&5
    95179984 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
    95189985 if test "${cf_cv_good_bcopy+set}" = set; then
    95199986   echo $ECHO_N "(cached) $ECHO_C" >&6
    9520 @@ -14003,7 +14072,7 @@
     9987@@ -14003,7 +14084,7 @@
    95219988   cf_cv_good_bcopy=unknown
    95229989 else
    95239990   cat >conftest.$ac_ext <<_ACEOF
    95249991-#line 14006 "configure"
    9525 +#line 14075 "configure"
     9992+#line 14087 "configure"
    95269993 #include "confdefs.h"
    95279994 
    95289995 int main() {
    9529 @@ -14017,15 +14086,15 @@
     9996@@ -14017,15 +14098,15 @@
    95309997 
    95319998 _ACEOF
    95329999 rm -f conftest$ac_exeext
    953310000-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
    9534 +if { (eval echo "$as_me:14089: \"$ac_link\"") >&5
     10001+if { (eval echo "$as_me:14101: \"$ac_link\"") >&5
    953510002   (eval $ac_link) 2>&5
    953610003   ac_status=$?
    953710004-  echo "$as_me:14023: \$? = $ac_status" >&5
    9538 +  echo "$as_me:14092: \$? = $ac_status" >&5
     10005+  echo "$as_me:14104: \$? = $ac_status" >&5
    953910006   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    954010007-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
    9541 +  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
     10008+  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
    954210009   (eval $ac_try) 2>&5
    954310010   ac_status=$?
    954410011-  echo "$as_me:14028: \$? = $ac_status" >&5
    9545 +  echo "$as_me:14097: \$? = $ac_status" >&5
     10012+  echo "$as_me:14109: \$? = $ac_status" >&5
    954610013   (exit $ac_status); }; }; then
    954710014   cf_cv_good_bcopy=yes
    954810015 else
    9549 @@ -14038,7 +14107,7 @@
     10016@@ -14038,7 +14119,7 @@
    955010017 fi
    955110018 
    955210019 fi
    955310020-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
    9554 +echo "$as_me:14110: result: $cf_cv_good_bcopy" >&5
     10021+echo "$as_me:14122: result: $cf_cv_good_bcopy" >&5
    955510022 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
    955610023 
    955710024 else
    9558 @@ -14059,7 +14128,7 @@
     10025@@ -14059,7 +14140,7 @@
    955910026 
    956010027 fi
    956110028 
    956210029-echo "$as_me:14062: checking if poll really works" >&5
    9563 +echo "$as_me:14131: checking if poll really works" >&5
     10030+echo "$as_me:14143: checking if poll really works" >&5
    956410031 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
    956510032 if test "${cf_cv_working_poll+set}" = set; then
    956610033   echo $ECHO_N "(cached) $ECHO_C" >&6
    9567 @@ -14069,7 +14138,7 @@
     10034@@ -14069,7 +14150,7 @@
    956810035   cf_cv_working_poll=unknown
    956910036 else
    957010037   cat >conftest.$ac_ext <<_ACEOF
    957110038-#line 14072 "configure"
    9572 +#line 14141 "configure"
     10039+#line 14153 "configure"
    957310040 #include "confdefs.h"
    957410041 
    957510042 #include <stdio.h>
    9576 @@ -14090,15 +14159,15 @@
     10043@@ -14090,15 +14171,15 @@
    957710044 }
    957810045 _ACEOF
    957910046 rm -f conftest$ac_exeext
    958010047-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
    9581 +if { (eval echo "$as_me:14162: \"$ac_link\"") >&5
     10048+if { (eval echo "$as_me:14174: \"$ac_link\"") >&5
    958210049   (eval $ac_link) 2>&5
    958310050   ac_status=$?
    958410051-  echo "$as_me:14096: \$? = $ac_status" >&5
    9585 +  echo "$as_me:14165: \$? = $ac_status" >&5
     10052+  echo "$as_me:14177: \$? = $ac_status" >&5
    958610053   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    958710054-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
    9588 +  { (eval echo "$as_me:14167: \"$ac_try\"") >&5
     10055+  { (eval echo "$as_me:14179: \"$ac_try\"") >&5
    958910056   (eval $ac_try) 2>&5
    959010057   ac_status=$?
    959110058-  echo "$as_me:14101: \$? = $ac_status" >&5
    9592 +  echo "$as_me:14170: \$? = $ac_status" >&5
     10059+  echo "$as_me:14182: \$? = $ac_status" >&5
    959310060   (exit $ac_status); }; }; then
    959410061   cf_cv_working_poll=yes
    959510062 else
    9596 @@ -14110,7 +14179,7 @@
     10063@@ -14110,7 +14191,7 @@
    959710064 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    959810065 fi
    959910066 fi
    960010067-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
    9601 +echo "$as_me:14182: result: $cf_cv_working_poll" >&5
     10068+echo "$as_me:14194: result: $cf_cv_working_poll" >&5
    960210069 echo "${ECHO_T}$cf_cv_working_poll" >&6
    960310070 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
    960410071 #define HAVE_WORKING_POLL 1
    9605 @@ -14118,7 +14187,7 @@
     10072@@ -14118,7 +14199,7 @@
    960610073 
    960710074 # special check for test/ditto.c
    960810075 
    960910076-echo "$as_me:14121: checking for openpty in -lutil" >&5
    9610 +echo "$as_me:14190: checking for openpty in -lutil" >&5
     10077+echo "$as_me:14202: checking for openpty in -lutil" >&5
    961110078 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
    961210079 if test "${ac_cv_lib_util_openpty+set}" = set; then
    961310080   echo $ECHO_N "(cached) $ECHO_C" >&6
    9614 @@ -14126,7 +14195,7 @@
     10081@@ -14126,7 +14207,7 @@
    961510082   ac_check_lib_save_LIBS=$LIBS
    961610083 LIBS="-lutil  $LIBS"
    961710084 cat >conftest.$ac_ext <<_ACEOF
    961810085-#line 14129 "configure"
    9619 +#line 14198 "configure"
     10086+#line 14210 "configure"
    962010087 #include "confdefs.h"
    962110088 
    962210089 /* Override any gcc2 internal prototype to avoid an error.  */
    9623 @@ -14145,16 +14214,16 @@
     10090@@ -14145,16 +14226,16 @@
    962410091 }
    962510092 _ACEOF
    962610093 rm -f conftest.$ac_objext conftest$ac_exeext
    962710094-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
    9628 +if { (eval echo "$as_me:14217: \"$ac_link\"") >&5
     10095+if { (eval echo "$as_me:14229: \"$ac_link\"") >&5
    962910096   (eval $ac_link) 2>&5
    963010097   ac_status=$?
    963110098-  echo "$as_me:14151: \$? = $ac_status" >&5
    9632 +  echo "$as_me:14220: \$? = $ac_status" >&5
     10099+  echo "$as_me:14232: \$? = $ac_status" >&5
    963310100   (exit $ac_status); } &&
    963410101          { ac_try='test -s conftest$ac_exeext'
    963510102-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
    9636 +  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
     10103+  { (eval echo "$as_me:14235: \"$ac_try\"") >&5
    963710104   (eval $ac_try) 2>&5
    963810105   ac_status=$?
    963910106-  echo "$as_me:14157: \$? = $ac_status" >&5
    9640 +  echo "$as_me:14226: \$? = $ac_status" >&5
     10107+  echo "$as_me:14238: \$? = $ac_status" >&5
    964110108   (exit $ac_status); }; }; then
    964210109   ac_cv_lib_util_openpty=yes
    964310110 else
    9644 @@ -14165,7 +14234,7 @@
     10111@@ -14165,7 +14246,7 @@
    964510112 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    964610113 LIBS=$ac_check_lib_save_LIBS
    964710114 fi
    964810115-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
    9649 +echo "$as_me:14237: result: $ac_cv_lib_util_openpty" >&5
     10116+echo "$as_me:14249: result: $ac_cv_lib_util_openpty" >&5
    965010117 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
    965110118 if test $ac_cv_lib_util_openpty = yes; then
    965210119   cf_cv_lib_util=yes
    9653 @@ -14173,7 +14242,7 @@
     10120@@ -14173,7 +14254,7 @@
    965410121   cf_cv_lib_util=no
    965510122 fi
    965610123 
    965710124-echo "$as_me:14176: checking for openpty header" >&5
    9658 +echo "$as_me:14245: checking for openpty header" >&5
     10125+echo "$as_me:14257: checking for openpty header" >&5
    965910126 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
    966010127 if test "${cf_cv_func_openpty+set}" = set; then
    966110128   echo $ECHO_N "(cached) $ECHO_C" >&6
    9662 @@ -14184,7 +14253,7 @@
     10129@@ -14184,7 +14265,7 @@
    966310130     for cf_header in pty.h libutil.h util.h
    966410131     do
    966510132     cat >conftest.$ac_ext <<_ACEOF
    966610133-#line 14187 "configure"
    9667 +#line 14256 "configure"
     10134+#line 14268 "configure"
    966810135 #include "confdefs.h"
    966910136 
    967010137 #include <$cf_header>
    9671 @@ -14201,16 +14270,16 @@
     10138@@ -14201,16 +14282,16 @@
    967210139 }
    967310140 _ACEOF
    967410141 rm -f conftest.$ac_objext conftest$ac_exeext
    967510142-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
    9676 +if { (eval echo "$as_me:14273: \"$ac_link\"") >&5
     10143+if { (eval echo "$as_me:14285: \"$ac_link\"") >&5
    967710144   (eval $ac_link) 2>&5
    967810145   ac_status=$?
    967910146-  echo "$as_me:14207: \$? = $ac_status" >&5
    9680 +  echo "$as_me:14276: \$? = $ac_status" >&5
     10147+  echo "$as_me:14288: \$? = $ac_status" >&5
    968110148   (exit $ac_status); } &&
    968210149          { ac_try='test -s conftest$ac_exeext'
    968310150-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
    9684 +  { (eval echo "$as_me:14279: \"$ac_try\"") >&5
     10151+  { (eval echo "$as_me:14291: \"$ac_try\"") >&5
    968510152   (eval $ac_try) 2>&5
    968610153   ac_status=$?
    968710154-  echo "$as_me:14213: \$? = $ac_status" >&5
    9688 +  echo "$as_me:14282: \$? = $ac_status" >&5
     10155+  echo "$as_me:14294: \$? = $ac_status" >&5
    968910156   (exit $ac_status); }; }; then
    969010157 
    969110158         cf_cv_func_openpty=$cf_header
    9692 @@ -14228,7 +14297,7 @@
     10159@@ -14228,7 +14309,7 @@
    969310160     LIBS="$cf_save_LIBS"
    969410161 
    969510162 fi
    969610163-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
    9697 +echo "$as_me:14300: result: $cf_cv_func_openpty" >&5
     10164+echo "$as_me:14312: result: $cf_cv_func_openpty" >&5
    969810165 echo "${ECHO_T}$cf_cv_func_openpty" >&6
    969910166 
    970010167 if test "$cf_cv_func_openpty" != no ; then
    9701 @@ -14280,7 +14349,7 @@
     10168@@ -14274,13 +14355,13 @@
     10169                fi
     10170 
     10171                if test "$cf_have_incdir" = no ; then
     10172-          if test "$cf_add_incdir" = /usr/local/include ; then
     10173+                 if test "$cf_add_incdir" = /usr/local/include ; then
     10174                        if test "$GCC" = yes
     10175                        then
    970210176                          cf_save_CPPFLAGS=$CPPFLAGS
    970310177                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    970410178                          cat >conftest.$ac_ext <<_ACEOF
    970510179-#line 14283 "configure"
    9706 +#line 14352 "configure"
     10180+#line 14364 "configure"
    970710181 #include "confdefs.h"
    970810182 #include <stdio.h>
    970910183 int
    9710 @@ -14292,16 +14361,16 @@
     10184@@ -14292,16 +14373,16 @@
    971110185 }
    971210186 _ACEOF
    971310187 rm -f conftest.$ac_objext
    971410188-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
    9715 +if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5
     10189+if { (eval echo "$as_me:14376: \"$ac_compile\"") >&5
    971610190   (eval $ac_compile) 2>&5
    971710191   ac_status=$?
    971810192-  echo "$as_me:14298: \$? = $ac_status" >&5
    9719 +  echo "$as_me:14367: \$? = $ac_status" >&5
     10193+  echo "$as_me:14379: \$? = $ac_status" >&5
    972010194   (exit $ac_status); } &&
    972110195          { ac_try='test -s conftest.$ac_objext'
    972210196-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
    9723 +  { (eval echo "$as_me:14370: \"$ac_try\"") >&5
     10197+  { (eval echo "$as_me:14382: \"$ac_try\"") >&5
    972410198   (eval $ac_try) 2>&5
    972510199   ac_status=$?
    972610200-  echo "$as_me:14304: \$? = $ac_status" >&5
    9727 +  echo "$as_me:14373: \$? = $ac_status" >&5
     10201+  echo "$as_me:14385: \$? = $ac_status" >&5
    972810202   (exit $ac_status); }; }; then
    972910203   :
    973010204 else
    9731 @@ -14318,7 +14387,7 @@
     10205@@ -14318,13 +14399,13 @@
    973210206                if test "$cf_have_incdir" = no ; then
    973310207                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    973410208 
    973510209-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
    9736 +echo "${as_me-configure}:14390: testing adding $cf_add_incdir to include-path ..." 1>&5
     10210+echo "${as_me-configure}:14402: testing adding $cf_add_incdir to include-path ..." 1>&5
    973710211 
    973810212                  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
    973910213 
    9740 @@ -14352,7 +14421,7 @@
     10214-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     10215-          test "$cf_top_incdir" = "$cf_add_incdir" && break
     10216-          cf_add_incdir="$cf_top_incdir"
     10217+                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
     10218+                 test "$cf_top_incdir" = "$cf_add_incdir" && break
     10219+                 cf_add_incdir="$cf_top_incdir"
     10220                else
     10221                  break
     10222                fi
     10223@@ -14352,7 +14433,7 @@
    974110224       if test "$cf_have_libdir" = no ; then
    974210225         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    974310226 
    974410227-echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
    9745 +echo "${as_me-configure}:14424: testing adding $cf_add_libdir to library-path ..." 1>&5
     10228+echo "${as_me-configure}:14436: testing adding $cf_add_libdir to library-path ..." 1>&5
    974610229 
    974710230         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    974810231       fi
    9749 @@ -14363,23 +14432,23 @@
     10232@@ -14363,23 +14444,23 @@
    975010233     fi
    975110234 esac
    975210235 
    975310236-echo "$as_me:14366: checking for db.h" >&5
    9754 +echo "$as_me:14435: checking for db.h" >&5
     10237+echo "$as_me:14447: checking for db.h" >&5
    975510238 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
    975610239 if test "${ac_cv_header_db_h+set}" = set; then
    … …  
    975910242   cat >conftest.$ac_ext <<_ACEOF
    976010243-#line 14372 "configure"
    9761 +#line 14441 "configure"
     10244+#line 14453 "configure"
    976210245 #include "confdefs.h"
    976310246 #include <db.h>
    976410247 _ACEOF
    976510248-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
    9766 +if { (eval echo "$as_me:14445: \"$ac_cpp conftest.$ac_ext\"") >&5
     10249+if { (eval echo "$as_me:14457: \"$ac_cpp conftest.$ac_ext\"") >&5
    976710250   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    976810251   ac_status=$?
    … …  
    977110254   cat conftest.err >&5
    977210255-  echo "$as_me:14382: \$? = $ac_status" >&5
    9773 +  echo "$as_me:14451: \$? = $ac_status" >&5
     10256+  echo "$as_me:14463: \$? = $ac_status" >&5
    977410257   (exit $ac_status); } >/dev/null; then
    977510258   if test -s conftest.err; then
    977610259     ac_cpp_err=$ac_c_preproc_warn_flag
    9777 @@ -14398,11 +14467,11 @@
     10260@@ -14398,11 +14479,11 @@
    977810261 fi
    977910262 rm -f conftest.err conftest.$ac_ext
    978010263 fi
    978110264-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
    9782 +echo "$as_me:14470: result: $ac_cv_header_db_h" >&5
     10265+echo "$as_me:14482: result: $ac_cv_header_db_h" >&5
    978310266 echo "${ECHO_T}$ac_cv_header_db_h" >&6
    978410267 if test $ac_cv_header_db_h = yes; then
    978510268 
    978610269-echo "$as_me:14405: checking for version of db" >&5
    9787 +echo "$as_me:14474: checking for version of db" >&5
     10270+echo "$as_me:14486: checking for version of db" >&5
    978810271 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
    978910272 if test "${cf_cv_hashed_db_version+set}" = set; then
    979010273   echo $ECHO_N "(cached) $ECHO_C" >&6
    9791 @@ -14413,10 +14482,10 @@
     10274@@ -14413,10 +14494,10 @@
    979210275 for cf_db_version in 1 2 3 4 5
    979310276 do
    979410277 
    979510278-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
    9796 +echo "${as_me-configure}:14485: testing checking for db version $cf_db_version ..." 1>&5
     10279+echo "${as_me-configure}:14497: testing checking for db version $cf_db_version ..." 1>&5
    979710280 
    979810281        cat >conftest.$ac_ext <<_ACEOF
    979910282-#line 14419 "configure"
    9800 +#line 14488 "configure"
     10283+#line 14500 "configure"
    980110284 #include "confdefs.h"
    980210285 
    980310286 $ac_includes_default
    9804 @@ -14446,16 +14515,16 @@
     10287@@ -14446,16 +14527,16 @@
    980510288 }
    980610289 _ACEOF
    980710290 rm -f conftest.$ac_objext
    980810291-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
    9809 +if { (eval echo "$as_me:14518: \"$ac_compile\"") >&5
     10292+if { (eval echo "$as_me:14530: \"$ac_compile\"") >&5
    981010293   (eval $ac_compile) 2>&5
    981110294   ac_status=$?
    981210295-  echo "$as_me:14452: \$? = $ac_status" >&5
    9813 +  echo "$as_me:14521: \$? = $ac_status" >&5
     10296+  echo "$as_me:14533: \$? = $ac_status" >&5
    981410297   (exit $ac_status); } &&
    981510298          { ac_try='test -s conftest.$ac_objext'
    981610299-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
    9817 +  { (eval echo "$as_me:14524: \"$ac_try\"") >&5
     10300+  { (eval echo "$as_me:14536: \"$ac_try\"") >&5
    981810301   (eval $ac_try) 2>&5
    981910302   ac_status=$?
    982010303-  echo "$as_me:14458: \$? = $ac_status" >&5
    9821 +  echo "$as_me:14527: \$? = $ac_status" >&5
     10304+  echo "$as_me:14539: \$? = $ac_status" >&5
    982210305   (exit $ac_status); }; }; then
    982310306 
    982410307        cf_cv_hashed_db_version=$cf_db_version
    9825 @@ -14469,16 +14538,16 @@
     10308@@ -14469,16 +14550,16 @@
    982610309 done
    982710310 
    982810311 fi
    982910312-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
    9830 +echo "$as_me:14541: result: $cf_cv_hashed_db_version" >&5
     10313+echo "$as_me:14553: result: $cf_cv_hashed_db_version" >&5
    983110314 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
    983210315 
    983310316 if test "$cf_cv_hashed_db_version" = unknown ; then
    983410317-       { { echo "$as_me:14476: error: Cannot determine version of db" >&5
    9835 +       { { echo "$as_me:14545: error: Cannot determine version of db" >&5
     10318+       { { echo "$as_me:14557: error: Cannot determine version of db" >&5
    983610319 echo "$as_me: error: Cannot determine version of db" >&2;}
    983710320    { (exit 1); exit 1; }; }
    … …  
    983910322 
    984010323-echo "$as_me:14481: checking for db libraries" >&5
    9841 +echo "$as_me:14550: checking for db libraries" >&5
     10324+echo "$as_me:14562: checking for db libraries" >&5
    984210325 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
    984310326 if test "${cf_cv_hashed_db_libs+set}" = set; then
    984410327   echo $ECHO_N "(cached) $ECHO_C" >&6
    9845 @@ -14492,10 +14561,10 @@
     10328@@ -14492,10 +14573,10 @@
    984610329                LIBS="-l$cf_db_libs $LIBS"
    984710330        fi
    984810331 
    984910332-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
    9850 +echo "${as_me-configure}:14564: testing checking for library "$cf_db_libs" ..." 1>&5
     10333+echo "${as_me-configure}:14576: testing checking for library "$cf_db_libs" ..." 1>&5
    985110334 
    985210335        cat >conftest.$ac_ext <<_ACEOF
    985310336-#line 14498 "configure"
    9854 +#line 14567 "configure"
     10337+#line 14579 "configure"
    985510338 #include "confdefs.h"
    985610339 
    985710340 $ac_includes_default
    9858 @@ -14550,16 +14619,16 @@
     10341@@ -14550,16 +14631,16 @@
    985910342 }
    986010343 _ACEOF
    986110344 rm -f conftest.$ac_objext conftest$ac_exeext
    986210345-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
    9863 +if { (eval echo "$as_me:14622: \"$ac_link\"") >&5
     10346+if { (eval echo "$as_me:14634: \"$ac_link\"") >&5
    986410347   (eval $ac_link) 2>&5
    986510348   ac_status=$?
    986610349-  echo "$as_me:14556: \$? = $ac_status" >&5
    9867 +  echo "$as_me:14625: \$? = $ac_status" >&5
     10350+  echo "$as_me:14637: \$? = $ac_status" >&5
    986810351   (exit $ac_status); } &&
    986910352          { ac_try='test -s conftest$ac_exeext'
    987010353-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
    9871 +  { (eval echo "$as_me:14628: \"$ac_try\"") >&5
     10354+  { (eval echo "$as_me:14640: \"$ac_try\"") >&5
    987210355   (eval $ac_try) 2>&5
    987310356   ac_status=$?
    987410357-  echo "$as_me:14562: \$? = $ac_status" >&5
    9875 +  echo "$as_me:14631: \$? = $ac_status" >&5
     10358+  echo "$as_me:14643: \$? = $ac_status" >&5
    987610359   (exit $ac_status); }; }; then
    987710360 
    987810361        if test -n "$cf_db_libs" ; then
    9879 @@ -14579,11 +14648,11 @@
     10362@@ -14579,11 +14660,11 @@
    988010363 done
    988110364 
    988210365 fi
    988310366-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
    9884 +echo "$as_me:14651: result: $cf_cv_hashed_db_libs" >&5
     10367+echo "$as_me:14663: result: $cf_cv_hashed_db_libs" >&5
    988510368 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
    988610369 
    988710370        if test "$cf_cv_hashed_db_libs" = unknown ; then
    988810371-               { { echo "$as_me:14586: error: Cannot determine library for db" >&5
    9889 +               { { echo "$as_me:14655: error: Cannot determine library for db" >&5
     10372+               { { echo "$as_me:14667: error: Cannot determine library for db" >&5
    989010373 echo "$as_me: error: Cannot determine library for db" >&2;}
    989110374    { (exit 1); exit 1; }; }
    989210375        elif test "$cf_cv_hashed_db_libs" != default ; then
    9893 @@ -14593,7 +14662,7 @@
     10376@@ -14593,7 +14674,7 @@
    989410377 
    989510378 else
    989610379 
    989710380-       { { echo "$as_me:14596: error: Cannot find db.h" >&5
    9898 +       { { echo "$as_me:14665: error: Cannot find db.h" >&5
     10381+       { { echo "$as_me:14677: error: Cannot find db.h" >&5
    989910382 echo "$as_me: error: Cannot find db.h" >&2;}
    990010383    { (exit 1); exit 1; }; }
    990110384 
    9902 @@ -14608,7 +14677,7 @@
     10385@@ -14608,7 +14689,7 @@
    990310386 
    990410387 # Just in case, check if the C compiler has a bool type.
    990510388 
    990610389-echo "$as_me:14611: checking if we should include stdbool.h" >&5
    9907 +echo "$as_me:14680: checking if we should include stdbool.h" >&5
     10390+echo "$as_me:14692: checking if we should include stdbool.h" >&5
    990810391 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    990910392 
    991010393 if test "${cf_cv_header_stdbool_h+set}" = set; then
    9911 @@ -14616,7 +14685,7 @@
     10394@@ -14616,7 +14697,7 @@
    991210395 else
    991310396 
    991410397        cat >conftest.$ac_ext <<_ACEOF
    991510398-#line 14619 "configure"
    9916 +#line 14688 "configure"
     10399+#line 14700 "configure"
    991710400 #include "confdefs.h"
    991810401 
    991910402 int
    9920 @@ -14628,23 +14697,23 @@
     10403@@ -14628,23 +14709,23 @@
    992110404 }
    992210405 _ACEOF
    992310406 rm -f conftest.$ac_objext
    992410407-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
    9925 +if { (eval echo "$as_me:14700: \"$ac_compile\"") >&5
     10408+if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
    992610409   (eval $ac_compile) 2>&5
    992710410   ac_status=$?
    992810411-  echo "$as_me:14634: \$? = $ac_status" >&5
    9929 +  echo "$as_me:14703: \$? = $ac_status" >&5
     10412+  echo "$as_me:14715: \$? = $ac_status" >&5
    993010413   (exit $ac_status); } &&
    993110414          { ac_try='test -s conftest.$ac_objext'
    993210415-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
    9933 +  { (eval echo "$as_me:14706: \"$ac_try\"") >&5
     10416+  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
    993410417   (eval $ac_try) 2>&5
    993510418   ac_status=$?
    993610419-  echo "$as_me:14640: \$? = $ac_status" >&5
    9937 +  echo "$as_me:14709: \$? = $ac_status" >&5
     10420+  echo "$as_me:14721: \$? = $ac_status" >&5
    993810421   (exit $ac_status); }; }; then
    993910422   cf_cv_header_stdbool_h=0
    … …  
    994310426 cat >conftest.$ac_ext <<_ACEOF
    994410427-#line 14647 "configure"
    9945 +#line 14716 "configure"
     10428+#line 14728 "configure"
    994610429 #include "confdefs.h"
    994710430 
    994810431 #ifndef __BEOS__
    9949 @@ -14660,16 +14729,16 @@
     10432@@ -14660,16 +14741,16 @@
    995010433 }
    995110434 _ACEOF
    995210435 rm -f conftest.$ac_objext
    995310436-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
    9954 +if { (eval echo "$as_me:14732: \"$ac_compile\"") >&5
     10437+if { (eval echo "$as_me:14744: \"$ac_compile\"") >&5
    995510438   (eval $ac_compile) 2>&5
    995610439   ac_status=$?
    995710440-  echo "$as_me:14666: \$? = $ac_status" >&5
    9958 +  echo "$as_me:14735: \$? = $ac_status" >&5
     10441+  echo "$as_me:14747: \$? = $ac_status" >&5
    995910442   (exit $ac_status); } &&
    996010443          { ac_try='test -s conftest.$ac_objext'
    996110444-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
    9962 +  { (eval echo "$as_me:14738: \"$ac_try\"") >&5
     10445+  { (eval echo "$as_me:14750: \"$ac_try\"") >&5
    996310446   (eval $ac_try) 2>&5
    996410447   ac_status=$?
    996510448-  echo "$as_me:14672: \$? = $ac_status" >&5
    9966 +  echo "$as_me:14741: \$? = $ac_status" >&5
     10449+  echo "$as_me:14753: \$? = $ac_status" >&5
    996710450   (exit $ac_status); }; }; then
    996810451   cf_cv_header_stdbool_h=1
    996910452 else
    9970 @@ -14683,13 +14752,13 @@
     10453@@ -14683,13 +14764,13 @@
    997110454 fi
    997210455 
    997310456 if test "$cf_cv_header_stdbool_h" = 1
    997410457-then   echo "$as_me:14686: result: yes" >&5
    9975 +then   echo "$as_me:14755: result: yes" >&5
     10458+then   echo "$as_me:14767: result: yes" >&5
    997610459 echo "${ECHO_T}yes" >&6
    997710460-else   echo "$as_me:14688: result: no" >&5
    9978 +else   echo "$as_me:14757: result: no" >&5
     10461+else   echo "$as_me:14769: result: no" >&5
    997910462 echo "${ECHO_T}no" >&6
    998010463 fi
    998110464 
    998210465-echo "$as_me:14692: checking for builtin bool type" >&5
    9983 +echo "$as_me:14761: checking for builtin bool type" >&5
     10466+echo "$as_me:14773: checking for builtin bool type" >&5
    998410467 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    998510468 
    998610469 if test "${cf_cv_cc_bool_type+set}" = set; then
    9987 @@ -14697,7 +14766,7 @@
     10470@@ -14697,7 +14778,7 @@
    998810471 else
    998910472 
    999010473        cat >conftest.$ac_ext <<_ACEOF
    999110474-#line 14700 "configure"
    9992 +#line 14769 "configure"
     10475+#line 14781 "configure"
    999310476 #include "confdefs.h"
    999410477 
    999510478 #include <stdio.h>
    9996 @@ -14712,16 +14781,16 @@
     10479@@ -14712,16 +14793,16 @@
    999710480 }
    999810481 _ACEOF
    999910482 rm -f conftest.$ac_objext
    1000010483-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
    10001 +if { (eval echo "$as_me:14784: \"$ac_compile\"") >&5
     10484+if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
    1000210485   (eval $ac_compile) 2>&5
    1000310486   ac_status=$?
    1000410487-  echo "$as_me:14718: \$? = $ac_status" >&5
    10005 +  echo "$as_me:14787: \$? = $ac_status" >&5
     10488+  echo "$as_me:14799: \$? = $ac_status" >&5
    1000610489   (exit $ac_status); } &&
    1000710490          { ac_try='test -s conftest.$ac_objext'
    1000810491-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
    10009 +  { (eval echo "$as_me:14790: \"$ac_try\"") >&5
     10492+  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
    1001010493   (eval $ac_try) 2>&5
    1001110494   ac_status=$?
    1001210495-  echo "$as_me:14724: \$? = $ac_status" >&5
    10013 +  echo "$as_me:14793: \$? = $ac_status" >&5
     10496+  echo "$as_me:14805: \$? = $ac_status" >&5
    1001410497   (exit $ac_status); }; }; then
    1001510498   cf_cv_cc_bool_type=1
    1001610499 else
    10017 @@ -14734,9 +14803,9 @@
     10500@@ -14734,9 +14815,9 @@
    1001810501 fi
    1001910502 
    1002010503 if test "$cf_cv_cc_bool_type" = 1
    1002110504-then   echo "$as_me:14737: result: yes" >&5
    10022 +then   echo "$as_me:14806: result: yes" >&5
     10505+then   echo "$as_me:14818: result: yes" >&5
    1002310506 echo "${ECHO_T}yes" >&6
    1002410507-else   echo "$as_me:14739: result: no" >&5
    10025 +else   echo "$as_me:14808: result: no" >&5
     10508+else   echo "$as_me:14820: result: no" >&5
    1002610509 echo "${ECHO_T}no" >&6
    1002710510 fi
    1002810511 
    10029 @@ -14758,7 +14827,7 @@
     10512@@ -14758,7 +14839,7 @@
    1003010513        cf_stdcpp_libname=stdc++
    1003110514        ;;
    1003210515 esac
    1003310516-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
    10034 +echo "$as_me:14830: checking for library $cf_stdcpp_libname" >&5
     10517+echo "$as_me:14842: checking for library $cf_stdcpp_libname" >&5
    1003510518 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
    1003610519 if test "${cf_cv_libstdcpp+set}" = set; then
    1003710520   echo $ECHO_N "(cached) $ECHO_C" >&6
    10038 @@ -14767,7 +14836,7 @@
     10521@@ -14767,7 +14848,7 @@
    1003910522        cf_save="$LIBS"
    1004010523        LIBS="$LIBS -l$cf_stdcpp_libname"
    1004110524 cat >conftest.$ac_ext <<_ACEOF
    1004210525-#line 14770 "configure"
    10043 +#line 14839 "configure"
     10526+#line 14851 "configure"
    1004410527 #include "confdefs.h"
    1004510528 
    1004610529 #include <strstream.h>
    10047 @@ -14783,16 +14852,16 @@
     10530@@ -14783,16 +14864,16 @@
    1004810531 }
    1004910532 _ACEOF
    1005010533 rm -f conftest.$ac_objext conftest$ac_exeext
    1005110534-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
    10052 +if { (eval echo "$as_me:14855: \"$ac_link\"") >&5
     10535+if { (eval echo "$as_me:14867: \"$ac_link\"") >&5
    1005310536   (eval $ac_link) 2>&5
    1005410537   ac_status=$?
    1005510538-  echo "$as_me:14789: \$? = $ac_status" >&5
    10056 +  echo "$as_me:14858: \$? = $ac_status" >&5
     10539+  echo "$as_me:14870: \$? = $ac_status" >&5
    1005710540   (exit $ac_status); } &&
    1005810541          { ac_try='test -s conftest$ac_exeext'
    1005910542-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
    10060 +  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
     10543+  { (eval echo "$as_me:14873: \"$ac_try\"") >&5
    1006110544   (eval $ac_try) 2>&5
    1006210545   ac_status=$?
    1006310546-  echo "$as_me:14795: \$? = $ac_status" >&5
    10064 +  echo "$as_me:14864: \$? = $ac_status" >&5
     10547+  echo "$as_me:14876: \$? = $ac_status" >&5
    1006510548   (exit $ac_status); }; }; then
    1006610549   cf_cv_libstdcpp=yes
    1006710550 else
    10068 @@ -14804,12 +14873,12 @@
     10551@@ -14804,12 +14885,12 @@
    1006910552        LIBS="$cf_save"
    1007010553 
    1007110554 fi
    1007210555-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
    10073 +echo "$as_me:14876: result: $cf_cv_libstdcpp" >&5
     10556+echo "$as_me:14888: result: $cf_cv_libstdcpp" >&5
    1007410557 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
    1007510558 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
    … …  
    1007710560 
    1007810561-       echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
    10079 +       echo "$as_me:14881: checking whether $CXX understands -c and -o together" >&5
     10562+       echo "$as_me:14893: checking whether $CXX understands -c and -o together" >&5
    1008010563 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
    1008110564 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
    1008210565   echo $ECHO_N "(cached) $ECHO_C" >&6
    10083 @@ -14825,15 +14894,15 @@
     10566@@ -14825,15 +14906,15 @@
    1008410567 # We do the test twice because some compilers refuse to overwrite an
    1008510568 # existing .o file with -o, though they will create one.
    1008610569 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    1008710570-if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
    10088 +if { (eval echo "$as_me:14897: \"$ac_try\"") >&5
     10571+if { (eval echo "$as_me:14909: \"$ac_try\"") >&5
    1008910572   (eval $ac_try) 2>&5
    1009010573   ac_status=$?
    1009110574-  echo "$as_me:14831: \$? = $ac_status" >&5
    10092 +  echo "$as_me:14900: \$? = $ac_status" >&5
     10575+  echo "$as_me:14912: \$? = $ac_status" >&5
    1009310576   (exit $ac_status); } &&
    1009410577-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    10095 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:14902: \"$ac_try\"") >&5
     10578+  test -f conftest2.$ac_objext && { (eval echo "$as_me:14914: \"$ac_try\"") >&5
    1009610579   (eval $ac_try) 2>&5
    1009710580   ac_status=$?
    1009810581-  echo "$as_me:14836: \$? = $ac_status" >&5
    10099 +  echo "$as_me:14905: \$? = $ac_status" >&5
     10582+  echo "$as_me:14917: \$? = $ac_status" >&5
    1010010583   (exit $ac_status); };
    1010110584 then
    1010210585   eval cf_cv_prog_CXX_c_o=yes
    10103 @@ -14844,10 +14913,10 @@
     10586@@ -14844,10 +14925,10 @@
    1010410587 
    1010510588 fi
    1010610589 if test $cf_cv_prog_CXX_c_o = yes; then
    1010710590-  echo "$as_me:14847: result: yes" >&5
    10108 +  echo "$as_me:14916: result: yes" >&5
     10591+  echo "$as_me:14928: result: yes" >&5
    1010910592 echo "${ECHO_T}yes" >&6
    1011010593 else
    1011110594-  echo "$as_me:14850: result: no" >&5
    10112 +  echo "$as_me:14919: result: no" >&5
     10595+  echo "$as_me:14931: result: no" >&5
    1011310596 echo "${ECHO_T}no" >&6
    1011410597 fi
    1011510598 
    10116 @@ -14867,12 +14936,12 @@
     10599@@ -14867,12 +14948,12 @@
    1011710600        ;;
    1011810601 esac
    1011910602 if test "$GXX" = yes; then
    1012010603-       echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
    10121 +       echo "$as_me:14939: checking for lib$cf_gpp_libname" >&5
     10604+       echo "$as_me:14951: checking for lib$cf_gpp_libname" >&5
    1012210605 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
    1012310606        cf_save="$LIBS"
    … …  
    1012510608        cat >conftest.$ac_ext <<_ACEOF
    1012610609-#line 14875 "configure"
    10127 +#line 14944 "configure"
     10610+#line 14956 "configure"
    1012810611 #include "confdefs.h"
    1012910612 
    1013010613 #include <$cf_gpp_libname/builtin.h>
    10131 @@ -14886,16 +14955,16 @@
     10614@@ -14886,16 +14967,16 @@
    1013210615 }
    1013310616 _ACEOF
    1013410617 rm -f conftest.$ac_objext conftest$ac_exeext
    1013510618-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
    10136 +if { (eval echo "$as_me:14958: \"$ac_link\"") >&5
     10619+if { (eval echo "$as_me:14970: \"$ac_link\"") >&5
    1013710620   (eval $ac_link) 2>&5
    1013810621   ac_status=$?
    1013910622-  echo "$as_me:14892: \$? = $ac_status" >&5
    10140 +  echo "$as_me:14961: \$? = $ac_status" >&5
     10623+  echo "$as_me:14973: \$? = $ac_status" >&5
    1014110624   (exit $ac_status); } &&
    1014210625          { ac_try='test -s conftest$ac_exeext'
    1014310626-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
    10144 +  { (eval echo "$as_me:14964: \"$ac_try\"") >&5
     10627+  { (eval echo "$as_me:14976: \"$ac_try\"") >&5
    1014510628   (eval $ac_try) 2>&5
    1014610629   ac_status=$?
    1014710630-  echo "$as_me:14898: \$? = $ac_status" >&5
    10148 +  echo "$as_me:14967: \$? = $ac_status" >&5
     10631+  echo "$as_me:14979: \$? = $ac_status" >&5
    1014910632   (exit $ac_status); }; }; then
    1015010633   cf_cxx_library=yes
    1015110634         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    10152 @@ -14914,7 +14983,7 @@
     10635@@ -14914,7 +14995,7 @@
    1015310636   echo "$as_me: failed program was:" >&5
    1015410637 cat conftest.$ac_ext >&5
    1015510638 cat >conftest.$ac_ext <<_ACEOF
    1015610639-#line 14917 "configure"
    10157 +#line 14986 "configure"
     10640+#line 14998 "configure"
    1015810641 #include "confdefs.h"
    1015910642 
    1016010643 #include <builtin.h>
    10161 @@ -14928,16 +14997,16 @@
     10644@@ -14928,16 +15009,16 @@
    1016210645 }
    1016310646 _ACEOF
    1016410647 rm -f conftest.$ac_objext conftest$ac_exeext
    1016510648-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    10166 +if { (eval echo "$as_me:15000: \"$ac_link\"") >&5
     10649+if { (eval echo "$as_me:15012: \"$ac_link\"") >&5
    1016710650   (eval $ac_link) 2>&5
    1016810651   ac_status=$?
    1016910652-  echo "$as_me:14934: \$? = $ac_status" >&5
    10170 +  echo "$as_me:15003: \$? = $ac_status" >&5
     10653+  echo "$as_me:15015: \$? = $ac_status" >&5
    1017110654   (exit $ac_status); } &&
    1017210655          { ac_try='test -s conftest$ac_exeext'
    1017310656-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    10174 +  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
     10657+  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
    1017510658   (eval $ac_try) 2>&5
    1017610659   ac_status=$?
    1017710660-  echo "$as_me:14940: \$? = $ac_status" >&5
    10178 +  echo "$as_me:15009: \$? = $ac_status" >&5
     10661+  echo "$as_me:15021: \$? = $ac_status" >&5
    1017910662   (exit $ac_status); }; }; then
    1018010663   cf_cxx_library=yes
    1018110664         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    10182 @@ -14954,7 +15023,7 @@
     10665@@ -14954,7 +15035,7 @@
    1018310666 fi
    1018410667 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1018510668        LIBS="$cf_save"
    1018610669-       echo "$as_me:14957: result: $cf_cxx_library" >&5
    10187 +       echo "$as_me:15026: result: $cf_cxx_library" >&5
     10670+       echo "$as_me:15038: result: $cf_cxx_library" >&5
    1018810671 echo "${ECHO_T}$cf_cxx_library" >&6
    1018910672 fi
    1019010673 
    10191 @@ -14970,7 +15039,7 @@
     10674@@ -14970,7 +15051,7 @@
    1019210675 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    1019310676 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1019410677 ac_main_return=return
    1019510678-echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
    10196 +echo "$as_me:15042: checking how to run the C++ preprocessor" >&5
     10679+echo "$as_me:15054: checking how to run the C++ preprocessor" >&5
    1019710680 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
    1019810681 if test -z "$CXXCPP"; then
    1019910682   if test "${ac_cv_prog_CXXCPP+set}" = set; then
    10200 @@ -14987,18 +15056,18 @@
     10683@@ -14987,18 +15068,18 @@
    1020110684   # On the NeXT, cc -E runs the code through the compiler's parser,
    1020210685   # not just through cpp. "Syntax error" is here to catch this case.
    1020310686   cat >conftest.$ac_ext <<_ACEOF
    1020410687-#line 14990 "configure"
    10205 +#line 15059 "configure"
     10688+#line 15071 "configure"
    1020610689 #include "confdefs.h"
    1020710690 #include <assert.h>
    … …  
    1020910692 _ACEOF
    1021010693-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
    10211 +if { (eval echo "$as_me:15064: \"$ac_cpp conftest.$ac_ext\"") >&5
     10694+if { (eval echo "$as_me:15076: \"$ac_cpp conftest.$ac_ext\"") >&5
    1021210695   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1021310696   ac_status=$?
    … …  
    1021610699   cat conftest.err >&5
    1021710700-  echo "$as_me:15001: \$? = $ac_status" >&5
    10218 +  echo "$as_me:15070: \$? = $ac_status" >&5
     10701+  echo "$as_me:15082: \$? = $ac_status" >&5
    1021910702   (exit $ac_status); } >/dev/null; then
    1022010703   if test -s conftest.err; then
    1022110704     ac_cpp_err=$ac_cxx_preproc_warn_flag
    10222 @@ -15021,17 +15090,17 @@
     10705@@ -15021,17 +15102,17 @@
    1022310706   # OK, works on sane cases.  Now check whether non-existent headers
    1022410707   # can be detected and how.
    1022510708   cat >conftest.$ac_ext <<_ACEOF
    1022610709-#line 15024 "configure"
    10227 +#line 15093 "configure"
     10710+#line 15105 "configure"
    1022810711 #include "confdefs.h"
    1022910712 #include <ac_nonexistent.h>
    1023010713 _ACEOF
    1023110714-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
    10232 +if { (eval echo "$as_me:15097: \"$ac_cpp conftest.$ac_ext\"") >&5
     10715+if { (eval echo "$as_me:15109: \"$ac_cpp conftest.$ac_ext\"") >&5
    1023310716   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1023410717   ac_status=$?
    … …  
    1023710720   cat conftest.err >&5
    1023810721-  echo "$as_me:15034: \$? = $ac_status" >&5
    10239 +  echo "$as_me:15103: \$? = $ac_status" >&5
     10722+  echo "$as_me:15115: \$? = $ac_status" >&5
    1024010723   (exit $ac_status); } >/dev/null; then
    1024110724   if test -s conftest.err; then
    1024210725     ac_cpp_err=$ac_cxx_preproc_warn_flag
    10243 @@ -15068,7 +15137,7 @@
     10726@@ -15068,7 +15149,7 @@
    1024410727 else
    1024510728   ac_cv_prog_CXXCPP=$CXXCPP
    1024610729 fi
    1024710730-echo "$as_me:15071: result: $CXXCPP" >&5
    10248 +echo "$as_me:15140: result: $CXXCPP" >&5
     10731+echo "$as_me:15152: result: $CXXCPP" >&5
    1024910732 echo "${ECHO_T}$CXXCPP" >&6
    1025010733 ac_preproc_ok=false
    1025110734 for ac_cxx_preproc_warn_flag in '' yes
    10252 @@ -15078,18 +15147,18 @@
     10735@@ -15078,18 +15159,18 @@
    1025310736   # On the NeXT, cc -E runs the code through the compiler's parser,
    1025410737   # not just through cpp. "Syntax error" is here to catch this case.
    1025510738   cat >conftest.$ac_ext <<_ACEOF
    1025610739-#line 15081 "configure"
    10257 +#line 15150 "configure"
     10740+#line 15162 "configure"
    1025810741 #include "confdefs.h"
    1025910742 #include <assert.h>
    … …  
    1026110744 _ACEOF
    1026210745-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
    10263 +if { (eval echo "$as_me:15155: \"$ac_cpp conftest.$ac_ext\"") >&5
     10746+if { (eval echo "$as_me:15167: \"$ac_cpp conftest.$ac_ext\"") >&5
    1026410747   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1026510748   ac_status=$?
    … …  
    1026810751   cat conftest.err >&5
    1026910752-  echo "$as_me:15092: \$? = $ac_status" >&5
    10270 +  echo "$as_me:15161: \$? = $ac_status" >&5
     10753+  echo "$as_me:15173: \$? = $ac_status" >&5
    1027110754   (exit $ac_status); } >/dev/null; then
    1027210755   if test -s conftest.err; then
    1027310756     ac_cpp_err=$ac_cxx_preproc_warn_flag
    10274 @@ -15112,17 +15181,17 @@
     10757@@ -15112,17 +15193,17 @@
    1027510758   # OK, works on sane cases.  Now check whether non-existent headers
    1027610759   # can be detected and how.
    1027710760   cat >conftest.$ac_ext <<_ACEOF
    1027810761-#line 15115 "configure"
    10279 +#line 15184 "configure"
     10762+#line 15196 "configure"
    1028010763 #include "confdefs.h"
    1028110764 #include <ac_nonexistent.h>
    1028210765 _ACEOF
    1028310766-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
    10284 +if { (eval echo "$as_me:15188: \"$ac_cpp conftest.$ac_ext\"") >&5
     10767+if { (eval echo "$as_me:15200: \"$ac_cpp conftest.$ac_ext\"") >&5
    1028510768   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1028610769   ac_status=$?
    … …  
    1028910772   cat conftest.err >&5
    1029010773-  echo "$as_me:15125: \$? = $ac_status" >&5
    10291 +  echo "$as_me:15194: \$? = $ac_status" >&5
     10774+  echo "$as_me:15206: \$? = $ac_status" >&5
    1029210775   (exit $ac_status); } >/dev/null; then
    1029310776   if test -s conftest.err; then
    1029410777     ac_cpp_err=$ac_cxx_preproc_warn_flag
    10295 @@ -15150,7 +15219,7 @@
     10778@@ -15150,7 +15231,7 @@
    1029610779 if $ac_preproc_ok; then
    1029710780   :
    1029810781 else
    1029910782-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    10300 +  { { echo "$as_me:15222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
     10783+  { { echo "$as_me:15234: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    1030110784 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    1030210785    { (exit 1); exit 1; }; }
    1030310786 fi
    10304 @@ -15165,23 +15234,23 @@
     10787@@ -15165,23 +15246,23 @@
    1030510788 for ac_header in iostream typeinfo
    1030610789 do
    1030710790 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1030810791-echo "$as_me:15168: checking for $ac_header" >&5
    10309 +echo "$as_me:15237: checking for $ac_header" >&5
     10792+echo "$as_me:15249: checking for $ac_header" >&5
    1031010793 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1031110794 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1031410797   cat >conftest.$ac_ext <<_ACEOF
    1031510798-#line 15174 "configure"
    10316 +#line 15243 "configure"
     10799+#line 15255 "configure"
    1031710800 #include "confdefs.h"
    1031810801 #include <$ac_header>
    1031910802 _ACEOF
    1032010803-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
    10321 +if { (eval echo "$as_me:15247: \"$ac_cpp conftest.$ac_ext\"") >&5
     10804+if { (eval echo "$as_me:15259: \"$ac_cpp conftest.$ac_ext\"") >&5
    1032210805   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1032310806   ac_status=$?
    … …  
    1032610809   cat conftest.err >&5
    1032710810-  echo "$as_me:15184: \$? = $ac_status" >&5
    10328 +  echo "$as_me:15253: \$? = $ac_status" >&5
     10811+  echo "$as_me:15265: \$? = $ac_status" >&5
    1032910812   (exit $ac_status); } >/dev/null; then
    1033010813   if test -s conftest.err; then
    1033110814     ac_cpp_err=$ac_cxx_preproc_warn_flag
    10332 @@ -15200,7 +15269,7 @@
     10815@@ -15200,7 +15281,7 @@
    1033310816 fi
    1033410817 rm -f conftest.err conftest.$ac_ext
    1033510818 fi
    1033610819-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10337 +echo "$as_me:15272: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10820+echo "$as_me:15284: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1033810821 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1033910822 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1034010823   cat >>confdefs.h <<EOF
    10341 @@ -15211,10 +15280,10 @@
     10824@@ -15211,10 +15292,10 @@
    1034210825 done
    1034310826 
    1034410827     if test x"$ac_cv_header_iostream" = xyes ; then
    1034510828-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
    10346 +        echo "$as_me:15283: checking if iostream uses std-namespace" >&5
     10829+        echo "$as_me:15295: checking if iostream uses std-namespace" >&5
    1034710830 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
    1034810831         cat >conftest.$ac_ext <<_ACEOF
    1034910832-#line 15217 "configure"
    10350 +#line 15286 "configure"
     10833+#line 15298 "configure"
    1035110834 #include "confdefs.h"
    1035210835 
    1035310836 #include <iostream>
    10354 @@ -15231,16 +15300,16 @@
     10837@@ -15231,16 +15312,16 @@
    1035510838 }
    1035610839 _ACEOF
    1035710840 rm -f conftest.$ac_objext
    1035810841-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
    10359 +if { (eval echo "$as_me:15303: \"$ac_compile\"") >&5
     10842+if { (eval echo "$as_me:15315: \"$ac_compile\"") >&5
    1036010843   (eval $ac_compile) 2>&5
    1036110844   ac_status=$?
    1036210845-  echo "$as_me:15237: \$? = $ac_status" >&5
    10363 +  echo "$as_me:15306: \$? = $ac_status" >&5
     10846+  echo "$as_me:15318: \$? = $ac_status" >&5
    1036410847   (exit $ac_status); } &&
    1036510848          { ac_try='test -s conftest.$ac_objext'
    1036610849-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
    10367 +  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
     10850+  { (eval echo "$as_me:15321: \"$ac_try\"") >&5
    1036810851   (eval $ac_try) 2>&5
    1036910852   ac_status=$?
    1037010853-  echo "$as_me:15243: \$? = $ac_status" >&5
    10371 +  echo "$as_me:15312: \$? = $ac_status" >&5
     10854+  echo "$as_me:15324: \$? = $ac_status" >&5
    1037210855   (exit $ac_status); }; }; then
    1037310856   cf_iostream_namespace=yes
    1037410857 else
    10375 @@ -15249,7 +15318,7 @@
     10858@@ -15249,7 +15330,7 @@
    1037610859 cf_iostream_namespace=no
    1037710860 fi
    1037810861 rm -f conftest.$ac_objext conftest.$ac_ext
    1037910862-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
    10380 +        echo "$as_me:15321: result: $cf_iostream_namespace" >&5
     10863+        echo "$as_me:15333: result: $cf_iostream_namespace" >&5
    1038110864 echo "${ECHO_T}$cf_iostream_namespace" >&6
    1038210865         if test "$cf_iostream_namespace" = yes ; then
    1038310866             cat >>confdefs.h <<\EOF
    10384 @@ -15259,7 +15328,7 @@
     10867@@ -15259,7 +15340,7 @@
    1038510868         fi
    1038610869     fi
    1038710870 
    1038810871-echo "$as_me:15262: checking if we should include stdbool.h" >&5
    10389 +echo "$as_me:15331: checking if we should include stdbool.h" >&5
     10872+echo "$as_me:15343: checking if we should include stdbool.h" >&5
    1039010873 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1039110874 
    1039210875 if test "${cf_cv_header_stdbool_h+set}" = set; then
    10393 @@ -15267,7 +15336,7 @@
     10876@@ -15267,7 +15348,7 @@
    1039410877 else
    1039510878 
    1039610879        cat >conftest.$ac_ext <<_ACEOF
    1039710880-#line 15270 "configure"
    10398 +#line 15339 "configure"
     10881+#line 15351 "configure"
    1039910882 #include "confdefs.h"
    1040010883 
    1040110884 int
    10402 @@ -15279,23 +15348,23 @@
     10885@@ -15279,23 +15360,23 @@
    1040310886 }
    1040410887 _ACEOF
    1040510888 rm -f conftest.$ac_objext
    1040610889-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
    10407 +if { (eval echo "$as_me:15351: \"$ac_compile\"") >&5
     10890+if { (eval echo "$as_me:15363: \"$ac_compile\"") >&5
    1040810891   (eval $ac_compile) 2>&5
    1040910892   ac_status=$?
    1041010893-  echo "$as_me:15285: \$? = $ac_status" >&5
    10411 +  echo "$as_me:15354: \$? = $ac_status" >&5
     10894+  echo "$as_me:15366: \$? = $ac_status" >&5
    1041210895   (exit $ac_status); } &&
    1041310896          { ac_try='test -s conftest.$ac_objext'
    1041410897-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
    10415 +  { (eval echo "$as_me:15357: \"$ac_try\"") >&5
     10898+  { (eval echo "$as_me:15369: \"$ac_try\"") >&5
    1041610899   (eval $ac_try) 2>&5
    1041710900   ac_status=$?
    1041810901-  echo "$as_me:15291: \$? = $ac_status" >&5
    10419 +  echo "$as_me:15360: \$? = $ac_status" >&5
     10902+  echo "$as_me:15372: \$? = $ac_status" >&5
    1042010903   (exit $ac_status); }; }; then
    1042110904   cf_cv_header_stdbool_h=0
    … …  
    1042510908 cat >conftest.$ac_ext <<_ACEOF
    1042610909-#line 15298 "configure"
    10427 +#line 15367 "configure"
     10910+#line 15379 "configure"
    1042810911 #include "confdefs.h"
    1042910912 
    1043010913 #ifndef __BEOS__
    10431 @@ -15311,16 +15380,16 @@
     10914@@ -15311,16 +15392,16 @@
    1043210915 }
    1043310916 _ACEOF
    1043410917 rm -f conftest.$ac_objext
    1043510918-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
    10436 +if { (eval echo "$as_me:15383: \"$ac_compile\"") >&5
     10919+if { (eval echo "$as_me:15395: \"$ac_compile\"") >&5
    1043710920   (eval $ac_compile) 2>&5
    1043810921   ac_status=$?
    1043910922-  echo "$as_me:15317: \$? = $ac_status" >&5
    10440 +  echo "$as_me:15386: \$? = $ac_status" >&5
     10923+  echo "$as_me:15398: \$? = $ac_status" >&5
    1044110924   (exit $ac_status); } &&
    1044210925          { ac_try='test -s conftest.$ac_objext'
    1044310926-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
    10444 +  { (eval echo "$as_me:15389: \"$ac_try\"") >&5
     10927+  { (eval echo "$as_me:15401: \"$ac_try\"") >&5
    1044510928   (eval $ac_try) 2>&5
    1044610929   ac_status=$?
    1044710930-  echo "$as_me:15323: \$? = $ac_status" >&5
    10448 +  echo "$as_me:15392: \$? = $ac_status" >&5
     10931+  echo "$as_me:15404: \$? = $ac_status" >&5
    1044910932   (exit $ac_status); }; }; then
    1045010933   cf_cv_header_stdbool_h=1
    1045110934 else
    10452 @@ -15334,13 +15403,13 @@
     10935@@ -15334,13 +15415,13 @@
    1045310936 fi
    1045410937 
    1045510938 if test "$cf_cv_header_stdbool_h" = 1
    1045610939-then   echo "$as_me:15337: result: yes" >&5
    10457 +then   echo "$as_me:15406: result: yes" >&5
     10940+then   echo "$as_me:15418: result: yes" >&5
    1045810941 echo "${ECHO_T}yes" >&6
    1045910942-else   echo "$as_me:15339: result: no" >&5
    10460 +else   echo "$as_me:15408: result: no" >&5
     10943+else   echo "$as_me:15420: result: no" >&5
    1046110944 echo "${ECHO_T}no" >&6
    1046210945 fi
    1046310946 
    1046410947-echo "$as_me:15343: checking for builtin bool type" >&5
    10465 +echo "$as_me:15412: checking for builtin bool type" >&5
     10948+echo "$as_me:15424: checking for builtin bool type" >&5
    1046610949 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1046710950 
    1046810951 if test "${cf_cv_builtin_bool+set}" = set; then
    10469 @@ -15348,7 +15417,7 @@
     10952@@ -15348,7 +15429,7 @@
    1047010953 else
    1047110954 
    1047210955        cat >conftest.$ac_ext <<_ACEOF
    1047310956-#line 15351 "configure"
    10474 +#line 15420 "configure"
     10957+#line 15432 "configure"
    1047510958 #include "confdefs.h"
    1047610959 
    1047710960 #include <stdio.h>
    10478 @@ -15363,16 +15432,16 @@
     10961@@ -15363,16 +15444,16 @@
    1047910962 }
    1048010963 _ACEOF
    1048110964 rm -f conftest.$ac_objext
    1048210965-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
    10483 +if { (eval echo "$as_me:15435: \"$ac_compile\"") >&5
     10966+if { (eval echo "$as_me:15447: \"$ac_compile\"") >&5
    1048410967   (eval $ac_compile) 2>&5
    1048510968   ac_status=$?
    1048610969-  echo "$as_me:15369: \$? = $ac_status" >&5
    10487 +  echo "$as_me:15438: \$? = $ac_status" >&5
     10970+  echo "$as_me:15450: \$? = $ac_status" >&5
    1048810971   (exit $ac_status); } &&
    1048910972          { ac_try='test -s conftest.$ac_objext'
    1049010973-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
    10491 +  { (eval echo "$as_me:15441: \"$ac_try\"") >&5
     10974+  { (eval echo "$as_me:15453: \"$ac_try\"") >&5
    1049210975   (eval $ac_try) 2>&5
    1049310976   ac_status=$?
    1049410977-  echo "$as_me:15375: \$? = $ac_status" >&5
    10495 +  echo "$as_me:15444: \$? = $ac_status" >&5
     10978+  echo "$as_me:15456: \$? = $ac_status" >&5
    1049610979   (exit $ac_status); }; }; then
    1049710980   cf_cv_builtin_bool=1
    1049810981 else
    10499 @@ -15385,13 +15454,13 @@
     10982@@ -15385,13 +15466,13 @@
    1050010983 fi
    1050110984 
    1050210985 if test "$cf_cv_builtin_bool" = 1
    1050310986-then   echo "$as_me:15388: result: yes" >&5
    10504 +then   echo "$as_me:15457: result: yes" >&5
     10987+then   echo "$as_me:15469: result: yes" >&5
    1050510988 echo "${ECHO_T}yes" >&6
    1050610989-else   echo "$as_me:15390: result: no" >&5
    10507 +else   echo "$as_me:15459: result: no" >&5
     10990+else   echo "$as_me:15471: result: no" >&5
    1050810991 echo "${ECHO_T}no" >&6
    1050910992 fi
    1051010993 
    1051110994-echo "$as_me:15394: checking for size of bool" >&5
    10512 +echo "$as_me:15463: checking for size of bool" >&5
     10995+echo "$as_me:15475: checking for size of bool" >&5
    1051310996 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1051410997 if test "${cf_cv_type_of_bool+set}" = set; then
    1051510998   echo $ECHO_N "(cached) $ECHO_C" >&6
    10516 @@ -15402,7 +15471,7 @@
     10999@@ -15402,7 +15483,7 @@
    1051711000   cf_cv_type_of_bool=unknown
    1051811001 else
    1051911002   cat >conftest.$ac_ext <<_ACEOF
    1052011003-#line 15405 "configure"
    10521 +#line 15474 "configure"
     11004+#line 15486 "configure"
    1052211005 #include "confdefs.h"
    1052311006 
    1052411007 #include <stdlib.h>
    10525 @@ -15444,15 +15513,15 @@
     11008@@ -15444,15 +15525,15 @@
    1052611009 
    1052711010 _ACEOF
    1052811011 rm -f conftest$ac_exeext
    1052911012-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
    10530 +if { (eval echo "$as_me:15516: \"$ac_link\"") >&5
     11013+if { (eval echo "$as_me:15528: \"$ac_link\"") >&5
    1053111014   (eval $ac_link) 2>&5
    1053211015   ac_status=$?
    1053311016-  echo "$as_me:15450: \$? = $ac_status" >&5
    10534 +  echo "$as_me:15519: \$? = $ac_status" >&5
     11017+  echo "$as_me:15531: \$? = $ac_status" >&5
    1053511018   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1053611019-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
    10537 +  { (eval echo "$as_me:15521: \"$ac_try\"") >&5
     11020+  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
    1053811021   (eval $ac_try) 2>&5
    1053911022   ac_status=$?
    1054011023-  echo "$as_me:15455: \$? = $ac_status" >&5
    10541 +  echo "$as_me:15524: \$? = $ac_status" >&5
     11024+  echo "$as_me:15536: \$? = $ac_status" >&5
    1054211025   (exit $ac_status); }; }; then
    1054311026   cf_cv_type_of_bool=`cat cf_test.out`
    1054411027                 if test -z "$cf_cv_type_of_bool"; then
    10545 @@ -15470,18 +15539,18 @@
     11028@@ -15470,18 +15551,18 @@
    1054611029 fi
    1054711030 
    1054811031        rm -f cf_test.out
    1054911032-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
    10550 +echo "$as_me:15542: result: $cf_cv_type_of_bool" >&5
     11033+echo "$as_me:15554: result: $cf_cv_type_of_bool" >&5
    1055111034 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1055211035 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1055511038        esac
    1055611039-       { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    10557 +       { echo "$as_me:15548: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     11040+       { echo "$as_me:15560: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1055811041 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1055911042        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1056111044 
    1056211045-echo "$as_me:15484: checking for special defines needed for etip.h" >&5
    10563 +echo "$as_me:15553: checking for special defines needed for etip.h" >&5
     11046+echo "$as_me:15565: checking for special defines needed for etip.h" >&5
    1056411047 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
    1056511048 cf_save_CXXFLAGS="$CXXFLAGS"
    1056611049 cf_result="none"
    10567 @@ -15493,7 +15562,7 @@
     11050@@ -15493,7 +15574,7 @@
    1056811051        test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
    1056911052        test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
    1057011053 cat >conftest.$ac_ext <<_ACEOF
    1057111054-#line 15496 "configure"
    10572 +#line 15565 "configure"
     11055+#line 15577 "configure"
    1057311056 #include "confdefs.h"
    1057411057 
    1057511058 #include <etip.h.in>
    10576 @@ -15507,16 +15576,16 @@
     11059@@ -15507,16 +15588,16 @@
    1057711060 }
    1057811061 _ACEOF
    1057911062 rm -f conftest.$ac_objext
    1058011063-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
    10581 +if { (eval echo "$as_me:15579: \"$ac_compile\"") >&5
     11064+if { (eval echo "$as_me:15591: \"$ac_compile\"") >&5
    1058211065   (eval $ac_compile) 2>&5
    1058311066   ac_status=$?
    1058411067-  echo "$as_me:15513: \$? = $ac_status" >&5
    10585 +  echo "$as_me:15582: \$? = $ac_status" >&5
     11068+  echo "$as_me:15594: \$? = $ac_status" >&5
    1058611069   (exit $ac_status); } &&
    1058711070          { ac_try='test -s conftest.$ac_objext'
    1058811071-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
    10589 +  { (eval echo "$as_me:15585: \"$ac_try\"") >&5
     11072+  { (eval echo "$as_me:15597: \"$ac_try\"") >&5
    1059011073   (eval $ac_try) 2>&5
    1059111074   ac_status=$?
    1059211075-  echo "$as_me:15519: \$? = $ac_status" >&5
    10593 +  echo "$as_me:15588: \$? = $ac_status" >&5
     11076+  echo "$as_me:15600: \$? = $ac_status" >&5
    1059411077   (exit $ac_status); }; }; then
    1059511078 
    1059611079        test -n "$cf_math" && cat >>confdefs.h <<EOF
    10597 @@ -15537,12 +15606,12 @@
     11080@@ -15537,12 +15618,12 @@
    1059811081 rm -f conftest.$ac_objext conftest.$ac_ext
    1059911082 done
    1060011083 done
    1060111084-echo "$as_me:15540: result: $cf_result" >&5
    10602 +echo "$as_me:15609: result: $cf_result" >&5
     11085+echo "$as_me:15621: result: $cf_result" >&5
    1060311086 echo "${ECHO_T}$cf_result" >&6
    1060411087 CXXFLAGS="$cf_save_CXXFLAGS"
    … …  
    1060611089 if test -n "$CXX"; then
    1060711090-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
    10608 +echo "$as_me:15614: checking if $CXX accepts parameter initialization" >&5
     11091+echo "$as_me:15626: checking if $CXX accepts parameter initialization" >&5
    1060911092 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
    1061011093 if test "${cf_cv_cpp_param_init+set}" = set; then
    1061111094   echo $ECHO_N "(cached) $ECHO_C" >&6
    10612 @@ -15559,7 +15628,7 @@
     11095@@ -15559,7 +15640,7 @@
    1061311096   cf_cv_cpp_param_init=unknown
    1061411097 else
    1061511098   cat >conftest.$ac_ext <<_ACEOF
    1061611099-#line 15562 "configure"
    10617 +#line 15631 "configure"
     11100+#line 15643 "configure"
    1061811101 #include "confdefs.h"
    1061911102 
    1062011103 class TEST {
    10621 @@ -15578,15 +15647,15 @@
     11104@@ -15578,15 +15659,15 @@
    1062211105 
    1062311106 _ACEOF
    1062411107 rm -f conftest$ac_exeext
    1062511108-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
    10626 +if { (eval echo "$as_me:15650: \"$ac_link\"") >&5
     11109+if { (eval echo "$as_me:15662: \"$ac_link\"") >&5
    1062711110   (eval $ac_link) 2>&5
    1062811111   ac_status=$?
    1062911112-  echo "$as_me:15584: \$? = $ac_status" >&5
    10630 +  echo "$as_me:15653: \$? = $ac_status" >&5
     11113+  echo "$as_me:15665: \$? = $ac_status" >&5
    1063111114   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1063211115-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
    10633 +  { (eval echo "$as_me:15655: \"$ac_try\"") >&5
     11116+  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
    1063411117   (eval $ac_try) 2>&5
    1063511118   ac_status=$?
    1063611119-  echo "$as_me:15589: \$? = $ac_status" >&5
    10637 +  echo "$as_me:15658: \$? = $ac_status" >&5
     11120+  echo "$as_me:15670: \$? = $ac_status" >&5
    1063811121   (exit $ac_status); }; }; then
    1063911122   cf_cv_cpp_param_init=yes
    1064011123 else
    10641 @@ -15605,7 +15674,7 @@
     11124@@ -15605,7 +15686,7 @@
    1064211125 ac_main_return=return
    1064311126 
    1064411127 fi
    1064511128-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
    10646 +echo "$as_me:15677: result: $cf_cv_cpp_param_init" >&5
     11129+echo "$as_me:15689: result: $cf_cv_cpp_param_init" >&5
    1064711130 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
    1064811131 fi
    1064911132 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
    10650 @@ -15614,7 +15683,7 @@
     11133@@ -15614,7 +15695,7 @@
    1065111134 
    1065211135 if test -n "$CXX"; then
    1065311136 
    1065411137-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
    10655 +echo "$as_me:15686: checking if $CXX accepts static_cast" >&5
     11138+echo "$as_me:15698: checking if $CXX accepts static_cast" >&5
    1065611139 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
    1065711140 if test "${cf_cv_cpp_static_cast+set}" = set; then
    1065811141   echo $ECHO_N "(cached) $ECHO_C" >&6
    10659 @@ -15628,7 +15697,7 @@
     11142@@ -15628,7 +15709,7 @@
    1066011143 ac_main_return=return
    1066111144 
    1066211145        cat >conftest.$ac_ext <<_ACEOF
    1066311146-#line 15631 "configure"
    10664 +#line 15700 "configure"
     11147+#line 15712 "configure"
    1066511148 #include "confdefs.h"
    1066611149 
    1066711150 class NCursesPanel
    10668 @@ -15672,16 +15741,16 @@
     11151@@ -15672,16 +15753,16 @@
    1066911152 }
    1067011153 _ACEOF
    1067111154 rm -f conftest.$ac_objext
    1067211155-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
    10673 +if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
     11156+if { (eval echo "$as_me:15756: \"$ac_compile\"") >&5
    1067411157   (eval $ac_compile) 2>&5
    1067511158   ac_status=$?
    1067611159-  echo "$as_me:15678: \$? = $ac_status" >&5
    10677 +  echo "$as_me:15747: \$? = $ac_status" >&5
     11160+  echo "$as_me:15759: \$? = $ac_status" >&5
    1067811161   (exit $ac_status); } &&
    1067911162          { ac_try='test -s conftest.$ac_objext'
    1068011163-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
    10681 +  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
     11164+  { (eval echo "$as_me:15762: \"$ac_try\"") >&5
    1068211165   (eval $ac_try) 2>&5
    1068311166   ac_status=$?
    1068411167-  echo "$as_me:15684: \$? = $ac_status" >&5
    10685 +  echo "$as_me:15753: \$? = $ac_status" >&5
     11168+  echo "$as_me:15765: \$? = $ac_status" >&5
    1068611169   (exit $ac_status); }; }; then
    1068711170   cf_cv_cpp_static_cast=yes
    1068811171 else
    10689 @@ -15699,7 +15768,7 @@
     11172@@ -15699,7 +15780,7 @@
    1069011173 ac_main_return=return
    1069111174 
    1069211175 fi
    1069311176-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
    10694 +echo "$as_me:15771: result: $cf_cv_cpp_static_cast" >&5
     11177+echo "$as_me:15783: result: $cf_cv_cpp_static_cast" >&5
    1069511178 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
    1069611179 
    1069711180 fi
    10698 @@ -15747,7 +15816,7 @@
     11181@@ -15747,7 +15828,7 @@
    1069911182        else
    1070011183                if test "$cf_cv_header_stdbool_h" = 1 ; then
    1070111184 
    1070211185-echo "$as_me:15750: checking for size of bool" >&5
    10703 +echo "$as_me:15819: checking for size of bool" >&5
     11186+echo "$as_me:15831: checking for size of bool" >&5
    1070411187 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1070511188 if test "${cf_cv_type_of_bool+set}" = set; then
    1070611189   echo $ECHO_N "(cached) $ECHO_C" >&6
    10707 @@ -15758,7 +15827,7 @@
     11190@@ -15758,7 +15839,7 @@
    1070811191   cf_cv_type_of_bool=unknown
    1070911192 else
    1071011193   cat >conftest.$ac_ext <<_ACEOF
    1071111194-#line 15761 "configure"
    10712 +#line 15830 "configure"
     11195+#line 15842 "configure"
    1071311196 #include "confdefs.h"
    1071411197 
    1071511198 #include <stdlib.h>
    10716 @@ -15800,15 +15869,15 @@
     11199@@ -15800,15 +15881,15 @@
    1071711200 
    1071811201 _ACEOF
    1071911202 rm -f conftest$ac_exeext
    1072011203-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
    10721 +if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
     11204+if { (eval echo "$as_me:15884: \"$ac_link\"") >&5
    1072211205   (eval $ac_link) 2>&5
    1072311206   ac_status=$?
    1072411207-  echo "$as_me:15806: \$? = $ac_status" >&5
    10725 +  echo "$as_me:15875: \$? = $ac_status" >&5
     11208+  echo "$as_me:15887: \$? = $ac_status" >&5
    1072611209   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1072711210-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
    10728 +  { (eval echo "$as_me:15877: \"$ac_try\"") >&5
     11211+  { (eval echo "$as_me:15889: \"$ac_try\"") >&5
    1072911212   (eval $ac_try) 2>&5
    1073011213   ac_status=$?
    1073111214-  echo "$as_me:15811: \$? = $ac_status" >&5
    10732 +  echo "$as_me:15880: \$? = $ac_status" >&5
     11215+  echo "$as_me:15892: \$? = $ac_status" >&5
    1073311216   (exit $ac_status); }; }; then
    1073411217   cf_cv_type_of_bool=`cat cf_test.out`
    1073511218                 if test -z "$cf_cv_type_of_bool"; then
    10736 @@ -15826,25 +15895,25 @@
     11219@@ -15826,25 +15907,25 @@
    1073711220 fi
    1073811221 
    1073911222        rm -f cf_test.out
    1074011223-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
    10741 +echo "$as_me:15898: result: $cf_cv_type_of_bool" >&5
     11224+echo "$as_me:15910: result: $cf_cv_type_of_bool" >&5
    1074211225 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1074311226 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1074611229        esac
    1074711230-       { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    10748 +       { echo "$as_me:15904: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     11231+       { echo "$as_me:15916: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1074911232 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1075011233        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1075311236                else
    1075411237-                       echo "$as_me:15841: checking for fallback type of bool" >&5
    10755 +                       echo "$as_me:15910: checking for fallback type of bool" >&5
     11238+                       echo "$as_me:15922: checking for fallback type of bool" >&5
    1075611239 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
    1075711240                        case "$host_cpu" in #(vi
    … …  
    1076011243                        esac
    1076111244-                       echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
    10762 +                       echo "$as_me:15916: result: $cf_cv_type_of_bool" >&5
     11245+                       echo "$as_me:15928: result: $cf_cv_type_of_bool" >&5
    1076311246 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1076411247                fi
    1076511248        fi
    10766 @@ -15873,7 +15942,7 @@
     11249@@ -15873,7 +15954,7 @@
    1076711250 
    1076811251 if test "$cf_with_ada" != "no" ; then
    1076911252     if test "$with_libtool" != "no"; then
    1077011253-       { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
    10771 +       { echo "$as_me:15945: WARNING: libtool does not support Ada - disabling feature" >&5
     11254+       { echo "$as_me:15957: WARNING: libtool does not support Ada - disabling feature" >&5
    1077211255 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
    1077311256        cf_with_ada=no
    1077411257     fi
    10775 @@ -15883,7 +15952,7 @@
     11258@@ -15883,7 +15964,7 @@
    1077611259 cf_ada_make=gnatmake
    1077711260 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
    1077811261 set dummy $cf_ada_make; ac_word=$2
    1077911262-echo "$as_me:15886: checking for $ac_word" >&5
    10780 +echo "$as_me:15955: checking for $ac_word" >&5
     11263+echo "$as_me:15967: checking for $ac_word" >&5
    1078111264 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1078211265 if test "${ac_cv_prog_gnat_exists+set}" = set; then
    1078311266   echo $ECHO_N "(cached) $ECHO_C" >&6
    10784 @@ -15898,7 +15967,7 @@
     11267@@ -15898,7 +15979,7 @@
    1078511268   test -z "$ac_dir" && ac_dir=.
    1078611269   $as_executable_p "$ac_dir/$ac_word" || continue
    1078711270 ac_cv_prog_gnat_exists="yes"
    1078811271-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
    10789 +echo "$as_me:15970: found $ac_dir/$ac_word" >&5
     11272+echo "$as_me:15982: found $ac_dir/$ac_word" >&5
    1079011273 break
    1079111274 done
    1079211275 
    10793 @@ -15907,10 +15976,10 @@
     11276@@ -15907,10 +15988,10 @@
    1079411277 fi
    1079511278 gnat_exists=$ac_cv_prog_gnat_exists
    1079611279 if test -n "$gnat_exists"; then
    1079711280-  echo "$as_me:15910: result: $gnat_exists" >&5
    10798 +  echo "$as_me:15979: result: $gnat_exists" >&5
     11281+  echo "$as_me:15991: result: $gnat_exists" >&5
    1079911282 echo "${ECHO_T}$gnat_exists" >&6
    1080011283 else
    1080111284-  echo "$as_me:15913: result: no" >&5
    10802 +  echo "$as_me:15982: result: no" >&5
     11285+  echo "$as_me:15994: result: no" >&5
    1080311286 echo "${ECHO_T}no" >&6
    1080411287 fi
    1080511288 
    10806 @@ -15918,11 +15987,11 @@
     11289@@ -15918,11 +15999,11 @@
    1080711290    cf_ada_make=
    1080811291 else
    1080911292 
    1081011293-echo "$as_me:15921: checking for gnat version" >&5
    10811 +echo "$as_me:15990: checking for gnat version" >&5
     11294+echo "$as_me:16002: checking for gnat version" >&5
    1081211295 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
    1081311296 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
    1081411297   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
    1081511298-echo "$as_me:15925: result: $cf_gnat_version" >&5
    10816 +echo "$as_me:15994: result: $cf_gnat_version" >&5
     11299+echo "$as_me:16006: result: $cf_gnat_version" >&5
    1081711300 echo "${ECHO_T}$cf_gnat_version" >&6
    1081811301 
    1081911302 case $cf_gnat_version in
    10820 @@ -15945,7 +16014,7 @@
     11303@@ -15945,7 +16026,7 @@
    1082111304 
    1082211305    # Extract the first word of "m4", so it can be a program name with args.
    1082311306 set dummy m4; ac_word=$2
    1082411307-echo "$as_me:15948: checking for $ac_word" >&5
    10825 +echo "$as_me:16017: checking for $ac_word" >&5
     11308+echo "$as_me:16029: checking for $ac_word" >&5
    1082611309 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1082711310 if test "${ac_cv_prog_M4_exists+set}" = set; then
    1082811311   echo $ECHO_N "(cached) $ECHO_C" >&6
    10829 @@ -15960,7 +16029,7 @@
     11312@@ -15960,7 +16041,7 @@
    1083011313   test -z "$ac_dir" && ac_dir=.
    1083111314   $as_executable_p "$ac_dir/$ac_word" || continue
    1083211315 ac_cv_prog_M4_exists="yes"
    1083311316-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
    10834 +echo "$as_me:16032: found $ac_dir/$ac_word" >&5
     11317+echo "$as_me:16044: found $ac_dir/$ac_word" >&5
    1083511318 break
    1083611319 done
    1083711320 
    10838 @@ -15969,10 +16038,10 @@
     11321@@ -15969,10 +16050,10 @@
    1083911322 fi
    1084011323 M4_exists=$ac_cv_prog_M4_exists
    1084111324 if test -n "$M4_exists"; then
    1084211325-  echo "$as_me:15972: result: $M4_exists" >&5
    10843 +  echo "$as_me:16041: result: $M4_exists" >&5
     11326+  echo "$as_me:16053: result: $M4_exists" >&5
    1084411327 echo "${ECHO_T}$M4_exists" >&6
    1084511328 else
    1084611329-  echo "$as_me:15975: result: no" >&5
    10847 +  echo "$as_me:16044: result: no" >&5
     11330+  echo "$as_me:16056: result: no" >&5
    1084811331 echo "${ECHO_T}no" >&6
    1084911332 fi
    1085011333 
    10851 @@ -15981,7 +16050,7 @@
     11334@@ -15981,7 +16062,7 @@
    1085211335       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    1085311336    fi
    1085411337    if test "$cf_cv_prog_gnat_correct" = yes; then
    1085511338-      echo "$as_me:15984: checking if GNAT works" >&5
    10856 +      echo "$as_me:16053: checking if GNAT works" >&5
     11339+      echo "$as_me:16065: checking if GNAT works" >&5
    1085711340 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
    1085811341 
    1085911342 rm -f conftest*
    10860 @@ -16009,14 +16078,14 @@
     11343@@ -16009,14 +16090,14 @@
    1086111344 fi
    1086211345 rm -f conftest*
    1086311346 
    1086411347-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
    10865 +      echo "$as_me:16081: result: $cf_cv_prog_gnat_correct" >&5
     11348+      echo "$as_me:16093: result: $cf_cv_prog_gnat_correct" >&5
    1086611349 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    1086711350    fi
    … …  
    1087111354 
    1087211355-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
    10873 +   echo "$as_me:16088: checking if GNAT pragma Unreferenced works" >&5
     11356+   echo "$as_me:16100: checking if GNAT pragma Unreferenced works" >&5
    1087411357 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
    1087511358 
    1087611359 rm -f conftest*
    10877 @@ -16043,7 +16112,7 @@
     11360@@ -16043,7 +16124,7 @@
    1087811361 fi
    1087911362 rm -f conftest*
    1088011363 
    1088111364-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
    10882 +   echo "$as_me:16115: result: $cf_cv_pragma_unreferenced" >&5
     11365+   echo "$as_me:16127: result: $cf_cv_pragma_unreferenced" >&5
    1088311366 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
    1088411367 
    1088511368    # if the pragma is supported, use it (needed in the Trace code).
    10886 @@ -16096,7 +16165,7 @@
     11369@@ -16096,7 +16177,7 @@
    1088711370   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1088811371   ;;
    1088911372 *)
    1089011373-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
    10891 +  { { echo "$as_me:16168: error: expected a pathname, not \"$withval\"" >&5
     11374+  { { echo "$as_me:16180: error: expected a pathname, not \"$withval\"" >&5
    1089211375 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1089311376    { (exit 1); exit 1; }; }
    1089411377   ;;
    10895 @@ -16138,7 +16207,7 @@
     11378@@ -16138,7 +16219,7 @@
    1089611379   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1089711380   ;;
    1089811381 *)
    1089911382-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
    10900 +  { { echo "$as_me:16210: error: expected a pathname, not \"$withval\"" >&5
     11383+  { { echo "$as_me:16222: error: expected a pathname, not \"$withval\"" >&5
    1090111384 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1090211385    { (exit 1); exit 1; }; }
    1090311386   ;;
    10904 @@ -16163,7 +16232,7 @@
     11387@@ -16163,7 +16244,7 @@
    1090511388 ### chooses to split module lists into libraries.
    1090611389 ###
    1090711390 ### (see CF_LIB_RULES).
    1090811391-echo "$as_me:16166: checking for library subsets" >&5
    10909 +echo "$as_me:16235: checking for library subsets" >&5
     11392+echo "$as_me:16247: checking for library subsets" >&5
    1091011393 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
    1091111394 LIB_SUBSETS=
    1091211395 
    10913 @@ -16188,7 +16257,7 @@
     11396@@ -16188,7 +16269,7 @@
    1091411397 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
    1091511398 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
    1091611399 
    1091711400-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
    10918 +echo "$as_me:16260: result: $LIB_SUBSETS" >&5
     11401+echo "$as_me:16272: result: $LIB_SUBSETS" >&5
    1091911402 echo "${ECHO_T}$LIB_SUBSETS" >&6
    1092011403 
    1092111404 ### Construct the list of include-directories to be generated
    10922 @@ -16226,7 +16295,7 @@
     11405@@ -16226,7 +16307,7 @@
    1092311406 fi
    1092411407 
    1092511408 ### Build up pieces for makefile rules
    1092611409-echo "$as_me:16229: checking default library suffix" >&5
    10927 +echo "$as_me:16298: checking default library suffix" >&5
     11410+echo "$as_me:16310: checking default library suffix" >&5
    1092811411 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
    1092911412 
    1093011413        case $DFT_LWR_MODEL in
    10931 @@ -16237,10 +16306,10 @@
     11414@@ -16237,46 +16318,50 @@
    1093211415        shared)  DFT_ARG_SUFFIX=''   ;;
    1093311416        esac
    1093411417        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
    1093511418-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
    10936 +echo "$as_me:16309: result: $DFT_ARG_SUFFIX" >&5
     11419+echo "$as_me:16321: result: $DFT_ARG_SUFFIX" >&5
    1093711420 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
    1093811421 
    1093911422-echo "$as_me:16243: checking default library-dependency suffix" >&5
    10940 +echo "$as_me:16312: checking default library-dependency suffix" >&5
     11423+echo "$as_me:16324: checking default library-dependency suffix" >&5
    1094111424 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
    1094211425 
    10943         case $DFT_LWR_MODEL in
    10944 @@ -16289,10 +16358,10 @@
     11426-       case $DFT_LWR_MODEL in
     11427-       libtool)
     11428+       case $DFT_LWR_MODEL in #(vi
     11429+       libtool) #(vi
     11430                DFT_LIB_SUFFIX='.la'
     11431                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11432                ;;
     11433-       normal)
     11434+       normal) #(vi
     11435                DFT_LIB_SUFFIX='.a'
     11436                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11437                ;;
     11438-       debug)
     11439+       debug) #(vi
     11440                DFT_LIB_SUFFIX='_g.a'
     11441                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11442                ;;
     11443-       profile)
     11444+       profile) #(vi
     11445                DFT_LIB_SUFFIX='_p.a'
     11446                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11447                ;;
     11448-       shared)
     11449+       shared) #(vi
     11450                case $cf_cv_system_name in
     11451-               cygwin*)
     11452+               aix[56]*) #(vi
     11453+                       DFT_LIB_SUFFIX='.a'
     11454+                       DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11455+                       ;;
     11456+               cygwin*) #(vi
     11457                        DFT_LIB_SUFFIX='.dll'
     11458                        DFT_DEP_SUFFIX='.dll.a'
     11459                        ;;
     11460-               darwin*)
     11461+               darwin*) #(vi
     11462                        DFT_LIB_SUFFIX='.dylib'
     11463                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11464                        ;;
     11465-               hpux*)
     11466+               hpux*) #(vi
     11467                        case $target in
     11468-                       ia64*)
     11469+                       ia64*) #(vi
     11470                                DFT_LIB_SUFFIX='.so'
     11471                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11472                                ;;
     11473-                       *)
     11474+                       *) #(vi
     11475                                DFT_LIB_SUFFIX='.sl'
     11476                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
     11477                                ;;
     11478@@ -16289,10 +16374,10 @@
    1094511479        esac
    1094611480        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
    1094711481        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
    1094811482-echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
    10949 +echo "$as_me:16361: result: $DFT_DEP_SUFFIX" >&5
     11483+echo "$as_me:16377: result: $DFT_DEP_SUFFIX" >&5
    1095011484 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
    1095111485 
    1095211486-echo "$as_me:16295: checking default object directory" >&5
    10953 +echo "$as_me:16364: checking default object directory" >&5
     11487+echo "$as_me:16380: checking default object directory" >&5
    1095411488 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
    1095511489 
    1095611490        case $DFT_LWR_MODEL in
    10957 @@ -16308,12 +16377,12 @@
     11491@@ -16308,51 +16393,55 @@
    1095811492                        DFT_OBJ_SUBDIR='obj_s' ;;
    1095911493                esac
    1096011494        esac
    1096111495-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
    10962 +echo "$as_me:16380: result: $DFT_OBJ_SUBDIR" >&5
     11496+echo "$as_me:16396: result: $DFT_OBJ_SUBDIR" >&5
    1096311497 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
    1096411498 
    … …  
    1096611500 if test "$cf_with_cxx" = yes ; then
    1096711501-echo "$as_me:16316: checking c++ library-dependency suffix" >&5
    10968 +echo "$as_me:16385: checking c++ library-dependency suffix" >&5
     11502+echo "$as_me:16401: checking c++ library-dependency suffix" >&5
    1096911503 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
    1097011504 if test "$with_libtool" != "no"; then
    1097111505        CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
    10972 @@ -16366,7 +16435,7 @@
     11506 else
     11507 
     11508-       case normal in
     11509-       libtool)
     11510+       case normal in #(vi
     11511+       libtool) #(vi
     11512                CXX_LIB_SUFFIX='.la'
     11513                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11514                ;;
     11515-       normal)
     11516+       normal) #(vi
     11517                CXX_LIB_SUFFIX='.a'
     11518                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11519                ;;
     11520-       debug)
     11521+       debug) #(vi
     11522                CXX_LIB_SUFFIX='_g.a'
     11523                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11524                ;;
     11525-       profile)
     11526+       profile) #(vi
     11527                CXX_LIB_SUFFIX='_p.a'
     11528                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11529                ;;
     11530-       shared)
     11531+       shared) #(vi
     11532                case $cf_cv_system_name in
     11533-               cygwin*)
     11534+               aix[56]*) #(vi
     11535+                       CXX_LIB_SUFFIX='.a'
     11536+                       CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11537+                       ;;
     11538+               cygwin*) #(vi
     11539                        CXX_LIB_SUFFIX='.dll'
     11540                        CXX_DEP_SUFFIX='.dll.a'
     11541                        ;;
     11542-               darwin*)
     11543+               darwin*) #(vi
     11544                        CXX_LIB_SUFFIX='.dylib'
     11545                        CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11546                        ;;
     11547-               hpux*)
     11548+               hpux*) #(vi
     11549                        case $target in
     11550-                       ia64*)
     11551+                       ia64*) #(vi
     11552                                CXX_LIB_SUFFIX='.so'
     11553                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11554                                ;;
     11555-                       *)
     11556+                       *) #(vi
     11557                                CXX_LIB_SUFFIX='.sl'
     11558                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
     11559                                ;;
     11560@@ -16366,7 +16455,7 @@
    1097311561        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
    1097411562        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
    1097511563 fi
    1097611564-echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
    10977 +echo "$as_me:16438: result: $CXX_LIB_SUFFIX" >&5
     11565+echo "$as_me:16458: result: $CXX_LIB_SUFFIX" >&5
    1097811566 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
    1097911567 
    1098011568 fi
    10981 @@ -16519,12 +16588,12 @@
     11569@@ -16480,7 +16569,7 @@
     11570 
     11571 if test "$GCC" = yes ; then
     11572        case $cf_cv_system_name in #(
     11573-       OS/2*|os2*|aix[45]*)    #( vi
     11574+       OS/2*|os2*|aix[4]*)     #( vi
     11575                LDFLAGS_STATIC=
     11576                LDFLAGS_SHARED=
     11577                ;;
     11578@@ -16491,7 +16580,7 @@
     11579     esac
     11580 else
     11581        case $cf_cv_system_name in #(
     11582-       aix[45]*)       #( from ld manpage
     11583+       aix[456]*)      #( from ld manpage
     11584                LDFLAGS_STATIC=-bstatic
     11585                LDFLAGS_SHARED=-bdynamic
     11586                ;;
     11587@@ -16519,12 +16608,12 @@
    1098211588        ;;
    1098311589 esac
    1098411590 
    1098511591-echo "$as_me:16522: checking where we will install curses.h" >&5
    10986 +echo "$as_me:16591: checking where we will install curses.h" >&5
     11592+echo "$as_me:16611: checking where we will install curses.h" >&5
    1098711593 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
    1098811594 test "$with_overwrite" = no && \
    … …  
    1099011596        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
    1099111597-echo "$as_me:16527: result: $includedir" >&5
    10992 +echo "$as_me:16596: result: $includedir" >&5
     11598+echo "$as_me:16616: result: $includedir" >&5
    1099311599 echo "${ECHO_T}$includedir" >&6
    1099411600 
    1099511601 ### Resolve a conflict between normal and wide-curses by forcing applications
    10996 @@ -16532,7 +16601,7 @@
     11602@@ -16532,7 +16621,7 @@
    1099711603 if test "$with_overwrite" != no ; then
    1099811604 if test "$NCURSES_LIBUTF8" = 1 ; then
    1099911605        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
    1100011606-       { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    11001 +       { echo "$as_me:16604: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
     11607+       { echo "$as_me:16624: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    1100211608 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
    1100311609 fi
    1100411610 fi
    11005 @@ -16548,7 +16617,7 @@
     11611@@ -16548,7 +16637,7 @@
    1100611612 ### Construct the list of subdirectories for which we'll customize makefiles
    1100711613 ### with the appropriate compile-rules.
    1100811614 
    1100911615-echo "$as_me:16551: checking for src modules" >&5
    11010 +echo "$as_me:16620: checking for src modules" >&5
     11616+echo "$as_me:16640: checking for src modules" >&5
    1101111617 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
    1101211618 
    1101311619 # dependencies and linker-arguments for test-programs
    11014 @@ -16611,13 +16680,17 @@
     11620@@ -16611,13 +16700,17 @@
    1101511621                fi
    1101611622        fi
    1101711623 done
    1101811624-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
    11019 +echo "$as_me:16683: result: $cf_cv_src_modules" >&5
     11625+echo "$as_me:16703: result: $cf_cv_src_modules" >&5
    1102011626 echo "${ECHO_T}$cf_cv_src_modules" >&6
    1102111627 
    … …  
    1103211638 do
    1103311639        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    11034 @@ -16760,18 +16833,18 @@
     11640@@ -16628,8 +16721,8 @@
     11641 
     11642 ADA_SUBDIRS=
     11643 if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
     11644-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
     11645-   ADA_SUBDIRS="gen src samples"
     11646+       SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
     11647+       ADA_SUBDIRS="gen src samples"
     11648 fi
     11649 
     11650 SUB_MAKEFILES=
     11651@@ -16639,10 +16732,10 @@
     11652 done
     11653 
     11654 if test -n "$ADA_SUBDIRS"; then
     11655-   for cf_dir in $ADA_SUBDIRS
     11656-   do
     11657-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
     11658-   done
     11659+       for cf_dir in $ADA_SUBDIRS
     11660+       do
     11661+               SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
     11662+       done
     11663 
     11664 fi
     11665 
     11666@@ -16760,18 +16853,18 @@
    1103511667 ### If we're building with rpath, try to link non-standard libs that way too.
    1103611668 if test "$DFT_LWR_MODEL" = "shared"; then
    1103711669 
    1103811670-echo "$as_me:16763: checking for updated LDFLAGS" >&5
    11039 +echo "$as_me:16836: checking for updated LDFLAGS" >&5
     11671+echo "$as_me:16856: checking for updated LDFLAGS" >&5
    1104011672 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
    1104111673 if test -n "$LDFLAGS" ; then
    1104211674-echo "$as_me:16766: result: maybe" >&5
    11043 +echo "$as_me:16839: result: maybe" >&5
     11675+echo "$as_me:16859: result: maybe" >&5
    1104411676 echo "${ECHO_T}maybe" >&6
    1104511677 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
    1104611678 
    1104711679-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    11048 +echo "${as_me-configure}:16843: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
     11680+echo "${as_me-configure}:16863: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    1104911681 
    1105011682 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1105111683 
    1105211684-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    11053 +echo "${as_me-configure}:16847: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     11685+echo "${as_me-configure}:16867: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1105411686 
    1105511687 case "$EXTRA_LDFLAGS" in #(vi
    1105611688 -Wl,-rpath,*) #(vi
    11057 @@ -16793,7 +16866,7 @@
     11689@@ -16793,7 +16886,7 @@
    1105811690        do
    1105911691                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
    1106011692 
    1106111693-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
    11062 +echo "${as_me-configure}:16869: testing Filtering $cf_rpath_src ..." 1>&5
     11694+echo "${as_me-configure}:16889: testing Filtering $cf_rpath_src ..." 1>&5
    1106311695 
    1106411696                case $cf_rpath_src in #(vi
    1106511697                -L*) #(vi
    11066 @@ -16804,7 +16877,7 @@
     11698@@ -16804,7 +16897,7 @@
    1106711699                        fi
    1106811700                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
    1106911701 
    1107011702-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
    11071 +echo "${as_me-configure}:16880: testing ...Filter $cf_rpath_tmp ..." 1>&5
     11703+echo "${as_me-configure}:16900: testing ...Filter $cf_rpath_tmp ..." 1>&5
    1107211704 
    1107311705                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
    1107411706                        ;;
    11075 @@ -16814,15 +16887,15 @@
     11707@@ -16814,15 +16907,15 @@
    1107611708        LDFLAGS=$cf_rpath_dst
    1107711709        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
    1107811710 
    1107911711-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    11080 +echo "${as_me-configure}:16890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
     11712+echo "${as_me-configure}:16910: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    1108111713 
    1108211714        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1108311715 
    1108411716-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    11085 +echo "${as_me-configure}:16894: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     11717+echo "${as_me-configure}:16914: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1108611718 
    1108711719 fi
    1108811720 else
    1108911721-echo "$as_me:16825: result: no" >&5
    11090 +echo "$as_me:16898: result: no" >&5
     11722+echo "$as_me:16918: result: no" >&5
    1109111723 echo "${ECHO_T}no" >&6
    1109211724 fi
    1109311725 
    11094 @@ -16932,7 +17005,7 @@
     11726@@ -16932,7 +17025,7 @@
    1109511727 : ${CONFIG_STATUS=./config.status}
    1109611728 ac_clean_files_save=$ac_clean_files
    1109711729 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    1109811730-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
    11099 +{ echo "$as_me:17008: creating $CONFIG_STATUS" >&5
     11731+{ echo "$as_me:17028: creating $CONFIG_STATUS" >&5
    1110011732 echo "$as_me: creating $CONFIG_STATUS" >&6;}
    1110111733 cat >$CONFIG_STATUS <<_ACEOF
    1110211734 #! $SHELL
    11103 @@ -17108,7 +17181,7 @@
     11735@@ -17064,7 +17157,7 @@
     11736 cat >>$CONFIG_STATUS <<EOF
     11737 ac_cs_version="\\
     11738 config.status
     11739-configured by $0, generated by GNU Autoconf 2.52.20080325,
     11740+configured by $0, generated by GNU Autoconf 2.52.20081225,
     11741   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     11742 
     11743 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
     11744@@ -17108,7 +17201,7 @@
    1110411745     echo "$ac_cs_version"; exit 0 ;;
    1110511746   --he | --h)
    1110611747     # Conflict between --help and --header
    1110711748-    { { echo "$as_me:17111: error: ambiguous option: $1
    11108 +    { { echo "$as_me:17184: error: ambiguous option: $1
     11749+    { { echo "$as_me:17204: error: ambiguous option: $1
    1110911750 Try \`$0 --help' for more information." >&5
    1111011751 echo "$as_me: error: ambiguous option: $1
    1111111752 Try \`$0 --help' for more information." >&2;}
    11112 @@ -17127,7 +17200,7 @@
     11753@@ -17127,7 +17220,7 @@
    1111311754     ac_need_defaults=false;;
    1111411755 
    1111511756   # This is an error.
    1111611757-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
    11117 +  -*) { { echo "$as_me:17203: error: unrecognized option: $1
     11758+  -*) { { echo "$as_me:17223: error: unrecognized option: $1
    1111811759 Try \`$0 --help' for more information." >&5
    1111911760 echo "$as_me: error: unrecognized option: $1
    1112011761 Try \`$0 --help' for more information." >&2;}
    11121 @@ -17206,6 +17279,7 @@
     11762@@ -17146,7 +17239,7 @@
     11763 ## Running config.status.  ##
     11764 ## ----------------------- ##
     11765 
     11766-This file was extended by $as_me 2.52.20080325, executed with
     11767+This file was extended by $as_me 2.52.20081225, executed with
     11768   CONFIG_FILES    = $CONFIG_FILES
     11769   CONFIG_HEADERS  = $CONFIG_HEADERS
     11770   CONFIG_LINKS    = $CONFIG_LINKS
     11771@@ -17206,6 +17299,7 @@
    1112211772 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1112311773 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1112711777 target="$target"
    1112811778 
    11129 @@ -17224,7 +17298,7 @@
     11779@@ -17224,7 +17318,7 @@
    1113011780   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1113111781   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    1113211782   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
    1113311783-  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
    11134 +  *) { { echo "$as_me:17301: error: invalid argument: $ac_config_target" >&5
     11784+  *) { { echo "$as_me:17321: error: invalid argument: $ac_config_target" >&5
    1113511785 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    1113611786    { (exit 1); exit 1; }; };;
    1113711787   esac
    11138 @@ -17607,7 +17681,7 @@
     11788@@ -17425,6 +17519,7 @@
     11789 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
     11790 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
     11791 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
     11792+s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
     11793 s,@NCURSES_CONST@,$NCURSES_CONST,;t t
     11794 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
     11795 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
     11796@@ -17607,7 +17702,7 @@
    1113911797   esac
    1114011798 
    1114111799   if test x"$ac_file" != x-; then
    1114211800-    { echo "$as_me:17610: creating $ac_file" >&5
    11143 +    { echo "$as_me:17684: creating $ac_file" >&5
     11801+    { echo "$as_me:17705: creating $ac_file" >&5
    1114411802 echo "$as_me: creating $ac_file" >&6;}
    1114511803     rm -f "$ac_file"
    1114611804   fi
    11147 @@ -17625,7 +17699,7 @@
     11805@@ -17625,7 +17720,7 @@
    1114811806       -) echo $tmp/stdin ;;
    1114911807       [\\/$]*)
    1115011808          # Absolute (can't be DOS-style, as IFS=:)
    1115111809-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
    11152 +         test -f "$f" || { { echo "$as_me:17702: error: cannot find input file: $f" >&5
     11810+         test -f "$f" || { { echo "$as_me:17723: error: cannot find input file: $f" >&5
    1115311811 echo "$as_me: error: cannot find input file: $f" >&2;}
    1115411812    { (exit 1); exit 1; }; }
    1115511813          echo $f;;
    11156 @@ -17638,7 +17712,7 @@
     11814@@ -17638,7 +17733,7 @@
    1115711815            echo $srcdir/$f
    1115811816          else
    1115911817            # /dev/null tree
    1116011818-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
    11161 +           { { echo "$as_me:17715: error: cannot find input file: $f" >&5
     11819+           { { echo "$as_me:17736: error: cannot find input file: $f" >&5
    1116211820 echo "$as_me: error: cannot find input file: $f" >&2;}
    1116311821    { (exit 1); exit 1; }; }
    1116411822          fi;;
    11165 @@ -17704,7 +17778,7 @@
     11823@@ -17704,7 +17799,7 @@
    1116611824   * )   ac_file_in=$ac_file.in ;;
    1116711825   esac
    1116811826 
    1116911827-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
    11170 +  test x"$ac_file" != x- && { echo "$as_me:17781: creating $ac_file" >&5
     11828+  test x"$ac_file" != x- && { echo "$as_me:17802: creating $ac_file" >&5
    1117111829 echo "$as_me: creating $ac_file" >&6;}
    1117211830 
    1117311831   # First look for the input files in the build tree, otherwise in the
    11174 @@ -17715,7 +17789,7 @@
     11832@@ -17715,7 +17810,7 @@
    1117511833       -) echo $tmp/stdin ;;
    1117611834       [\\/$]*)
    1117711835          # Absolute (can't be DOS-style, as IFS=:)
    1117811836-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
    11179 +         test -f "$f" || { { echo "$as_me:17792: error: cannot find input file: $f" >&5
     11837+         test -f "$f" || { { echo "$as_me:17813: error: cannot find input file: $f" >&5
    1118011838 echo "$as_me: error: cannot find input file: $f" >&2;}
    1118111839    { (exit 1); exit 1; }; }
    1118211840          echo $f;;
    11183 @@ -17728,7 +17802,7 @@
     11841@@ -17728,7 +17823,7 @@
    1118411842            echo $srcdir/$f
    1118511843          else
    1118611844            # /dev/null tree
    1118711845-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
    11188 +           { { echo "$as_me:17805: error: cannot find input file: $f" >&5
     11846+           { { echo "$as_me:17826: error: cannot find input file: $f" >&5
    1118911847 echo "$as_me: error: cannot find input file: $f" >&2;}
    1119011848    { (exit 1); exit 1; }; }
    1119111849          fi;;
    11192 @@ -17786,7 +17860,7 @@
     11850@@ -17786,7 +17881,7 @@
    1119311851   rm -f $tmp/in
    1119411852   if test x"$ac_file" != x-; then
    1119511853     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
    1119611854-      { echo "$as_me:17789: $ac_file is unchanged" >&5
    11197 +      { echo "$as_me:17863: $ac_file is unchanged" >&5
     11855+      { echo "$as_me:17884: $ac_file is unchanged" >&5
    1119811856 echo "$as_me: $ac_file is unchanged" >&6;}
    1119911857     else
    1120011858       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    11201 @@ -18234,18 +18308,28 @@
     11859@@ -17873,40 +17968,44 @@
     11860                for cf_item in $cf_LIST_MODELS
     11861                do
     11862 
     11863-       case $cf_item in
     11864-       libtool)
     11865+       case $cf_item in #(vi
     11866+       libtool) #(vi
     11867                cf_suffix='.la'
     11868                cf_depsuf=$cf_suffix
     11869                ;;
     11870-       normal)
     11871+       normal) #(vi
     11872                cf_suffix='.a'
     11873                cf_depsuf=$cf_suffix
     11874                ;;
     11875-       debug)
     11876+       debug) #(vi
     11877                cf_suffix='_g.a'
     11878                cf_depsuf=$cf_suffix
     11879                ;;
     11880-       profile)
     11881+       profile) #(vi
     11882                cf_suffix='_p.a'
     11883                cf_depsuf=$cf_suffix
     11884                ;;
     11885-       shared)
     11886+       shared) #(vi
     11887                case $cf_cv_system_name in
     11888-               cygwin*)
     11889+               aix[56]*) #(vi
     11890+                       cf_suffix='.a'
     11891+                       cf_depsuf=$cf_suffix
     11892+                       ;;
     11893+               cygwin*) #(vi
     11894                        cf_suffix='.dll'
     11895                        cf_depsuf='.dll.a'
     11896                        ;;
     11897-               darwin*)
     11898+               darwin*) #(vi
     11899                        cf_suffix='.dylib'
     11900                        cf_depsuf=$cf_suffix
     11901                        ;;
     11902-               hpux*)
     11903+               hpux*) #(vi
     11904                        case $target in
     11905-                       ia64*)
     11906+                       ia64*) #(vi
     11907                                cf_suffix='.so'
     11908                                cf_depsuf=$cf_suffix
     11909                                ;;
     11910-                       *)
     11911+                       *) #(vi
     11912                                cf_suffix='.sl'
     11913                                cf_depsuf=$cf_suffix
     11914                                ;;
     11915@@ -18020,40 +18119,44 @@
     11916 
     11917 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
     11918 
     11919-       case $cf_item in
     11920-       libtool)
     11921+       case $cf_item in #(vi
     11922+       libtool) #(vi
     11923                cf_suffix='.la'
     11924                cf_depsuf=$cf_suffix
     11925                ;;
     11926-       normal)
     11927+       normal) #(vi
     11928                cf_suffix='.a'
     11929                cf_depsuf=$cf_suffix
     11930                ;;
     11931-       debug)
     11932+       debug) #(vi
     11933                cf_suffix='_g.a'
     11934                cf_depsuf=$cf_suffix
     11935                ;;
     11936-       profile)
     11937+       profile) #(vi
     11938                cf_suffix='_p.a'
     11939                cf_depsuf=$cf_suffix
     11940                ;;
     11941-       shared)
     11942+       shared) #(vi
     11943                case $cf_cv_system_name in
     11944-               cygwin*)
     11945+               aix[56]*) #(vi
     11946+                       cf_suffix='.a'
     11947+                       cf_depsuf=$cf_suffix
     11948+                       ;;
     11949+               cygwin*) #(vi
     11950                        cf_suffix='.dll'
     11951                        cf_depsuf='.dll.a'
     11952                        ;;
     11953-               darwin*)
     11954+               darwin*) #(vi
     11955                        cf_suffix='.dylib'
     11956                        cf_depsuf=$cf_suffix
     11957                        ;;
     11958-               hpux*)
     11959+               hpux*) #(vi
     11960                        case $target in
     11961-                       ia64*)
     11962+                       ia64*) #(vi
     11963                                cf_suffix='.so'
     11964                                cf_depsuf=$cf_suffix
     11965                                ;;
     11966-                       *)
     11967+                       *) #(vi
     11968                                cf_suffix='.sl'
     11969                                cf_depsuf=$cf_suffix
     11970                                ;;
     11971@@ -18234,18 +18337,28 @@
    1120211972 install.libs uninstall.libs \\
    1120311973 install.data uninstall.data ::
    … …  
    1122811998 if test -f $srcdir/$tack.h; then
    1122911999 cat >> Makefile <<CF_EOF
    11230 @@ -18256,6 +18340,7 @@
     12000@@ -18256,6 +18369,7 @@
    1123112001 CF_EOF
    1123212002 fi
    … …  
    1123812008diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
    1123912009--- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
    11240 +++ ncurses-5.7/configure.in    2008-12-20 14:47:08.000000000 -0800
     12010+++ ncurses-5.7/configure.in    2008-12-29 20:11:58.000000000 -0800
    1124112011@@ -28,14 +28,14 @@
    1124212012 dnl
    … …  
    1124412014 dnl
    1124512015-dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
    11246 +dnl $Id: configure.in,v 1.456 2008/11/16 00:36:30 tom Exp $
     12016+dnl $Id: configure.in,v 1.457 2008/12/20 22:28:22 tom Exp $
    1124712017 dnl Process this file with autoconf to produce a configure script.
    1124812018 dnl
    … …  
    1125212022 AC_PREREQ(2.13.20020210)
    1125312023-AC_REVISION($Revision: 1.454 $)
    11254 +AC_REVISION($Revision: 1.456 $)
     12024+AC_REVISION($Revision: 1.457 $)
    1125512025 AC_INIT(ncurses/base/lib_initscr.c)
    1125612026 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
    … …  
    1127912049 ###############################################################################
    1128012050 CF_HELP_MESSAGE(Extensions:)
    11281 @@ -1821,6 +1828,7 @@
     12051@@ -828,10 +835,13 @@
     12052        AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
     12053        AC_DEFINE(HAVE_WRESIZE)
     12054        AC_DEFINE(NCURSES_EXT_FUNCS)
     12055+       GENERATED_EXT_FUNCS=generated
     12056 else
     12057        NCURSES_EXT_FUNCS=0
     12058+       GENERATED_EXT_FUNCS=
     12059 fi
     12060 AC_SUBST(NCURSES_EXT_FUNCS)
     12061+AC_SUBST(GENERATED_EXT_FUNCS)
     12062 
     12063 ###   use option --enable-const to turn on use of const beyond that in XSI.
     12064 AC_MSG_CHECKING(for extended use of const keyword)
     12065@@ -1821,6 +1831,7 @@
    1128212066 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1128312067 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1128912073diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
    1129012074--- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
    11291 +++ ncurses-5.7/dist.mk 2008-12-20 14:47:16.000000000 -0800
     12075+++ ncurses-5.7/dist.mk 2008-12-29 20:12:06.000000000 -0800
    1129212076@@ -25,7 +25,7 @@
    1129312077 # use or other dealings in this Software without prior written               #
    … …  
    1129512079 ##############################################################################
    1129612080-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
    11297 +# $Id: dist.mk,v 1.676 2008/12/13 18:14:24 tom Exp $
     12081+# $Id: dist.mk,v 1.678 2008/12/27 14:04:37 tom Exp $
    1129812082 # Makefile for creating ncurses distributions.
    1129912083 #
    … …  
    1130412088 NCURSES_MINOR = 7
    1130512089-NCURSES_PATCH = 20081102
    11306 +NCURSES_PATCH = 20081213
     12090+NCURSES_PATCH = 20081227
    1130712091 
    1130812092 # We don't append the patch to the version, since this only applies to releases
    … …  
    1131012094diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
    1131112095--- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
    11312 +++ ncurses-5.7/form/frm_driver.c       2008-12-20 14:47:14.000000000 -0800
     12096+++ ncurses-5.7/form/frm_driver.c       2008-12-29 20:11:49.000000000 -0800
    1131312097@@ -32,7 +32,7 @@
    1131412098 
    … …  
    1133012114diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
    1133112115--- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
    11332 +++ ncurses-5.7/include/curses.h.in     2008-12-20 14:47:12.000000000 -0800
     12116+++ ncurses-5.7/include/curses.h.in     2008-12-29 20:11:58.000000000 -0800
    1133312117@@ -32,7 +32,7 @@
    1133412118  *     and: Thomas E. Dickey                        1996-on                 *
    … …  
    1133612120 
    1133712121-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
    11338 +/* $Id: curses.h.in,v 1.189 2008/11/29 18:35:46 tom Exp $ */
     12122+/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
    1133912123 
    1134012124 #ifndef __NCURSES_H
    … …  
    1135312137 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
    1135412138 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
     12139@@ -856,18 +850,18 @@
     12140  * These extensions provide access to information stored in the WINDOW even
     12141  * when NCURSES_OPAQUE is set:
     12142  */
     12143-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);   /* generated */
     12144-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);       /* generated */
     12145-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);         /* generated */
     12146-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);         /* generated */
     12147-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);       /* generated */
     12148-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);                /* generated */
     12149-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);       /* generated */
     12150-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);       /* generated */
     12151-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);     /* generated */
     12152-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);      /* generated */
     12153-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);                /* generated */
     12154-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
     12155+extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);   /* @GENERATED_EXT_FUNCS@ */
     12156+extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);       /* @GENERATED_EXT_FUNCS@ */
     12157+extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);         /* @GENERATED_EXT_FUNCS@ */
     12158+extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);         /* @GENERATED_EXT_FUNCS@ */
     12159+extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);       /* @GENERATED_EXT_FUNCS@ */
     12160+extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
     12161+extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);       /* @GENERATED_EXT_FUNCS@ */
     12162+extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);       /* @GENERATED_EXT_FUNCS@ */
     12163+extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);     /* @GENERATED_EXT_FUNCS@ */
     12164+extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);      /* @GENERATED_EXT_FUNCS@ */
     12165+extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
     12166+extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
     12167 
     12168 #else
     12169 #define curses_version() NCURSES_VERSION
    1135512170diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
    1135612171--- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
    11357 +++ ncurses-5.7/include/curses.tail     2008-12-20 14:47:10.000000000 -0800
     12172+++ ncurses-5.7/include/curses.tail     2008-12-29 20:11:45.000000000 -0800
    1135812173@@ -1,4 +1,4 @@
    1135912174-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
    … …  
    1137212187diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
    1137312188--- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
    11374 +++ ncurses-5.7/include/curses.wide     2008-12-20 14:47:12.000000000 -0800
     12189+++ ncurses-5.7/include/curses.wide     2008-12-29 20:11:47.000000000 -0800
    1137512190@@ -1,9 +1,11 @@
    1137612191-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
    … …  
    1138812203diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
    1138912204--- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
    11390 +++ ncurses-5.7/man/curs_mouse.3x       2008-12-20 14:47:10.000000000 -0800
     12205+++ ncurses-5.7/man/curs_mouse.3x       2008-12-29 20:11:45.000000000 -0800
    1139112206@@ -1,6 +1,6 @@
    1139212207 '\" t
    … …  
    1143412249diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
    1143512250--- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
    11436 +++ ncurses-5.7/man/keybound.3x 2008-12-20 14:47:16.000000000 -0800
     12251+++ ncurses-5.7/man/keybound.3x 2008-12-29 20:11:51.000000000 -0800
    1143712252@@ -1,5 +1,5 @@
    1143812253 .\"***************************************************************************
    … …  
    1145512270diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
    1145612271--- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
    11457 +++ ncurses-5.7/man/tabs.1      2008-12-20 14:47:08.000000000 -0800
     12272+++ ncurses-5.7/man/tabs.1      2008-12-29 20:11:43.000000000 -0800
    1145812273@@ -0,0 +1,143 @@
    1145912274+.\"***************************************************************************
    … …  
    1160212417diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
    1160312418--- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
    11604 +++ ncurses-5.7/man/tset.1      2008-12-20 14:47:08.000000000 -0800
     12419+++ ncurses-5.7/man/tset.1      2008-12-29 20:11:43.000000000 -0800
    1160512420@@ -1,5 +1,5 @@
    1160612421 .\"***************************************************************************
    … …  
    1162312438diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
    1162412439--- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
    11625 +++ ncurses-5.7/misc/Makefile.in        2008-12-20 14:47:16.000000000 -0800
     12440+++ ncurses-5.7/misc/Makefile.in        2008-12-29 20:11:51.000000000 -0800
    1162612441@@ -1,6 +1,6 @@
    1162712442-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
    … …  
    1164412459diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
    1164512460--- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
    11646 +++ ncurses-5.7/misc/terminfo.src       2008-12-20 14:47:12.000000000 -0800
     12461+++ ncurses-5.7/misc/terminfo.src       2008-12-29 20:11:47.000000000 -0800
    1164712462@@ -6,8 +6,8 @@
    1164812463 # Report bugs and new terminal descriptions to
    … …  
    1179612611 # Local Variables:
    1179712612 # fill-prefix:"\t"
     12613diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
     12614--- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
     12615+++ ncurses-5.7/mk-1st.awk      2008-12-29 20:12:06.000000000 -0800
     12616@@ -1,6 +1,6 @@
     12617-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
     12618+# $Id: mk-1st.awk,v 1.79 2008/12/28 01:17:54 tom Exp $
     12619 ##############################################################################
     12620-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
     12621+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
     12622 #                                                                            #
     12623 # Permission is hereby granted, free of charge, to any person obtaining a    #
     12624 # copy of this software and associated documentation files (the "Software"), #
     12625@@ -59,7 +59,7 @@
     12626                return ( subset ~ /^ticlib$/ );
     12627        }
     12628 function is_termlib() {
     12629-               return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
     12630+               return ( subset ~ /^(ticlib\+)?termlib((\+[^+ ]+)*\+ext_tinfo)?$/ );
     12631        }
     12632 # see lib_name
     12633 function lib_name_of(a_name) {
    1179812634diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
    1179912635--- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
    11800 +++ ncurses-5.7/ncurses/base/lib_addch.c        2008-12-20 14:47:12.000000000 -0800
     12636+++ ncurses-5.7/ncurses/base/lib_addch.c        2008-12-29 20:11:47.000000000 -0800
    1180112637@@ -36,7 +36,7 @@
    1180212638 #include <curses.priv.h>
    … …  
    1184012676diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
    1184112677--- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
    11842 +++ ncurses-5.7/ncurses/base/lib_freeall.c      2008-12-20 14:47:14.000000000 -0800
     12678+++ ncurses-5.7/ncurses/base/lib_freeall.c      2008-12-29 20:11:49.000000000 -0800
    1184312679@@ -40,7 +40,7 @@
    1184412680 extern int malloc_errfd;       /* FIXME */
    … …  
    1186112697diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
    1186212698--- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
    11863 +++ ncurses-5.7/ncurses/base/lib_mouse.c        2008-12-20 14:47:14.000000000 -0800
     12699+++ ncurses-5.7/ncurses/base/lib_mouse.c        2008-12-29 20:11:49.000000000 -0800
    1186412700@@ -79,7 +79,7 @@
    1186512701 
    … …  
    1192012756diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
    1192112757--- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
    11922 +++ ncurses-5.7/ncurses/curses.priv.h   2008-12-20 14:47:10.000000000 -0800
     12758+++ ncurses-5.7/ncurses/curses.priv.h   2008-12-29 20:11:45.000000000 -0800
    1192312759@@ -34,7 +34,7 @@
    1192412760 
    … …  
    1194112777diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
    1194212778--- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
    11943 +++ ncurses-5.7/ncurses/tinfo/entries.c 2008-12-20 14:47:14.000000000 -0800
     12779+++ ncurses-5.7/ncurses/tinfo/entries.c 2008-12-29 20:11:49.000000000 -0800
    1194412780@@ -37,7 +37,7 @@
    1194512781 #include <tic.h>
    … …  
    1196312799diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
    1196412800--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
    11965 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2008-12-20 14:47:16.000000000 -0800
     12801+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2008-12-29 20:11:51.000000000 -0800
    1196612802@@ -1,5 +1,5 @@
    1196712803 /****************************************************************************
    … …  
    1206912905diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
    1207012906--- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
    12071 +++ ncurses-5.7/progs/Makefile.in       2008-12-20 14:47:08.000000000 -0800
     12907+++ ncurses-5.7/progs/Makefile.in       2008-12-29 20:11:43.000000000 -0800
    1207212908@@ -1,6 +1,6 @@
    1207312909-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
    … …  
    1213512971diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
    1213612972--- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
    12137 +++ ncurses-5.7/progs/modules   2008-12-20 14:47:08.000000000 -0800
     12973+++ ncurses-5.7/progs/modules   2008-12-29 20:11:43.000000000 -0800
    1213812974@@ -1,7 +1,7 @@
    1213912975-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
    … …  
    1215612992diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
    1215712993--- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
    12158 +++ ncurses-5.7/progs/tabs.c    2008-12-20 14:47:10.000000000 -0800
     12994+++ ncurses-5.7/progs/tabs.c    2008-12-29 20:11:45.000000000 -0800
    1215912995@@ -0,0 +1,506 @@
    1216012996+/****************************************************************************
    … …  
    1266413500+    ExitProgram(rc);
    1266513501+}
     13502diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
     13503--- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
     13504+++ ncurses-5.7/test/README     2008-12-29 20:11:58.000000000 -0800
     13505@@ -25,7 +25,7 @@
     13506 -- sale, use or other dealings in this Software without prior written        --
     13507 -- authorization.                                                            --
     13508 -------------------------------------------------------------------------------
     13509--- $Id: README,v 1.38 2008/10/18 21:02:45 tom Exp $
     13510+-- $Id: README,v 1.39 2008/12/20 23:38:13 tom Exp $
     13511 -------------------------------------------------------------------------------
     13512 
     13513 The programs in this directory are designed to test your newest toy :-)
     13514@@ -87,7 +87,7 @@
     13515 field_status                   test: demo_forms
     13516 field_term                     -
     13517 field_type                     test: demo_forms
     13518-field_userptr                  test: edit_field ncurses
     13519+field_userptr                  test: demo_forms edit_field ncurses
     13520 form_driver                    test: cardfile demo_forms edit_field ncurses
     13521 form_fields                    test: cardfile demo_forms
     13522 form_init                      -
     13523@@ -211,7 +211,7 @@
     13524 ----------
     13525 BC                             -
     13526 COLORS                         test: echochar ncurses savescreen xmas
     13527-COLOR_PAIR                     test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13528+COLOR_PAIR                     test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13529 COLOR_PAIRS                    test: echochar ncurses newdemo savescreen
     13530 COLS                           test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
     13531 ESCDELAY                       test: test_opaque
     13532@@ -239,9 +239,9 @@
     13533 attr_set                       test: ncurses
     13534 attroff                                test: echochar filter gdc ncurses tclock
     13535 attron                         test: bs echochar filter gdc ncurses
     13536-attrset                                test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
     13537+attrset                                test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
     13538 baudrate                       lib: ncurses
     13539-beep                           test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
     13540+beep                           test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
     13541 bkgd                           test: background cardfile demo_forms ncurses savescreen tclock view
     13542 bkgdset                                test: background ncurses testaddch
     13543 bkgrnd                         test: ncurses
     13544@@ -251,10 +251,10 @@
     13545 boolnames                      test: test_arrays progs: dump_entry infocmp
     13546 border                         -
     13547 border_set                     -
     13548-box                            test: cardfile chgat demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13549+box                            test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13550 box_set                                test: ncurses
     13551 can_change_color               test: ncurses
     13552-cbreak                         test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
     13553+cbreak                         test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
     13554 chgat                          test: chgat
     13555 clear                          test: blue bs gdc ncurses testcurs xmas
     13556 clearok                                test: bs knight
     13557@@ -263,7 +263,7 @@
     13558 color_content                  test: ncurses
     13559 color_set                      test: color_set ncurses
     13560 copywin                                test: ncurses testcurs
     13561-cur_term                       test: dots dots_mvcur lrtest progs: clear tput tset
     13562+cur_term                       test: dots dots_mvcur lrtest progs: clear tabs tput tset
     13563 curs_set                       test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
     13564 curscr                         test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
     13565 curses_version                 test: ncurses progs: infocmp tic toe tput tset
     13566@@ -273,16 +273,16 @@
     13567 del_curterm                    lib: ncurses
     13568 delay_output                   test: newdemo
     13569 delch                          -
     13570-deleteln                       -
     13571+deleteln                       test: insdelln
     13572 delscreen                      test: ditto dots_mvcur
     13573-delwin                         test: cardfile chgat demo_forms demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13574-derwin                         test: cardfile chgat demo_forms demo_menus ditto inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
     13575+delwin                         test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13576+derwin                         test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
     13577 doupdate                       test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
     13578 dupwin                         test: edit_field
     13579 echo                           test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
     13580 echo_wchar                     test: ncurses
     13581 echochar                       test: echochar ncurses
     13582-endwin                         test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
     13583+endwin                         test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
     13584 erase                          test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
     13585 erasechar                      lib: ncurses
     13586 erasewchar                     -
     13587@@ -292,16 +292,16 @@
     13588 get_wch                                -
     13589 get_wstr                       test: test_get_wstr
     13590 getattrs                       -
     13591-getbegx                                test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
     13592-getbegy                                test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
     13593+getbegx                                test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
     13594+getbegy                                test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
     13595 getbkgd                                test: ncurses
     13596 getbkgrnd                      test: ncurses
     13597 getcchar                       test: ncurses view
     13598-getch                          test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock test_opaque testaddch testcurs view xmas
     13599-getcurx                                test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
     13600-getcury                                test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen test_opaque testcurs
     13601-getmaxx                                test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13602-getmaxy                                test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13603+getch                          test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
     13604+getcurx                                test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
     13605+getcury                                test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
     13606+getmaxx                                test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13607+getmaxy                                test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13608 getmouse                       test: bs knight movewindow ncurses
     13609 getn_wstr                      test: test_get_wstr
     13610 getnstr                                test: filter ncurses test_getstr
     13611@@ -310,10 +310,11 @@
     13612 getstr                         test: test_getstr
     13613 getwin                         test: ncurses
     13614 halfdelay                      test: view
     13615-has_colors                     test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
     13616+has_colors                     test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
     13617 has_ic                         test: lrtest
     13618 has_il                         lib: ncurses
     13619 has_key                                lib: ncurses
     13620+has_mouse                      -
     13621 hline                          test: gdc ncurses
     13622 hline_set                      -
     13623 idcok                          test: test_opaque
     13624@@ -326,16 +327,16 @@
     13625 inchnstr                       test: inchs
     13626 inchstr                                test: inchs
     13627 init_color                     test: ncurses
     13628-init_pair                      test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13629-initscr                                test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
     13630+init_pair                      test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13631+initscr                                test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
     13632 innstr                         test: test_instr
     13633 innwstr                                test: test_inwstr
     13634 ins_nwstr                      test: ins_wide
     13635 ins_wch                                test: ins_wide
     13636 ins_wstr                       test: ins_wide
     13637 insch                          test: ins_wide inserts
     13638-insdelln                       -
     13639-insertln                       -
     13640+insdelln                       test: insdelln
     13641+insertln                       test: insdelln
     13642 insnstr                                test: inserts
     13643 insstr                         test: inserts
     13644 instr                          test: test_instr
     13645@@ -360,7 +361,7 @@
     13646 keybound                       test: demo_altkeys demo_defkey
     13647 keyname                                test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
     13648 keyok                          test: demo_keyok foldkeys
     13649-keypad                         test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
     13650+keypad                         test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
     13651 killchar                       lib: ncurses
     13652 killwchar                      -
     13653 leaveok                                test: hanoi test_opaque
     13654@@ -450,7 +451,7 @@
     13655 mvwinsstr                      test: inserts testcurs
     13656 mvwinstr                       test: test_instr
     13657 mvwinwstr                      test: test_inwstr
     13658-mvwprintw                      test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
     13659+mvwprintw                      test: chgat clip_printw demo_panels inch_wide inchs insdelln ncurses test_instr test_inwstr testcurs
     13660 mvwscanw                       test: testcurs
     13661 mvwvline                       test: ins_wide inserts movewindow
     13662 mvwvline_set                   -
     13663@@ -458,11 +459,11 @@
     13664 newpad                         test: edit_field ncurses testcurs
     13665 newscr                         lib: ncurses
     13666 newterm                                test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
     13667-newwin                         test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
     13668+newwin                         test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
     13669 nl                             test: demo_forms ncurses rain testcurs
     13670 nocbreak                       test: testcurs
     13671 nodelay                                test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
     13672-noecho                         test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
     13673+noecho                         test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
     13674 nofilter                       -
     13675 nonl                           test: bs demo_forms hashtest movewindow ncurses view worm xmas
     13676 noqiflush                      -
     13677@@ -501,14 +502,14 @@
     13678 scr_set                                test: savescreen
     13679 scrl                           test: view
     13680 scroll                         test: testcurs
     13681-scrollok                       test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
     13682+scrollok                       test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
     13683 set_curterm                    lib: ncurses
     13684 set_escdelay                   test: test_opaque
     13685 set_tabsize                    test: test_opaque
     13686 set_term                       lib: ncurses
     13687 setcchar                       test: demo_panels ins_wide ncurses view
     13688 setscrreg                      test: view
     13689-setupterm                      test: dots progs: clear tput tset
     13690+setupterm                      test: dots progs: clear tabs tput tset
     13691 slk_attr                       -
     13692 slk_attr_off                   -
     13693 slk_attr_on                    -
     13694@@ -528,8 +529,8 @@
     13695 slk_wset                       test: ncurses
     13696 standend                       test: blue gdc ncurses
     13697 standout                       test: blue ncurses
     13698-start_color                    test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13699-stdscr                         test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
     13700+start_color                    test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
     13701+stdscr                         test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
     13702 strcodes                       test: test_arrays progs: dump_entry
     13703 strfnames                      test: test_arrays progs: dump_entry
     13704 strnames                       test: foldkeys test_arrays progs: dump_entry infocmp tic
     13705@@ -548,10 +549,10 @@
     13706 tigetnum                       test: ncurses progs: tput
     13707 tigetstr                       test: blue demo_defkey foldkeys testcurs progs: tput
     13708 timeout                                test: rain savescreen
     13709-touchline                      test: chgat
     13710-touchwin                       test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
     13711-tparm                          test: dots dots_mvcur progs: tic tput
     13712-tputs                          test: dots dots_mvcur railroad progs: clear tset
     13713+touchline                      test: chgat clip_printw insdelln
     13714+touchwin                       test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
     13715+tparm                          test: dots dots_mvcur progs: tabs tic tput
     13716+tputs                          test: dots dots_mvcur railroad progs: clear tabs tset
     13717 trace                          test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
     13718 ttytype                                lib: ncurses
     13719 typeahead                      test: testcurs
     13720@@ -572,7 +573,7 @@
     13721 vidputs                                lib: ncurses
     13722 vline                          test: gdc ncurses
     13723 vline_set                      -
     13724-vw_printw                      -
     13725+vw_printw                      test: clip_printw
     13726 vw_scanw                       -
     13727 vwprintw                       test: movewindow
     13728 vwscanw                                lib: ncurses
     13729@@ -584,7 +585,7 @@
     13730 waddchstr                      -
     13731 waddnstr                       lib: menu
     13732 waddnwstr                      test: ncurses
     13733-waddstr                                test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
     13734+waddstr                                test: chgat clip_printw demo_forms demo_panels edit_field firstlast ins_wide insdelln knight ncurses redraw testcurs
     13735 waddwstr                       test: ins_wide test_get_wstr
     13736 wattr_get                      -
     13737 wattr_off                      lib: ncurses
     13738@@ -592,21 +593,21 @@
     13739 wattr_set                      -
     13740 wattroff                       test: demo_forms ncurses testcurs xmas
     13741 wattron                                test: testcurs xmas
     13742-wattrset                       test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
     13743+wattrset                       test: clip_printw demo_forms insdelln ncurses newdemo test_get_wstr test_getstr testcurs xmas
     13744 wbkgd                          test: cardfile demo_forms demo_menus ncurses newdemo testcurs
     13745 wbkgdset                       test: demo_panels ins_wide inserts ncurses
     13746 wbkgrnd                                lib: ncurses
     13747 wbkgrndset                     lib: ncurses
     13748-wborder                                lib: ncurses
     13749-wborder_set                    lib: ncurses
     13750+wborder                                test: ncurses
     13751+wborder_set                    test: ncurses
     13752 wchgat                         test: chgat test_get_wstr test_getstr view
     13753 wclear                         test: ncurses test_opaque testcurs
     13754 wclrtobot                      test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
     13755-wclrtoeol                      test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
     13756+wclrtoeol                      test: chgat clip_printw demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide insdelln inserts knight ncurses test_instr test_inwstr testcurs
     13757 wcolor_set                     lib: ncurses
     13758 wcursyncup                     lib: form
     13759 wdelch                         test: ncurses testcurs
     13760-wdeleteln                      test: testcurs
     13761+wdeleteln                      test: insdelln testcurs
     13762 wecho_wchar                    lib: ncurses
     13763 wechochar                      lib: ncurses
     13764 wenclose                       lib: form
     13765@@ -614,7 +615,7 @@
     13766 wget_wch                       test: ins_wide ncurses
     13767 wget_wstr                      test: test_get_wstr
     13768 wgetbkgrnd                     lib: ncurses
     13769-wgetch                         test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
     13770+wgetch                         test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
     13771 wgetn_wstr                     test: ncurses test_get_wstr
     13772 wgetnstr                       test: ncurses test_getstr
     13773 wgetparent                     test: test_opaque
     13774@@ -634,18 +635,18 @@
     13775 wins_wch                       test: ins_wide
     13776 wins_wstr                      test: ins_wide
     13777 winsch                         test: ins_wide inserts testcurs
     13778-winsdelln                      lib: ncurses
     13779-winsertln                      test: testcurs
     13780+winsdelln                      test: insdelln
     13781+winsertln                      test: insdelln testcurs
     13782 winsnstr                       test: inserts
     13783 winsstr                                test: inserts
     13784 winstr                         test: test_instr
     13785 winwstr                                test: test_inwstr
     13786 wmouse_trafo                   lib: form
     13787-wmove                          test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
     13788+wmove                          test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
     13789 wnoutrefresh                   test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
     13790-wprintw                                test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13791+wprintw                                test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
     13792 wredrawln                      test: redraw
     13793-wrefresh                       test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
     13794+wrefresh                       test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast insdelln knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
     13795 wresize                                test: cardfile ncurses
     13796 wscanw                         test: testcurs
     13797 wscrl                          test: ncurses testcurs
     13798diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
     13799--- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
     13800+++ ncurses-5.7/test/clip_printw.c      2008-12-29 20:11:58.000000000 -0800
     13801@@ -0,0 +1,360 @@
     13802+/****************************************************************************
     13803+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
     13804+ *                                                                          *
     13805+ * Permission is hereby granted, free of charge, to any person obtaining a  *
     13806+ * copy of this software and associated documentation files (the            *
     13807+ * "Software"), to deal in the Software without restriction, including      *
     13808+ * without limitation the rights to use, copy, modify, merge, publish,      *
     13809+ * distribute, distribute with modifications, sublicense, and/or sell       *
     13810+ * copies of the Software, and to permit persons to whom the Software is    *
     13811+ * furnished to do so, subject to the following conditions:                 *
     13812+ *                                                                          *
     13813+ * The above copyright notice and this permission notice shall be included  *
     13814+ * in all copies or substantial portions of the Software.                   *
     13815+ *                                                                          *
     13816+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
     13817+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
     13818+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
     13819+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
     13820+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
     13821+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
     13822+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
     13823+ *                                                                          *
     13824+ * Except as contained in this notice, the name(s) of the above copyright   *
     13825+ * holders shall not be used in advertising or otherwise to promote the     *
     13826+ * sale, use or other dealings in this Software without prior written       *
     13827+ * authorization.                                                           *
     13828+ ****************************************************************************/
     13829+/*
     13830+ * $Id: clip_printw.c,v 1.1 2008/12/20 21:03:06 tom Exp $
     13831+ *
     13832+ * demonstrate how to use printw without wrapping.
     13833+ */
     13834+
     13835+#include <test.priv.h>
     13836+
     13837+#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
     13838+#define COLOR_DEFAULT (-1)
     13839+
     13840+typedef struct {
     13841+    unsigned c;
     13842+    unsigned v;
     13843+    int status;
     13844+    int pair;
     13845+    unsigned attr;
     13846+    int count;
     13847+    int ch;
     13848+    const char *c_msg;
     13849+    const char *v_msg;
     13850+    int y_val;
     13851+    int x_val;
     13852+    int y_beg, x_beg;
     13853+    int y_max, x_max;
     13854+} STATUS;
     13855+
     13856+static int
     13857+clip_wprintw(WINDOW *win, const char *fmt,...)
     13858+{
     13859+    int y0, x0, y1, x1, width;
     13860+    WINDOW *sub;
     13861+    va_list ap;
     13862+    int rc;
     13863+
     13864+    /*
     13865+     * Allocate a single-line derived window extending from the current
     13866+     * cursor position to the end of the current line in the given window.
     13867+     * Disable scrolling in the derived window.
     13868+     */
     13869+    getyx(win, y0, x0);
     13870+    width = getmaxx(win) - x0;
     13871+    sub = derwin(win, 1, width, y0, x0);
     13872+    scrollok(sub, FALSE);
     13873+
     13874+    /*
     13875+     * Print the text.
     13876+     */
     13877+    va_start(ap, fmt);
     13878+    rc = vw_printw(sub, fmt, ap);
     13879+    va_end(ap);
     13880+
     13881+    getyx(sub, y1, x1);
     13882+    delwin(sub);
     13883+
     13884+    wmove(win, y1 + y0, x1 + x0);
     13885+
     13886+    return rc;
     13887+}
     13888+
     13889+static const char *
     13890+color_params(unsigned state, int *pair)
     13891+{
     13892+    /* *INDENT-OFF* */
     13893+    static struct {
     13894+       int pair;
     13895+       int fg, bg;
     13896+       const char *msg;
     13897+    } table[] = {
     13898+       { 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
     13899+       { 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
     13900+       { 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
     13901+    };
     13902+    /* *INDENT-ON* */
     13903+
     13904+    static bool first = TRUE;
     13905+    const char *result = 0;
     13906+
     13907+    if (has_colors()) {
     13908+       if (first) {
     13909+           unsigned n;
     13910+
     13911+           start_color();
     13912+           for (n = 0; n < SIZEOF(table); ++n) {
     13913+               init_pair(table[n].pair, table[n].fg, table[n].bg);
     13914+           }
     13915+       }
     13916+       if (state < SIZEOF(table)) {
     13917+           *pair = table[state].pair;
     13918+           result = table[state].msg;
     13919+       }
     13920+    }
     13921+    return result;
     13922+}
     13923+
     13924+static const char *
     13925+video_params(unsigned state, unsigned *attr)
     13926+{
     13927+    /* *INDENT-OFF* */
     13928+    static struct {
     13929+       unsigned attr;
     13930+       const char *msg;
     13931+    } table[] = {
     13932+       { A_NORMAL,     "normal" },
     13933+       { A_BOLD,       "bold" },
     13934+       { A_REVERSE,    "reverse" },
     13935+       { A_UNDERLINE,  "underline" },
     13936+       { A_BLINK,      "blink" },
     13937+    };
     13938+    /* *INDENT-ON* */
     13939+
     13940+    const char *result = 0;
     13941+
     13942+    if (state < SIZEOF(table)) {
     13943+       *attr = table[state].attr;
     13944+       result = table[state].msg;
     13945+    }
     13946+    return result;
     13947+}
     13948+
     13949+/* fill the window with a test-pattern */
     13950+static void
     13951+fill_window(WINDOW *win)
     13952+{
     13953+    int y, x;
     13954+
     13955+    getyx(win, y, x);
     13956+    wmove(win, 0, 0);
     13957+    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
     13958+    }
     13959+    wmove(win, y, x);
     13960+}
     13961+
     13962+static void
     13963+show_status(WINDOW *win, STATUS * sp)
     13964+{
     13965+    int y, x;
     13966+
     13967+    getyx(win, y, x);
     13968+    wmove(win, 0, 0);
     13969+    wprintw(win, "Count %d", sp->count);
     13970+    if (sp->v_msg != 0)
     13971+       wprintw(win, " Video %s", sp->v_msg);
     13972+    if (sp->c_msg != 0)
     13973+       wprintw(win, " Color %s", sp->c_msg);
     13974+    wprintw(win, " (%d)", sp->status);
     13975+    wclrtoeol(win);
     13976+    wmove(win, y, x);
     13977+}
     13978+
     13979+static void
     13980+do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
     13981+{
     13982+    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
     13983+                         sp->y_beg + 1, sp->x_beg + 1);
     13984+
     13985+    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
     13986+       WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
     13987+
     13988+       if (win2 != 0) {
     13989+           box(win1, 0, 0);
     13990+           wrefresh(win1);
     13991+           func(win2);
     13992+
     13993+           delwin(win2);
     13994+       } else {
     13995+           beep();
     13996+       }
     13997+       delwin(win1);
     13998+       touchwin(win);
     13999+    } else {
     14000+       beep();
     14001+    }
     14002+}
     14003+
     14004+static void
     14005+init_status(WINDOW *win, STATUS * sp)
     14006+{
     14007+    memset(sp, 0, sizeof(*sp));
     14008+    sp->c = 99;
     14009+    sp->v = 99;
     14010+    sp->ch = ' ';
     14011+
     14012+    keypad(win, TRUE);
     14013+    fill_window(win);
     14014+
     14015+    getbegyx(win, sp->y_beg, sp->x_beg);
     14016+    getmaxyx(win, sp->y_max, sp->x_max);
     14017+}
     14018+
     14019+static void
     14020+show_help(WINDOW *win)
     14021+{
     14022+    static const char *table[] =
     14023+    {
     14024+       "Basic commands:"
     14025+       ,"Use h/j/k/l or arrow keys to move the cursor."
     14026+       ,"Set the count parameter for clip_wprintw by entering digits 0-9."
     14027+       ,""
     14028+       ,"Other commands:"
     14029+       ,"space toggles through the set of video attributes and colors."
     14030+       ,"t     touches (forces repaint) of the current line."
     14031+       ,".     calls clip_wprintw at the current position with the given count."
     14032+       ,"=     resets count to zero."
     14033+       ,"?     shows this help-window"
     14034+       ,""
     14035+    };
     14036+
     14037+    int y_max, x_max;
     14038+    int row;
     14039+
     14040+    getmaxyx(win, y_max, x_max);
     14041+    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
     14042+       mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
     14043+    }
     14044+    while (wgetch(win) != 'q')
     14045+       beep();
     14046+}
     14047+
     14048+static void
     14049+update_status(WINDOW *win, STATUS * sp)
     14050+{
     14051+    switch (sp->ch) {
     14052+    case ' ':                  /* next test-iteration */
     14053+       if (has_colors()) {
     14054+           if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
     14055+               sp->c_msg = color_params(sp->c = 0, &(sp->pair));
     14056+               if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
     14057+                   sp->v_msg = video_params(sp->v = 0, &(sp->attr));
     14058+               }
     14059+           }
     14060+       } else {
     14061+           if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
     14062+               sp->v_msg = video_params(sp->v = 0, &(sp->attr));
     14063+           }
     14064+       }
     14065+       sp->count = 0;
     14066+       show_status(win, sp);
     14067+       break;
     14068+    case KEY_LEFT:
     14069+    case 'h':
     14070+       if (sp->x_val > 0)
     14071+           wmove(win, sp->y_val, --(sp->x_val));
     14072+       break;
     14073+    case KEY_DOWN:
     14074+    case 'j':
     14075+       if (sp->y_val < sp->y_max)
     14076+           wmove(win, ++(sp->y_val), sp->x_val);
     14077+       break;
     14078+    case KEY_UP:
     14079+    case 'k':
     14080+       if (sp->y_val > 0)
     14081+           wmove(win, --(sp->y_val), sp->x_val);
     14082+       break;
     14083+    case KEY_RIGHT:
     14084+    case 'l':
     14085+       if (sp->x_val < sp->x_max)
     14086+           wmove(win, sp->y_val, ++(sp->x_val));
     14087+       break;
     14088+    case 't':
     14089+       touchline(win, sp->y_val, 1);
     14090+       break;
     14091+    case '=':
     14092+       sp->count = 0;
     14093+       show_status(win, sp);
     14094+       break;
     14095+    case '?':
     14096+       do_subwindow(win, sp, show_help);
     14097+       break;
     14098+    default:
     14099+       if (isdigit(sp->ch)) {
     14100+           sp->count = (sp->count * 10) + (sp->ch - '0');
     14101+           show_status(win, sp);
     14102+       } else {
     14103+           beep();
     14104+       }
     14105+       break;
     14106+    }
     14107+}
     14108+
     14109+static void
     14110+test_clipping(WINDOW *win)
     14111+{
     14112+    STATUS st;
     14113+    char fmt[80];
     14114+    char *buffer;
     14115+    unsigned j, need;
     14116+
     14117+    init_status(win, &st);
     14118+
     14119+    do {
     14120+       switch (st.ch) {
     14121+       case '.':               /* change from current position */
     14122+           wattrset(win, st.attr | COLOR_PAIR(st.pair));
     14123+           if (st.count > 0) {
     14124+               need = st.count + 1;
     14125+               sprintf(fmt, "%%c%%%ds%%c", st.count);
     14126+           } else {
     14127+               need = getmaxx(win) - 1;
     14128+               strcpy(fmt, "%c%s%c");
     14129+           }
     14130+           if ((buffer = typeMalloc(char, need)) != 0) {
     14131+               for (j = 0; j < need; ++j) {
     14132+                   buffer[j] = 'A' + (j % 26);
     14133+               }
     14134+               buffer[need - 1] = '\0';
     14135+               st.status = clip_wprintw(win, fmt, '[', buffer, ']');
     14136+           }
     14137+           break;
     14138+       case 'w':
     14139+           do_subwindow(win, &st, test_clipping);
     14140+           break;
     14141+       case 'q':
     14142+           return;
     14143+       default:
     14144+           update_status(win, &st);
     14145+           break;
     14146+       }
     14147+    } while ((st.ch = wgetch(win)) != ERR);
     14148+}
     14149+
     14150+int
     14151+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     14152+{
     14153+    initscr();
     14154+    cbreak();
     14155+    noecho();
     14156+
     14157+    test_clipping(stdscr);
     14158+    endwin();
     14159+
     14160+    ExitProgram(EXIT_SUCCESS);
     14161+}
     14162diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
     14163--- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
     14164+++ ncurses-5.7/test/demo_forms.c       2008-12-29 20:11:58.000000000 -0800
     14165@@ -26,7 +26,7 @@
     14166  * authorization.                                                           *
     14167  ****************************************************************************/
     14168 /*
     14169- * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $
     14170+ * $Id: demo_forms.c,v 1.31 2008/12/20 19:23:00 tom Exp $
     14171  *
     14172  * Demonstrate a variety of functions from the form library.
     14173  * Thomas Dickey - 2003/4/26
     14174@@ -97,6 +97,8 @@
     14175     FIELD *f = new_field(rows, cols, frow, fcol, o_value, 1);
     14176 
     14177     if (f) {
     14178+       FieldAttrs *ptr;
     14179+
     14180        set_field_back(f, A_UNDERLINE);
     14181        /*
     14182         * If -j and -d options are combined, -j loses.  It is documented in
     14183@@ -122,7 +124,12 @@
     14184        /*
     14185         * The userptr is used in edit_field.c's inactive_field().
     14186         */
     14187-       set_field_userptr(f, (void *) (long) field_back(f));
     14188+       ptr = (FieldAttrs *) field_userptr(f);
     14189+       if (ptr == 0) {
     14190+           ptr = typeCalloc(FieldAttrs, 1);
     14191+           ptr->background = field_back(f);
     14192+       }
     14193+       set_field_userptr(f, (void *) ptr);
     14194        if (t_value)
     14195            set_field_buffer(f, 0, t_value);
     14196     }
     14197diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
     14198--- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
     14199+++ ncurses-5.7/test/edit_field.c       2008-12-29 20:11:58.000000000 -0800
     14200@@ -26,7 +26,7 @@
     14201  * authorization.                                                           *
     14202  ****************************************************************************/
     14203 /*
     14204- * $Id: edit_field.c,v 1.14 2008/10/18 20:40:20 tom Exp $
     14205+ * $Id: edit_field.c,v 1.15 2008/12/20 19:23:01 tom Exp $
     14206  *
     14207  * A wrapper for form_driver() which keeps track of the user's editing changes
     14208  * for each field, and makes the result available as a null-terminated string
     14209@@ -294,8 +294,8 @@
     14210 static void
     14211 inactive_field(FIELD * f)
     14212 {
     14213-    void *ptr = field_userptr(f);
     14214-    set_field_back(f, (chtype) ptr);
     14215+    FieldAttrs *ptr = (FieldAttrs *) field_userptr(f);
     14216+    set_field_back(f, ptr->background);
     14217 }
     14218 
     14219 int
     14220diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
     14221--- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
     14222+++ ncurses-5.7/test/edit_field.h       2008-12-29 20:11:58.000000000 -0800
     14223@@ -1,5 +1,5 @@
     14224 /****************************************************************************
     14225- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
     14226+ * Copyright (c) 2003-2006,2008 Free Software Foundation, Inc.              *
     14227  *                                                                          *
     14228  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14229  * copy of this software and associated documentation files (the            *
     14230@@ -26,7 +26,7 @@
     14231  * authorization.                                                           *
     14232  ****************************************************************************/
     14233 /*
     14234- * $Id: edit_field.h,v 1.5 2006/06/03 16:38:57 tom Exp $
     14235+ * $Id: edit_field.h,v 1.6 2008/12/20 19:23:18 tom Exp $
     14236  *
     14237  * Interface of edit_field.c
     14238  */
     14239@@ -43,6 +43,10 @@
     14240 #define MY_EDT_MODE    EDIT_FIELD('e')
     14241 #define MY_INS_MODE    EDIT_FIELD('t')
     14242 
     14243+typedef struct {
     14244+    chtype background;
     14245+} FieldAttrs;
     14246+
     14247 extern void help_edit_field(void);
     14248 extern int edit_field(FORM * form, int *result);
     14249 
    1266614250diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
    1266714251--- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
    12668 +++ ncurses-5.7/test/filter.c   2008-12-20 14:47:14.000000000 -0800
     14252+++ ncurses-5.7/test/filter.c   2008-12-29 20:11:49.000000000 -0800
    1266914253@@ -1,5 +1,5 @@
    1267014254 /****************************************************************************
    … …  
    1273614320     keypad(stdscr, TRUE);
    1273714321 
     14322diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
     14323--- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
     14324+++ ncurses-5.7/test/insdelln.c 2008-12-29 20:11:58.000000000 -0800
     14325@@ -0,0 +1,380 @@
     14326+/****************************************************************************
     14327+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
     14328+ *                                                                          *
     14329+ * Permission is hereby granted, free of charge, to any person obtaining a  *
     14330+ * copy of this software and associated documentation files (the            *
     14331+ * "Software"), to deal in the Software without restriction, including      *
     14332+ * without limitation the rights to use, copy, modify, merge, publish,      *
     14333+ * distribute, distribute with modifications, sublicense, and/or sell       *
     14334+ * copies of the Software, and to permit persons to whom the Software is    *
     14335+ * furnished to do so, subject to the following conditions:                 *
     14336+ *                                                                          *
     14337+ * The above copyright notice and this permission notice shall be included  *
     14338+ * in all copies or substantial portions of the Software.                   *
     14339+ *                                                                          *
     14340+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
     14341+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
     14342+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
     14343+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
     14344+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
     14345+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
     14346+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
     14347+ *                                                                          *
     14348+ * Except as contained in this notice, the name(s) of the above copyright   *
     14349+ * holders shall not be used in advertising or otherwise to promote the     *
     14350+ * sale, use or other dealings in this Software without prior written       *
     14351+ * authorization.                                                           *
     14352+ ****************************************************************************/
     14353+/*
     14354+ * $Id: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
     14355+ *
     14356+ * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
     14357+ */
     14358+
     14359+#include <test.priv.h>
     14360+
     14361+#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
     14362+#define COLOR_DEFAULT (-1)
     14363+
     14364+typedef struct {
     14365+    unsigned c;
     14366+    unsigned v;
     14367+    int pair;
     14368+    unsigned attr;
     14369+    int count;
     14370+    int ch;
     14371+    const char *c_msg;
     14372+    const char *v_msg;
     14373+    int y_val;
     14374+    int x_val;
     14375+    int y_beg, x_beg;
     14376+    int y_max, x_max;
     14377+} STATUS;
     14378+
     14379+static const char *
     14380+color_params(unsigned state, int *pair)
     14381+{
     14382+    /* *INDENT-OFF* */
     14383+    static struct {
     14384+       int pair;
     14385+       int fg, bg;
     14386+       const char *msg;
     14387+    } table[] = {
     14388+       { 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
     14389+       { 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
     14390+       { 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
     14391+    };
     14392+    /* *INDENT-ON* */
     14393+
     14394+    static bool first = TRUE;
     14395+    const char *result = 0;
     14396+
     14397+    if (has_colors()) {
     14398+       if (first) {
     14399+           unsigned n;
     14400+
     14401+           start_color();
     14402+           for (n = 0; n < SIZEOF(table); ++n) {
     14403+               init_pair(table[n].pair, table[n].fg, table[n].bg);
     14404+           }
     14405+       }
     14406+       if (state < SIZEOF(table)) {
     14407+           *pair = table[state].pair;
     14408+           result = table[state].msg;
     14409+       }
     14410+    }
     14411+    return result;
     14412+}
     14413+
     14414+static const char *
     14415+video_params(unsigned state, unsigned *attr)
     14416+{
     14417+    /* *INDENT-OFF* */
     14418+    static struct {
     14419+       unsigned attr;
     14420+       const char *msg;
     14421+    } table[] = {
     14422+       { A_NORMAL,     "normal" },
     14423+       { A_BOLD,       "bold" },
     14424+       { A_REVERSE,    "reverse" },
     14425+       { A_UNDERLINE,  "underline" },
     14426+       { A_BLINK,      "blink" },
     14427+    };
     14428+    /* *INDENT-ON* */
     14429+
     14430+    const char *result = 0;
     14431+
     14432+    if (state < SIZEOF(table)) {
     14433+       *attr = table[state].attr;
     14434+       result = table[state].msg;
     14435+    }
     14436+    return result;
     14437+}
     14438+
     14439+/* fill the window with a test-pattern */
     14440+static void
     14441+fill_window(WINDOW *win)
     14442+{
     14443+    int y, x;
     14444+
     14445+    getyx(win, y, x);
     14446+    wmove(win, 1, 0);
     14447+    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
     14448+    }
     14449+    wmove(win, y, x);
     14450+}
     14451+
     14452+static void
     14453+show_status(WINDOW *win, STATUS * sp)
     14454+{
     14455+    int y, x;
     14456+
     14457+    getyx(win, y, x);
     14458+    wmove(win, 0, 0);
     14459+    wprintw(win, "Count %d", sp->count);
     14460+    if (sp->v_msg != 0)
     14461+       wprintw(win, " Video %s", sp->v_msg);
     14462+    if (sp->c_msg != 0)
     14463+       wprintw(win, " Color %s", sp->c_msg);
     14464+    wclrtoeol(win);
     14465+    wmove(win, y, x);
     14466+}
     14467+
     14468+static void
     14469+reshow_status(WINDOW *win, STATUS * sp)
     14470+{
     14471+    fill_window(win);
     14472+    show_status(win, sp);
     14473+}
     14474+
     14475+static void
     14476+do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
     14477+{
     14478+    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
     14479+                         sp->y_beg + 1, sp->x_beg + 1);
     14480+
     14481+    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
     14482+       WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
     14483+
     14484+       if (win2 != 0) {
     14485+           box(win1, 0, 0);
     14486+           wrefresh(win1);
     14487+           func(win2);
     14488+
     14489+           delwin(win2);
     14490+       } else {
     14491+           beep();
     14492+       }
     14493+       delwin(win1);
     14494+       touchwin(win);
     14495+    } else {
     14496+       beep();
     14497+    }
     14498+}
     14499+
     14500+static void
     14501+init_status(WINDOW *win, STATUS * sp)
     14502+{
     14503+    memset(sp, 0, sizeof(*sp));
     14504+    sp->c = 99;
     14505+    sp->v = 99;
     14506+    sp->ch = ' ';
     14507+
     14508+    keypad(win, TRUE);
     14509+    fill_window(win);
     14510+
     14511+    getbegyx(win, sp->y_beg, sp->x_beg);
     14512+    getmaxyx(win, sp->y_max, sp->x_max);
     14513+}
     14514+
     14515+static void
     14516+show_help(WINDOW *win)
     14517+{
     14518+    static const char *table[] =
     14519+    {
     14520+       "Basic commands:"
     14521+       ,"Use h/j/k/l or arrow keys to move the cursor."
     14522+       ,"Set the count parameter for insert/delete by entering digits 0-9."
     14523+       ,""
     14524+       ,"Other commands:"
     14525+       ,"space toggles through the set of video attributes and colors."
     14526+       ,"t     touches (forces repaint) of the current line."
     14527+       ,"i     calls insertln at the current position with the given count."
     14528+       ,"d     calls deleteln at the window beginning with the given count."
     14529+       ,"I     calls insdelln at the window beginning with the given count."
     14530+       ,"D     calls insdelln at the window beginning with the given -count."
     14531+       ,"f     refills the window with test-pattern using current attributes."
     14532+       ,"w     recur to test windows other than stdscr"
     14533+       ,"q     quit"
     14534+       ,"=     resets count to zero."
     14535+       ,"?     shows this help-window"
     14536+       ,""
     14537+       ,""
     14538+    };
     14539+
     14540+    int y_max, x_max;
     14541+    int row;
     14542+
     14543+    getmaxyx(win, y_max, x_max);
     14544+    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
     14545+       mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
     14546+    }
     14547+    while (wgetch(win) != 'q')
     14548+       beep();
     14549+}
     14550+
     14551+static void
     14552+update_status(WINDOW *win, STATUS * sp)
     14553+{
     14554+    switch (sp->ch) {
     14555+    case ' ':                  /* next test-iteration */
     14556+       if (has_colors()) {
     14557+           if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
     14558+               sp->c_msg = color_params(sp->c = 0, &(sp->pair));
     14559+               if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
     14560+                   sp->v_msg = video_params(sp->v = 0, &(sp->attr));
     14561+               }
     14562+           }
     14563+       } else {
     14564+           if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
     14565+               sp->v_msg = video_params(sp->v = 0, &(sp->attr));
     14566+           }
     14567+       }
     14568+       sp->count = 0;
     14569+       show_status(win, sp);
     14570+       break;
     14571+    case KEY_LEFT:
     14572+    case 'h':
     14573+       if (sp->x_val > 0)
     14574+           wmove(win, sp->y_val, --(sp->x_val));
     14575+       break;
     14576+    case KEY_DOWN:
     14577+    case 'j':
     14578+       if (sp->y_val < sp->y_max)
     14579+           wmove(win, ++(sp->y_val), sp->x_val);
     14580+       break;
     14581+    case KEY_UP:
     14582+    case 'k':
     14583+       if (sp->y_val > 0)
     14584+           wmove(win, --(sp->y_val), sp->x_val);
     14585+       break;
     14586+    case KEY_RIGHT:
     14587+    case 'l':
     14588+       if (sp->x_val < sp->x_max)
     14589+           wmove(win, sp->y_val, ++(sp->x_val));
     14590+       break;
     14591+    case 't':
     14592+       touchline(win, sp->y_val, 1);
     14593+       break;
     14594+    case '=':
     14595+       sp->count = 0;
     14596+       show_status(win, sp);
     14597+       break;
     14598+    case '?':
     14599+       do_subwindow(win, sp, show_help);
     14600+       break;
     14601+    default:
     14602+       if (isdigit(sp->ch)) {
     14603+           sp->count = (sp->count * 10) + (sp->ch - '0');
     14604+           show_status(win, sp);
     14605+       } else {
     14606+           beep();
     14607+       }
     14608+       break;
     14609+    }
     14610+}
     14611+
     14612+static void
     14613+test_winsdelln(WINDOW *win)
     14614+{
     14615+    STATUS st;
     14616+    int n;
     14617+
     14618+    init_status(win, &st);
     14619+
     14620+    do {
     14621+       wattrset(win, st.attr | COLOR_PAIR(st.pair));
     14622+       switch (st.ch) {
     14623+       case 'i':
     14624+           for (n = 0; n < st.count; ++n)
     14625+               winsertln(win);
     14626+           break;
     14627+       case 'd':
     14628+           for (n = 0; n < st.count; ++n)
     14629+               wdeleteln(win);
     14630+           break;
     14631+       case 'I':
     14632+           winsdelln(win, st.count);
     14633+           break;
     14634+       case 'D':
     14635+           winsdelln(win, -st.count);
     14636+           break;
     14637+       case 'f':
     14638+           fill_window(win);
     14639+           reshow_status(win, &st);
     14640+           break;
     14641+       case 'w':
     14642+           do_subwindow(win, &st, test_winsdelln);
     14643+           break;
     14644+       case 'q':
     14645+           return;
     14646+       default:
     14647+           update_status(win, &st);
     14648+           break;
     14649+       }
     14650+    } while ((st.ch = wgetch(win)) != ERR);
     14651+}
     14652+
     14653+static void
     14654+test_insdelln(void)
     14655+{
     14656+    STATUS st;
     14657+    int n;
     14658+
     14659+    init_status(stdscr, &st);
     14660+
     14661+    do {
     14662+       attrset(st.attr | COLOR_PAIR(st.pair));
     14663+       switch (st.ch) {
     14664+       case 'i':
     14665+           for (n = 0; n < st.count; ++n)
     14666+               insertln();
     14667+           break;
     14668+       case 'd':
     14669+           for (n = 0; n < st.count; ++n)
     14670+               deleteln();
     14671+           break;
     14672+       case 'I':
     14673+           insdelln(st.count);
     14674+           break;
     14675+       case 'D':
     14676+           insdelln(-st.count);
     14677+           break;
     14678+       case 'f':
     14679+           fill_window(stdscr);
     14680+           reshow_status(stdscr, &st);
     14681+           break;
     14682+       case 'w':
     14683+           do_subwindow(stdscr, &st, test_winsdelln);
     14684+           break;
     14685+       case 'q':
     14686+           return;
     14687+       default:
     14688+           update_status(stdscr, &st);
     14689+           break;
     14690+       }
     14691+    } while ((st.ch = getch()) != ERR);
     14692+}
     14693+
     14694+int
     14695+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     14696+{
     14697+    initscr();
     14698+    cbreak();
     14699+    noecho();
     14700+
     14701+    test_insdelln();
     14702+    endwin();
     14703+
     14704+    ExitProgram(EXIT_SUCCESS);
     14705+}
     14706diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
     14707--- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
     14708+++ ncurses-5.7/test/modules    2008-12-29 20:11:58.000000000 -0800
     14709@@ -1,4 +1,4 @@
     14710-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
     14711+# $Id: modules,v 1.37 2008/12/20 21:38:44 tom Exp $
     14712 ##############################################################################
     14713 # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
     14714 #                                                                            #
     14715@@ -37,6 +37,7 @@
     14716 bs             progs           $(srcdir)       $(HEADER_DEPS)
     14717 cardfile       progs           $(srcdir)       $(HEADER_DEPS)  ../include/panel.h ../include/form.h
     14718 chgat          progs           $(srcdir)       $(HEADER_DEPS)
     14719+clip_printw    progs           $(srcdir)       $(HEADER_DEPS)
     14720 color_set      progs           $(srcdir)       $(HEADER_DEPS)
     14721 demo_altkeys   progs           $(srcdir)       $(HEADER_DEPS)
     14722 demo_defkey    progs           $(srcdir)       $(HEADER_DEPS)
     14723@@ -60,6 +61,7 @@
     14724 inch_wide      progs           $(srcdir)       $(HEADER_DEPS)
     14725 inchs          progs           $(srcdir)       $(HEADER_DEPS)
     14726 ins_wide       progs           $(srcdir)       $(HEADER_DEPS)
     14727+insdelln       progs           $(srcdir)       $(HEADER_DEPS)
     14728 inserts                progs           $(srcdir)       $(HEADER_DEPS)
     14729 key_names      progs           $(srcdir)       $(HEADER_DEPS)
     14730 keynames       progs           $(srcdir)       $(HEADER_DEPS)
    1273814731diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
    1273914732--- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
    12740 +++ ncurses-5.7/test/ncurses.c  2008-12-20 14:47:12.000000000 -0800
     14733+++ ncurses-5.7/test/ncurses.c  2008-12-29 20:11:58.000000000 -0800
    1274114734@@ -40,7 +40,7 @@
    1274214735    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
    … …  
    1274414737 
    1274514738-$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $
    12746 +$Id: ncurses.c,v 1.332 2008/11/29 20:08:42 tom Exp $
     14739+$Id: ncurses.c,v 1.334 2008/12/20 17:13:27 tom Exp $
    1274714740 
    1274814741 ***************************************************************************/
    … …  
    1287814871 
    1287914872 static void
    12880 @@ -3238,7 +3257,7 @@
     14873@@ -2802,6 +2821,7 @@
     14874 } attrs_to_cycle[] = {
     14875     { A_NORMAL,                "normal" },
     14876     { A_BOLD,          "bold" },
     14877+    { A_BLINK,         "blink" },
     14878     { A_REVERSE,       "reverse" },
     14879     { A_UNDERLINE,     "underline" },
     14880 };
     14881@@ -2902,7 +2922,7 @@
     14882        do {
     14883            if (C1)
     14884                nodelay(stdscr, TRUE);
     14885-           echochar(code | attr | COLOR_PAIR(pair));
     14886+           echochar(colored_chtype(code, attr, pair));
     14887            if (C1) {
     14888                /* (yes, this _is_ crude) */
     14889                while ((reply = Getchar()) != ERR) {
     14890@@ -2951,7 +2971,7 @@
     14891                 */
     14892                break;
     14893            default:
     14894-               addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
     14895+               addch(colored_chtype(code, A_ALTCHARSET | attr, pair));
     14896                break;
     14897            }
     14898        } while (--count > 0);
     14899@@ -2969,15 +2989,23 @@
     14900     mvaddstr(0, 20, "Display of the ACS Line-Drawing Set");
     14901     attroff(A_BOLD);
     14902     refresh();
     14903-    box(stdscr, 0, 0);
     14904     /* *INDENT-OFF* */
     14905-    mvhline(LINES / 2, 0,        ACS_HLINE | attr, COLS);
     14906-    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
     14907-    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
     14908-    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
     14909-    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
     14910-    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
     14911-    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
     14912+    wborder(stdscr,
     14913+           colored_chtype(ACS_VLINE,    attr, pair),
     14914+           colored_chtype(ACS_VLINE,    attr, pair),
     14915+            colored_chtype(ACS_HLINE,    attr, pair),
     14916+           colored_chtype(ACS_HLINE,    attr, pair),
     14917+           colored_chtype(ACS_ULCORNER, attr, pair),
     14918+           colored_chtype(ACS_URCORNER, attr, pair),
     14919+            colored_chtype(ACS_LLCORNER, attr, pair),
     14920+           colored_chtype(ACS_LRCORNER, attr, pair));
     14921+    mvhline(LINES / 2, 0,        colored_chtype(ACS_HLINE, attr, pair), COLS);
     14922+    mvvline(0,         COLS / 2, colored_chtype(ACS_VLINE, attr, pair), LINES);
     14923+    mvaddch(0,         COLS / 2, colored_chtype(ACS_TTEE,  attr, pair));
     14924+    mvaddch(LINES / 2, COLS / 2, colored_chtype(ACS_PLUS,  attr, pair));
     14925+    mvaddch(LINES - 1, COLS / 2, colored_chtype(ACS_BTEE,  attr, pair));
     14926+    mvaddch(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
     14927+    mvaddch(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
     14928     /* *INDENT-ON* */
     14929 
     14930 }
     14931@@ -3002,7 +3030,7 @@
     14932 {
     14933     int n;
     14934 
     14935-#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
     14936+#define BOTH(name) #name, colored_chtype(name, attr, pair)
     14937 
     14938     erase();
     14939     attron(A_BOLD);
     14940@@ -3238,7 +3266,7 @@
    1288114941     int col = (n / height) * COLS / 2;
    1288214942 
    … …  
    1288714947     }
    1288814948     return n + 1;
     14949@@ -3307,12 +3335,12 @@
     14950 
     14951 #undef MERGE_ATTR
     14952 
     14953-#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
     14954+#define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair)
     14955 
     14956 static void
     14957 show_wbox_chars(int repeat, attr_t attr, short pair)
     14958 {
     14959-    cchar_t temp;
     14960+    cchar_t temp[8];
     14961 
     14962     (void) repeat;
     14963     erase();
     14964@@ -3321,17 +3349,23 @@
     14965     attroff(A_BOLD);
     14966     refresh();
     14967 
     14968-    attr_set(attr, pair, 0);
     14969-    box_set(stdscr, 0, 0);
     14970-    attr_set(A_NORMAL, 0, 0);
     14971+    wborder_set(stdscr,
     14972+               MERGE_ATTR(0, WACS_VLINE),
     14973+               MERGE_ATTR(1, WACS_VLINE),
     14974+               MERGE_ATTR(2, WACS_HLINE),
     14975+               MERGE_ATTR(3, WACS_HLINE),
     14976+               MERGE_ATTR(4, WACS_ULCORNER),
     14977+               MERGE_ATTR(5, WACS_URCORNER),
     14978+               MERGE_ATTR(6, WACS_LLCORNER),
     14979+               MERGE_ATTR(7, WACS_LRCORNER));
     14980     /* *INDENT-OFF* */
     14981-    mvhline_set(LINES / 2, 0,        MERGE_ATTR(WACS_HLINE), COLS);
     14982-    mvvline_set(0,         COLS / 2, MERGE_ATTR(WACS_VLINE), LINES);
     14983-    mvadd_wch(0,           COLS / 2, MERGE_ATTR(WACS_TTEE));
     14984-    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(WACS_PLUS));
     14985-    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(WACS_BTEE));
     14986-    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(WACS_LTEE));
     14987-    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(WACS_RTEE));
     14988+    mvhline_set(LINES / 2, 0,        MERGE_ATTR(0, WACS_HLINE), COLS);
     14989+    mvvline_set(0,         COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES);
     14990+    mvadd_wch(0,           COLS / 2, MERGE_ATTR(0, WACS_TTEE));
     14991+    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(0, WACS_PLUS));
     14992+    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(0, WACS_BTEE));
     14993+    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
     14994+    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
     14995     /* *INDENT-ON* */
     14996 
     14997 }
     14998@@ -5804,7 +5838,7 @@
     14999        break;
     15000     case 2:
     15001        init_pair(cpair, COLOR_RED, COLOR_GREEN);
     15002-       wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair));
     15003+       wbkgdset(win, colored_chtype(' ', A_BLINK, cpair));
     15004        break;
     15005     case 3:
     15006        wbkgdset(win, ' ' | A_NORMAL);
     15007diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
     15008--- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
     15009+++ ncurses-5.7/test/programs   2008-12-29 20:11:58.000000000 -0800
     15010@@ -1,4 +1,4 @@
     15011-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
     15012+# $Id: programs,v 1.15 2008/12/20 21:38:44 tom Exp $
     15013 ##############################################################################
     15014 # Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.                #
     15015 #                                                                            #
     15016@@ -35,6 +35,7 @@
     15017 bs             $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   bs
     15018 cardfile       $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   cardfile
     15019 chgat          $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   chgat
     15020+clip_printw    $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   clip_printw
     15021 color_set      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   color_set
     15022 demo_altkeys   $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   demo_altkeys
     15023 demo_defkey    $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   demo_defkey
     15024@@ -57,6 +58,7 @@
     15025 inch_wide      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   inch_wide
     15026 inchs          $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   inchs
     15027 ins_wide       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   ins_wide
     15028+insdelln       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   insdelln
     15029 inserts                $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   inserts
     15030 key_names      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   key_names
     15031 keynames       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   keynames
     15032diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
     15033--- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
     15034+++ ncurses-5.7/test/test.priv.h        2008-12-29 20:11:58.000000000 -0800
     15035@@ -29,7 +29,7 @@
     15036 /****************************************************************************
     15037  *  Author: Thomas E. Dickey                    1996-on                     *
     15038  ****************************************************************************/
     15039-/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */
     15040+/* $Id: test.priv.h,v 1.80 2008/12/20 16:37:20 tom Exp $ */
     15041 
     15042 #ifndef __TEST_PRIV_H
     15043 #define __TEST_PRIV_H 1
     15044@@ -359,6 +359,9 @@
     15045 #define KEY_MIN 256    /* not defined in Solaris 8 */
     15046 #endif
     15047 
     15048+#define colored_chtype(ch, attr, pair) \
     15049+       ((ch) | (attr) | COLOR_PAIR(pair))
     15050+
     15051 /*
     15052  * Workaround for HPUX
     15053  */
Note: See TracChangeset for help on using the changeset viewer.