Changeset 1e1873cf


Ignore:
Timestamp:
Mar 23, 2009, 12:16:20 AM (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:
b69b7ec
Parents:
78ffc068
Message:

Updated VIM Branch Update Patch to -12

Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r78ffc068 r1e1873cf  
    3838
    3939    <listitem>
    40       <para>March 1, 2009</para>
     40      <para>March 23, 2009</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jim] - Updated VIM Branch Update Patch to -12.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
     49    <listitem>
     50      <para>March 22, 2009</para>
    4151      <itemizedlist>
    4252        <listitem>

  • BOOK/patches.ent

    r78ffc068 r1e1873cf  
    133133<!ENTITY texinfo-new_compressors-patch-size "2 KB">
    134134
    135 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-11.patch">
    136 <!ENTITY vim-branch_update-patch-md5 "326e75a9a9ac2d3777eba30300124652">
    137 <!ENTITY vim-branch_update-patch-size "253 KB">
     135<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-12.patch">
     136<!ENTITY vim-branch_update-patch-md5 "caf0e87b866997909808b50763e3706b">
     137<!ENTITY vim-branch_update-patch-size "265 KB">
    138138
    139139<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">

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

    r78ffc068 r1e1873cf  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 02-28-2009
     2Date: 03-22-2009
    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-20090228.
     7             rechecked periodically. This patch covers up to 5.7-20090321.
    88
    99diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    1010--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    11 +++ ncurses-5.7/aclocal.m4      2009-02-28 20:38:54.327061041 -0800
     11+++ ncurses-5.7/aclocal.m4      2009-03-22 21:17:11.616376588 -0700
    1212@@ -1,5 +1,5 @@
    1313 dnl***************************************************************************
    … …  
    2222 dnl
    2323-dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
    24 +dnl $Id: aclocal.m4,v 1.483 2009/02/07 19:12:17 tom Exp $
     24+dnl $Id: aclocal.m4,v 1.485 2009/03/21 23:15:19 tom Exp $
    2525 dnl Macros used in NCURSES auto-configuration script.
    2626 dnl
    … …  
    189189 
    190190     cf_save_CPPFLAGS="$CPPFLAGS"
    191 @@ -1998,11 +2033,31 @@
     191@@ -1451,7 +1486,7 @@
     192 fi
     193 ])dnl
     194 dnl ---------------------------------------------------------------------------
     195-dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
     196+dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00
     197 dnl ---------------
     198 dnl Check if the compiler supports useful warning options.  There's a few that
     199 dnl we don't use, simply because they're too noisy:
     200@@ -1484,7 +1519,6 @@
     201 then
     202 # The "-wdXXX" options suppress warnings:
     203 # remark #1419: external declaration in primary source file
     204-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     205 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     206 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
     207 # remark #193: zero used for undefined preprocessing identifier
     208@@ -1492,19 +1526,18 @@
     209 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
     210 # remark #869: parameter "tw" was never referenced
     211 # remark #981: operands are evaluated in unspecified order
     212-# warning #269: invalid format string conversion
     213+# warning #279: controlling expression is constant
     214 
     215        AC_CHECKING([for $CC warning options])
     216        cf_save_CFLAGS="$CFLAGS"
     217        EXTRA_CFLAGS="-Wall"
     218        for cf_opt in \
     219                wd1419 \
     220-               wd1682 \
     221                wd1683 \
     222                wd1684 \
     223                wd193 \
     224-               wd279 \
     225                wd593 \
     226+               wd279 \
     227                wd810 \
     228                wd869 \
     229                wd981
     230@@ -1998,11 +2031,31 @@
    192231 ])
    193232 ])dnl
    … …  
    224263 test "$includedir" != "/usr/include" && \
    225264 test -d "$includedir" && {
    226 @@ -2017,6 +2072,7 @@
     265@@ -2017,6 +2070,7 @@
    227266        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
    228267 }
    … …  
    232271 dnl ---------------------------------------------------------------------------
    233272 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
    234 @@ -2026,7 +2082,7 @@
     273@@ -2026,7 +2080,7 @@
    235274 [AC_DIVERT_HELP([$1])dnl
    236275 ])dnl
    … …  
    241280 dnl Construct the list of include-options according to whether we're building
    242281 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
    243 @@ -2034,9 +2090,9 @@
     282@@ -2034,9 +2088,9 @@
    244283 dnl since that usually breaks gcc's shadow-includes.
    245284 AC_DEFUN([CF_INCLUDE_DIRS],
    … …  
    253292 if test "$GCC" != yes; then
    254293        CPPFLAGS="$CPPFLAGS -I\${includedir}"
    255 @@ -2143,7 +2199,7 @@
     294@@ -2143,7 +2197,7 @@
    256295 ])
    257296 ])
    258297 dnl ---------------------------------------------------------------------------
    259298-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
    260 +dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
     299+dnl CF_LDFLAGS_STATIC version: 6 updated: 2009/03/14 14:03:25
    261300 dnl -----------------
    262301 dnl Check for compiler/linker flags used to temporarily force usage of static
    263302 dnl libraries.  This depends on the compiler and platform.  Use this to help
    264 @@ -2153,7 +2209,7 @@
     303@@ -2153,7 +2207,7 @@
    265304 
    266305 if test "$GCC" = yes ; then
    267306        case $cf_cv_system_name in #(
    268307-       OS/2*|os2*|aix[[45]]*)  #( vi
    269 +       OS/2*|os2*|aix[[4]]*)   #( vi
     308+       OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]])         #( vi
    270309                LDFLAGS_STATIC=
    271310                LDFLAGS_SHARED=
    272311                ;;
    273 @@ -2164,7 +2220,7 @@
     312@@ -2164,7 +2218,7 @@
    274313     esac
    275314 else
    … …  
    280319                LDFLAGS_SHARED=-bdynamic
    281320                ;;
    282 @@ -2179,7 +2235,7 @@
     321@@ -2179,7 +2233,7 @@
    283322                ;;
    284323        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
    … …  
    289328                ;;
    290329        solaris2*)
    291 @@ -2193,11 +2249,33 @@
     330@@ -2193,11 +2247,33 @@
    292331 AC_SUBST(LDFLAGS_SHARED)
    293332 ])
    … …  
    326365 dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
    327366 dnl -------------
    328 @@ -2216,7 +2294,7 @@
     367@@ -2216,7 +2292,7 @@
    329368        AC_SUBST(LIB_PREFIX)
    330369 ])dnl
    … …  
    335374 dnl Append definitions and rules for the given models to the subdirectory
    336375 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
    337 @@ -2504,18 +2582,28 @@
     376@@ -2504,18 +2580,28 @@
    338377 install.libs uninstall.libs \\
    339378 install.data uninstall.data ::
    … …  
    364403 if test -f $srcdir/$tack.h; then
    365404 cat >> Makefile <<CF_EOF
    366 @@ -2526,6 +2614,7 @@
     405@@ -2526,6 +2612,7 @@
    367406 CF_EOF
    368407 fi
    … …  
    372411 dnl If we're installing into a subdirectory of /usr/include, etc., we should
    373412 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
    374 @@ -2679,7 +2768,7 @@
     413@@ -2679,7 +2766,7 @@
    375414 ])
    376415 ])
    … …  
    381420 dnl Compute the library file-suffix from the given model name
    382421 dnl $1 = model name
    383 @@ -2689,40 +2778,44 @@
     422@@ -2689,40 +2776,44 @@
    384423 AC_DEFUN([CF_LIB_SUFFIX],
    385424 [
    … …  
    437476                                $3=[$]$2
    438477                                ;;
    439 @@ -2755,7 +2848,7 @@
     478@@ -2755,7 +2846,7 @@
    440479        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
    441480 ])dnl
    … …  
    446485 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
    447486 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
    448 @@ -2772,7 +2865,7 @@
     487@@ -2772,7 +2863,7 @@
    449488 EOF
    450489        if AC_TRY_EVAL(ac_compile) ; then
    … …  
    455494        rm -f conftest.$ac_ext data.o
    456495        cat >conftest.$ac_ext <<EOF
    457 @@ -2791,7 +2884,7 @@
     496@@ -2791,7 +2882,7 @@
    458497 EOF
    459498        if AC_TRY_EVAL(ac_compile); then
    … …  
    464503        rm -f conftest.$ac_ext func.o
    465504        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
    466 @@ -2956,7 +3049,7 @@
     505@@ -2956,7 +3047,7 @@
    467506 AC_SUBST(MAKE_LOWER_TAGS)
    468507 ])dnl
    … …  
    473512 dnl Option to allow user to override automatic configuration of manpage format.
    474513 dnl There are several special cases:
    475 @@ -2998,7 +3091,7 @@
     514@@ -2998,7 +3089,7 @@
    476515   cf_catonly=yes
    477516   cf_example=date
    … …  
    482521     test -z "$cf_dir" && cf_dir=/usr/man
    483522     for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
    484 @@ -3687,17 +3780,17 @@
     523@@ -3687,17 +3778,17 @@
    485524        esac
    486525 ])dnl
    … …  
    505544 dnl ---------------------------------------------------------------------------
    506545 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
    507 @@ -3737,6 +3830,38 @@
     546@@ -3737,6 +3828,38 @@
    508547 esac
    509548 ])dnl
    … …  
    544583 dnl -----------------
    545584 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
    546 @@ -3872,6 +3997,13 @@
     585@@ -3872,6 +3995,13 @@
    547586 
    548587 ])dnl
    … …  
    558597 dnl -----------
    559598 dnl Check for awk, ensure that the check found something.
    560 @@ -4003,7 +4135,7 @@
     599@@ -4003,7 +4133,7 @@
    561600 esac
    562601 ])dnl
    … …  
    567606 dnl Check for ldconfig, needed to fixup shared libraries that would be built
    568607 dnl and then used in the install.
    569 @@ -4012,7 +4144,7 @@
     608@@ -4012,7 +4142,7 @@
    570609   LDCONFIG=:
    571610 else
    … …  
    576615   ;;
    577616 *) LDPATH=$PATH:/sbin:/usr/sbin
    578 @@ -4147,7 +4279,7 @@
     617@@ -4147,7 +4277,7 @@
    579618 fi
    580619 ])dnl
    … …  
    585624 dnl --------------
    586625 dnl Attempt to determine the appropriate CC/LD options for creating a shared
    587 @@ -4176,6 +4308,7 @@
     626@@ -4176,6 +4306,7 @@
    588627        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
    589628        LOCAL_LDFLAGS=
    … …  
    593632        INSTALL_LIB="-m 644"
    594633 
    595 @@ -4219,6 +4352,12 @@
     634@@ -4219,6 +4350,12 @@
    596635        cf_cv_shlib_version_infix=no
    597636 
    … …  
    606645                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
    607646                ;;
    608 @@ -4239,7 +4378,7 @@
     647@@ -4239,7 +4376,7 @@
    609648 EOF
    610649                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
    … …  
    615654        darwin*)
    616655                EXTRA_CFLAGS="-no-cpp-precomp"
    617 @@ -4272,10 +4411,10 @@
     656@@ -4272,10 +4409,10 @@
    618657        irix*)
    619658                if test "$cf_cv_ld_rpath" = yes ; then
    … …  
    628667                        fi
    629668                fi
    630 @@ -4294,7 +4433,7 @@
     669@@ -4294,7 +4431,7 @@
    631670                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    632671                fi
    … …  
    637676                fi
    638677                CF_SHARED_SONAME
    639 @@ -4306,12 +4445,12 @@
     678@@ -4306,12 +4443,12 @@
    640679                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    641680                fi
    … …  
    652691        nto-qnx*|openbsd*|freebsd[[12]].*)
    653692                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    654 @@ -4323,15 +4462,15 @@
     693@@ -4323,15 +4460,15 @@
    655694                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    656695                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
    … …  
    671710                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    672711                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    673 @@ -4346,7 +4485,7 @@
     712@@ -4346,7 +4483,7 @@
    674713                        CF_SHARED_SONAME
    675714                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
    … …  
    680719                ;;
    681720        osf*|mls+*)
    682 @@ -4365,7 +4504,7 @@
     721@@ -4365,7 +4502,7 @@
    683722                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    684723                fi
    … …  
    689728                fi
    690729                cf_cv_rm_so_locs=yes
    691 @@ -4400,12 +4539,19 @@
     730@@ -4400,12 +4537,19 @@
    692731                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    693732                fi
    … …  
    711750                else
    712751                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
    713 @@ -4438,18 +4584,19 @@
     752@@ -4438,18 +4582,19 @@
    714753                ;;
    715754        esac
    … …  
    735774        AC_SUBST(MK_SHARED_LIB)
    736775        AC_SUBST(LINK_PROGS)
    737 @@ -4642,7 +4789,7 @@
     776@@ -4642,7 +4787,7 @@
    738777 fi
    739778 ])dnl
    … …  
    744783 dnl For each parameter, test if the source-directory exists, and if it contains
    745784 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
    746 @@ -4717,7 +4864,11 @@
     785@@ -4717,7 +4862,11 @@
    747786 AC_SUBST(TEST_ARG2)
    748787 AC_SUBST(TEST_DEP2)
    … …  
    757796 do
    758797        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    759 @@ -4728,8 +4879,8 @@
     798@@ -4728,8 +4877,8 @@
    760799 
    761800 ADA_SUBDIRS=
    … …  
    768807 
    769808 SUB_MAKEFILES=
    770 @@ -4739,11 +4890,11 @@
     809@@ -4739,11 +4888,11 @@
    771810 done
    772811 
    … …  
    785824 ])dnl
    786825 dnl ---------------------------------------------------------------------------
    787 @@ -5241,7 +5392,7 @@
     826@@ -5241,7 +5390,7 @@
    788827 fi
    789828 ])
    790829 dnl ---------------------------------------------------------------------------
    791830-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
    792 +dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
     831+dnl CF_WITH_LIBTOOL version: 22 updated: 2009/03/21 19:14:56
    793832 dnl ---------------
    794833 dnl Provide a configure option to incorporate libtool.  Define several useful
    795834 dnl symbols for the makefile rules.
    796 @@ -5261,18 +5412,18 @@
     835@@ -5261,18 +5410,18 @@
    797836 dnl            echo cannot find libtool.m4 file
    798837 dnl            exit 1
    … …  
    817856 dnl
    818857 AC_DEFUN([CF_WITH_LIBTOOL],
    819 @@ -5306,15 +5457,15 @@
     858@@ -5306,15 +5455,15 @@
    820859        AC_PROG_LIBTOOL
    821860        # missing_content_AC_PROG_LIBTOOL}}
    … …  
    839878        LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
    840879        LIB_OBJECT='${OBJECTS:.o=.lo}'
    841 @@ -5393,7 +5544,7 @@
     880@@ -5331,16 +5480,23 @@
     881 
     882        # Save the version in a cache variable - this is not entirely a good
     883        # thing, but the version string from libtool is very ugly, and for
     884-       # bug reports it might be useful to have the original string.
     885+       # bug reports it might be useful to have the original string. "("
     886        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
     887        AC_MSG_RESULT($cf_cv_libtool_version)
     888        if test -z "$cf_cv_libtool_version" ; then
     889                AC_MSG_ERROR(This is not GNU libtool)
     890        fi
     891 
     892+       # special hack to add -no-undefined (which libtool should do for itself)
     893+       case "$cf_cv_system_name" in #(vi
     894+       cygwin*|mingw32*|uwin*|aix[[456]]) #(vi
     895+               LIBTOOL="$LIBTOOL -no-undefined"
     896+               ;;
     897+       esac
     898+
     899        # special hack to add --tag option for C++ compiler
     900-       case $cf_cv_libtool_version in
     901-       1.[[5-9]]*|[[2-9]]*)
     902+       case $cf_cv_libtool_version in #(vi
     903+       1.[[5-9]]*|[[2-9]]*) #(vi
     904                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
     905                LIBTOOL="$LIBTOOL --tag=CC"
     906                ;;
     907@@ -5393,7 +5549,7 @@
    842908 AC_SUBST($3)dnl
    843909 ])dnl
    … …  
    848914 dnl Process an option specifying a list of colon-separated paths.
    849915 dnl
    850 @@ -5409,7 +5560,7 @@
     916@@ -5409,7 +5565,7 @@
    851917 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
    852918 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
    … …  
    857923 for cf_src_path in $withval
    858924 do
    859 @@ -5535,7 +5686,7 @@
     925@@ -5535,7 +5691,7 @@
    860926        [USE_VALGRIND])
    861927 ])dnl
    … …  
    866932 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    867933 dnl or adapt to the vendor's definitions to get equivalent functionality,
    868 @@ -5552,7 +5703,7 @@
     934@@ -5552,7 +5708,7 @@
    869935 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
    870936 
    … …  
    875941        ;;
    876942 freebsd*|dragonfly*) #(vi
    877 @@ -5569,7 +5720,7 @@
     943@@ -5569,7 +5725,7 @@
    878944 irix[[56]].*) #(vi
    879945        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    886952diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
    887953--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
    888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-28 20:38:50.310805699 -0800
     954+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-03-22 21:16:59.575606928 -0700
    889955@@ -1,18 +1,47 @@
    890956 #! /bin/sh
    … …  
    9581024         ;;
    9591025 esac
     1026diff -Naur ncurses-5.7.orig/Ada95/gen/gen.c ncurses-5.7/Ada95/gen/gen.c
     1027--- ncurses-5.7.orig/Ada95/gen/gen.c    2008-10-04 14:59:37.000000000 -0700
     1028+++ ncurses-5.7/Ada95/gen/gen.c 2009-03-22 21:17:11.612376588 -0700
     1029@@ -1,5 +1,5 @@
     1030 /****************************************************************************
     1031- * Copyright (c) 1998,2007,2008 Free Software Foundation, Inc.              *
     1032+ * Copyright (c) 1998,2008,2009 Free Software Foundation, Inc.              *
     1033  *                                                                          *
     1034  * Permission is hereby granted, free of charge, to any person obtaining a  *
     1035  * copy of this software and associated documentation files (the            *
     1036@@ -32,7 +32,7 @@
     1037 
     1038 /*
     1039     Version Control
     1040-    $Id: gen.c,v 1.49 2008/10/04 21:59:37 tom Exp $
     1041+    $Id: gen.c,v 1.50 2009/03/21 21:34:20 tom Exp $
     1042   --------------------------------------------------------------------------*/
     1043 /*
     1044   This program generates various record structures and constants from the
     1045@@ -778,7 +778,9 @@
     1046 #if USE_REENTRANT || BROKEN_LINKER
     1047   printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
     1048   printf("   function ACS_Map return C_ACS_Ptr;\n");
     1049-  printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
     1050+  printf("   pragma Import (C, ACS_Map, \""
     1051+        NCURSES_WRAP_PREFIX
     1052+        "acs_map\");\n");
     1053 #else
     1054   printf("   ACS_Map : C_ACS_Map;\n");
     1055   printf("   pragma Import (C, ACS_Map, \"acs_map\");\n");
     1056@@ -1034,7 +1036,7 @@
     1057   printf("   function %s return %s\n", ada_func, ada_type);
     1058   printf("   is\n");
     1059   printf("      function Result return %s;\n", c_type);
     1060-  printf("      pragma Import (C, Result, \"_nc_%s\");\n", c_var);
     1061+  printf("      pragma Import (C, Result, \"" NCURSES_WRAP_PREFIX "%s\");\n", c_var);
     1062   printf("   begin\n");
     1063   if (strcmp(c_type, ada_type))
     1064     printf("      return %s (Result);\n", ada_type);
    9601065diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
    9611066--- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
    962 +++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-28 20:38:50.306805140 -0800
     1067+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-03-22 21:16:59.575606928 -0700
    9631068@@ -1,5 +1,5 @@
    9641069 ##############################################################################
    … …  
    10161121diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    10171122--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    1018 +++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-28 20:38:50.310805699 -0800
     1123+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-03-22 21:16:59.579606090 -0700
    10191124@@ -1,5 +1,5 @@
    10201125 ##############################################################################
    … …  
    10551160diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
    10561161--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
    1057 +++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-28 20:38:50.310805699 -0800
     1162+++ ncurses-5.7/Ada95/src/Makefile.in   2009-03-22 21:16:59.579606090 -0700
    10581163@@ -1,5 +1,5 @@
    10591164 ##############################################################################
    … …  
    11471252diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    11481253--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-28 20:38:37.153962564 -0800
     1254+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-03-22 21:16:46.486767984 -0700
    11501255@@ -35,8 +35,8 @@
    11511256 ------------------------------------------------------------------------------
    … …  
    11701275diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    11711276--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    1172 +++ ncurses-5.7/c++/cursesw.cc  2009-02-28 20:38:37.161961447 -0800
     1277+++ ncurses-5.7/c++/cursesw.cc  2009-03-22 21:16:46.490769660 -0700
    11731278@@ -1,6 +1,6 @@
    11741279 // * this is for making emacs happy: -*-Mode: C++;-*-
    … …  
    12071312diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
    12081313--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
    1209 +++ ncurses-5.7/c++/Makefile.in 2009-02-28 20:38:46.290546165 -0800
     1314+++ ncurses-5.7/c++/Makefile.in 2009-03-22 21:17:11.616376588 -0700
    12101315@@ -1,6 +1,6 @@
    12111316-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
    1212 +# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
     1317+# $Id: Makefile.in,v 1.86 2009/03/21 20:02:11 Charles.Wilson Exp $
    12131318 ##############################################################################
    12141319-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
    … …  
    12301335 
    12311336 CXX            = @CXX@
     1337@@ -95,7 +95,7 @@
     1338 
     1339 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
     1340 SHLIB_DIRS     = -L../lib
     1341-SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
     1342+SHLIB_LIST     = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
     1343 
     1344 LIBROOT                = ncurses++
     1345 
    12321346@@ -153,7 +153,7 @@
    12331347        $(MODEL)/cursesmain$o
    … …  
    12411355diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
    12421356--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
    1243 +++ ncurses-5.7/config.guess    2009-02-28 20:38:46.290546165 -0800
     1357+++ ncurses-5.7/config.guess    2009-03-22 21:16:55.651353540 -0700
    12441358@@ -4,7 +4,7 @@
    12451359 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    13111425diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
    13121426--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
    1313 +++ ncurses-5.7/config.sub      2009-02-28 20:38:46.290546165 -0800
     1427+++ ncurses-5.7/config.sub      2009-03-22 21:16:55.651353540 -0700
    13141428@@ -4,7 +4,7 @@
    13151429 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    13951509diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    13961510--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    1397 +++ ncurses-5.7/configure       2009-02-28 20:38:57.039235088 -0800
     1511+++ ncurses-5.7/configure       2009-03-22 21:17:11.632377985 -0700
    13981512@@ -1,7 +1,7 @@
    13991513 #! /bin/sh
    14001514-# From configure.in Revision: 1.454 .
    1401 +# From configure.in Revision: 1.466 .
     1515+# From configure.in Revision: 1.469 .
    14021516 # Guess values for system-dependent variables and create Makefiles.
    14031517-# Generated by Autoconf 2.52.20080325.
    … …  
    14261540   --enable-ext-colors     compile for 256-color support
    14271541   --enable-ext-mouse      compile for extended mouse-encoding
    1428 @@ -870,7 +874,7 @@
     1542@@ -780,6 +784,7 @@
     1543   --with-pthread          use POSIX thread library
     1544   --enable-weak-symbols   enable weak-symbols for pthreads
     1545   --enable-reentrant      compile with experimental reentrant code
     1546+  --with-wrap-prefix=XXX  override prefix used for public variables
     1547   --enable-safe-sprintf   compile with experimental safe-sprintf code
     1548   --disable-scroll-hints  compile without scroll-hints code
     1549   --enable-wgetch-events  compile with experimental wgetch-events code
     1550@@ -870,7 +875,7 @@
    14291551 running configure, to aid debugging if configure makes a mistake.
    14301552 
    … …  
    14351557   $ $0 $@
    14361558 
    1437 @@ -994,7 +998,7 @@
     1559@@ -994,7 +999,7 @@
    14381560 fi
    14391561 for ac_site_file in $CONFIG_SITE; do
    14401562   if test -r "$ac_site_file"; then
    14411563-    { echo "$as_me:997: loading site script $ac_site_file" >&5
    1442 +    { echo "$as_me:1001: loading site script $ac_site_file" >&5
     1564+    { echo "$as_me:1002: loading site script $ac_site_file" >&5
    14431565 echo "$as_me: loading site script $ac_site_file" >&6;}
    14441566     cat "$ac_site_file" >&5
    14451567     . "$ac_site_file"
    1446 @@ -1005,7 +1009,7 @@
     1568@@ -1005,7 +1010,7 @@
    14471569   # Some versions of bash will fail to source /dev/null (special
    14481570   # files actually), so we avoid doing that.
    14491571   if test -f "$cache_file"; then
    14501572-    { echo "$as_me:1008: loading cache $cache_file" >&5
    1451 +    { echo "$as_me:1012: loading cache $cache_file" >&5
     1573+    { echo "$as_me:1013: loading cache $cache_file" >&5
    14521574 echo "$as_me: loading cache $cache_file" >&6;}
    14531575     case $cache_file in
    14541576       [\\/]* | ?:[\\/]* ) . $cache_file;;
    1455 @@ -1013,7 +1017,7 @@
     1577@@ -1013,7 +1018,7 @@
    14561578     esac
    14571579   fi
    14581580 else
    14591581-  { echo "$as_me:1016: creating cache $cache_file" >&5
    1460 +  { echo "$as_me:1020: creating cache $cache_file" >&5
     1582+  { echo "$as_me:1021: creating cache $cache_file" >&5
    14611583 echo "$as_me: creating cache $cache_file" >&6;}
    14621584   >$cache_file
    14631585 fi
    1464 @@ -1029,21 +1033,21 @@
     1586@@ -1029,21 +1034,21 @@
    14651587   eval ac_new_val="\$ac_env_${ac_var}_value"
    14661588   case $ac_old_set,$ac_new_set in
    14671589     set,)
    14681590-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    1469 +      { echo "$as_me:1036: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     1591+      { echo "$as_me:1037: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    14701592 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    14711593       ac_cache_corrupted=: ;;
    14721594     ,set)
    14731595-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
    1474 +      { echo "$as_me:1040: error: \`$ac_var' was not set in the previous run" >&5
     1596+      { echo "$as_me:1041: error: \`$ac_var' was not set in the previous run" >&5
    14751597 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    14761598       ac_cache_corrupted=: ;;
    … …  
    14791601       if test "x$ac_old_val" != "x$ac_new_val"; then
    14801602-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
    1481 +        { echo "$as_me:1046: error: \`$ac_var' has changed since the previous run:" >&5
     1603+        { echo "$as_me:1047: error: \`$ac_var' has changed since the previous run:" >&5
    14821604 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    14831605-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
    1484 +        { echo "$as_me:1048:   former value:  $ac_old_val" >&5
     1606+        { echo "$as_me:1049:   former value:  $ac_old_val" >&5
    14851607 echo "$as_me:   former value:  $ac_old_val" >&2;}
    14861608-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
    1487 +        { echo "$as_me:1050:   current value: $ac_new_val" >&5
     1609+        { echo "$as_me:1051:   current value: $ac_new_val" >&5
    14881610 echo "$as_me:   current value: $ac_new_val" >&2;}
    14891611         ac_cache_corrupted=:
    14901612       fi;;
    1491 @@ -1062,9 +1066,9 @@
     1613@@ -1062,9 +1067,9 @@
    14921614   fi
    14931615 done
    14941616 if $ac_cache_corrupted; then
    14951617-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
    1496 +  { echo "$as_me:1069: error: changes in the environment can compromise the build" >&5
     1618+  { echo "$as_me:1070: error: changes in the environment can compromise the build" >&5
    14971619 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    14981620-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    1499 +  { { echo "$as_me:1071: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     1621+  { { echo "$as_me:1072: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    15001622 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    15011623    { (exit 1); exit 1; }; }
    15021624 fi
    1503 @@ -1085,10 +1089,10 @@
     1625@@ -1085,10 +1090,10 @@
    15041626 echo "#! $SHELL" >conftest.sh
    15051627 echo  "exit 0"   >>conftest.sh
    15061628 chmod +x conftest.sh
    15071629-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
    1508 +if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5
     1630+if { (echo "$as_me:1093: PATH=\".;.\"; conftest.sh") >&5
    15091631   (PATH=".;."; conftest.sh) 2>&5
    15101632   ac_status=$?
    15111633-  echo "$as_me:1091: \$? = $ac_status" >&5
    1512 +  echo "$as_me:1095: \$? = $ac_status" >&5
     1634+  echo "$as_me:1096: \$? = $ac_status" >&5
    15131635   (exit $ac_status); }; then
    15141636   ac_path_separator=';'
    15151637 else
    1516 @@ -1101,7 +1105,7 @@
     1638@@ -1101,7 +1106,7 @@
    15171639 
    15181640 top_builddir=`pwd`
    15191641 
    15201642-echo "$as_me:1104: checking for egrep" >&5
    1521 +echo "$as_me:1108: checking for egrep" >&5
     1643+echo "$as_me:1109: checking for egrep" >&5
    15221644 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    15231645 if test "${ac_cv_prog_egrep+set}" = set; then
    15241646   echo $ECHO_N "(cached) $ECHO_C" >&6
    1525 @@ -1111,11 +1115,11 @@
     1647@@ -1111,11 +1116,11 @@
    15261648     else ac_cv_prog_egrep='egrep'
    15271649     fi
    15281650 fi
    15291651-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
    1530 +echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5
     1652+echo "$as_me:1119: result: $ac_cv_prog_egrep" >&5
    15311653 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    15321654  EGREP=$ac_cv_prog_egrep
    15331655 
    15341656-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
    1535 +test -z "$EGREP" && { { echo "$as_me:1122: error: No egrep program found" >&5
     1657+test -z "$EGREP" && { { echo "$as_me:1123: error: No egrep program found" >&5
    15361658 echo "$as_me: error: No egrep program found" >&2;}
    15371659    { (exit 1); exit 1; }; }
    15381660 
    1539 @@ -1125,7 +1129,7 @@
     1661@@ -1125,7 +1130,7 @@
    15401662 cf_cv_abi_version=${NCURSES_MAJOR}
    15411663 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
    15421664 cf_cv_timestamp=`date`
    15431665-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    1544 +echo "$as_me:1132: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
     1666+echo "$as_me:1133: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    15451667 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
    15461668 
    15471669 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
    1548 @@ -1133,7 +1137,7 @@
     1670@@ -1133,7 +1138,7 @@
    15491671 # Check whether --with-rel-version or --without-rel-version was given.
    15501672 if test "${with_rel_version+set}" = set; then
    15511673   withval="$with_rel_version"
    15521674-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    1553 +  { echo "$as_me:1140: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
     1675+  { echo "$as_me:1141: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    15541676 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
    15551677  cf_cv_rel_version=$withval
    15561678 fi;
    1557 @@ -1146,13 +1150,13 @@
     1679@@ -1146,13 +1151,13 @@
    15581680   [0-9]*) #(vi
    15591681        ;;
    15601682   *)
    15611683-       { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    1562 +       { { echo "$as_me:1153: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
     1684+       { { echo "$as_me:1154: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    15631685 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    15641686    { (exit 1); exit 1; }; }
    … …  
    15671689 else
    15681690-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
    1569 +  { { echo "$as_me:1159: error: Release major-version value is empty" >&5
     1691+  { { echo "$as_me:1160: error: Release major-version value is empty" >&5
    15701692 echo "$as_me: error: Release major-version value is empty" >&2;}
    15711693    { (exit 1); exit 1; }; }
    15721694 fi
    1573 @@ -1162,13 +1166,13 @@
     1695@@ -1162,13 +1167,13 @@
    15741696   [0-9]*) #(vi
    15751697        ;;
    15761698   *)
    15771699-       { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    1578 +       { { echo "$as_me:1169: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
     1700+       { { echo "$as_me:1170: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    15791701 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    15801702    { (exit 1); exit 1; }; }
    … …  
    15831705 else
    15841706-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
    1585 +  { { echo "$as_me:1175: error: Release minor-version value is empty" >&5
     1707+  { { echo "$as_me:1176: error: Release minor-version value is empty" >&5
    15861708 echo "$as_me: error: Release minor-version value is empty" >&2;}
    15871709    { (exit 1); exit 1; }; }
    15881710 fi
    1589 @@ -1178,7 +1182,7 @@
     1711@@ -1178,7 +1183,7 @@
    15901712 # Check whether --with-abi-version or --without-abi-version was given.
    15911713 if test "${with_abi_version+set}" = set; then
    15921714   withval="$with_abi_version"
    15931715-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    1594 +  { echo "$as_me:1185: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
     1716+  { echo "$as_me:1186: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    15951717 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
    15961718  cf_cv_abi_version=$withval
    15971719 fi;
    1598 @@ -1188,13 +1192,13 @@
     1720@@ -1188,13 +1193,13 @@
    15991721   [0-9]*) #(vi
    16001722        ;;
    16011723   *)
    16021724-       { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
    1603 +       { { echo "$as_me:1195: error: ABI version is not a number: $cf_cv_abi_version" >&5
     1725+       { { echo "$as_me:1196: error: ABI version is not a number: $cf_cv_abi_version" >&5
    16041726 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    16051727    { (exit 1); exit 1; }; }
    … …  
    16081730 else
    16091731-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
    1610 +  { { echo "$as_me:1201: error: ABI version value is empty" >&5
     1732+  { { echo "$as_me:1202: error: ABI version value is empty" >&5
    16111733 echo "$as_me: error: ABI version value is empty" >&2;}
    16121734    { (exit 1); exit 1; }; }
    16131735 fi
    1614 @@ -1216,7 +1220,7 @@
     1736@@ -1216,7 +1221,7 @@
    16151737   fi
    16161738 done
    16171739 if test -z "$ac_aux_dir"; then
    16181740-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    1619 +  { { echo "$as_me:1223: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     1741+  { { echo "$as_me:1224: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    16201742 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    16211743    { (exit 1); exit 1; }; }
    16221744 fi
    1623 @@ -1226,11 +1230,11 @@
     1745@@ -1226,11 +1231,11 @@
    16241746 
    16251747 # Make sure we can run config.sub.
    16261748 $ac_config_sub sun4 >/dev/null 2>&1 ||
    16271749-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
    1628 +  { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5
     1750+  { { echo "$as_me:1234: error: cannot run $ac_config_sub" >&5
    16291751 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    16301752    { (exit 1); exit 1; }; }
    16311753 
    16321754-echo "$as_me:1233: checking build system type" >&5
    1633 +echo "$as_me:1237: checking build system type" >&5
     1755+echo "$as_me:1238: checking build system type" >&5
    16341756 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    16351757 if test "${ac_cv_build+set}" = set; then
    16361758   echo $ECHO_N "(cached) $ECHO_C" >&6
    1637 @@ -1239,23 +1243,23 @@
     1759@@ -1239,23 +1244,23 @@
    16381760 test -z "$ac_cv_build_alias" &&
    16391761   ac_cv_build_alias=`$ac_config_guess`
    16401762 test -z "$ac_cv_build_alias" &&
    16411763-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
    1642 +  { { echo "$as_me:1246: error: cannot guess build type; you must specify one" >&5
     1764+  { { echo "$as_me:1247: error: cannot guess build type; you must specify one" >&5
    16431765 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    16441766    { (exit 1); exit 1; }; }
    16451767 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    16461768-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    1647 +  { { echo "$as_me:1250: error: $ac_config_sub $ac_cv_build_alias failed." >&5
     1769+  { { echo "$as_me:1251: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    16481770 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    16491771    { (exit 1); exit 1; }; }
    … …  
    16511773 fi
    16521774-echo "$as_me:1251: result: $ac_cv_build" >&5
    1653 +echo "$as_me:1255: result: $ac_cv_build" >&5
     1775+echo "$as_me:1256: result: $ac_cv_build" >&5
    16541776 echo "${ECHO_T}$ac_cv_build" >&6
    16551777 build=$ac_cv_build
    … …  
    16591781 
    16601782-echo "$as_me:1258: checking host system type" >&5
    1661 +echo "$as_me:1262: checking host system type" >&5
     1783+echo "$as_me:1263: checking host system type" >&5
    16621784 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    16631785 if test "${ac_cv_host+set}" = set; then
    16641786   echo $ECHO_N "(cached) $ECHO_C" >&6
    1665 @@ -1264,12 +1268,12 @@
     1787@@ -1264,12 +1269,12 @@
    16661788 test -z "$ac_cv_host_alias" &&
    16671789   ac_cv_host_alias=$ac_cv_build_alias
    16681790 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    16691791-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    1670 +  { { echo "$as_me:1271: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     1792+  { { echo "$as_me:1272: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    16711793 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    16721794    { (exit 1); exit 1; }; }
    … …  
    16741796 fi
    16751797-echo "$as_me:1272: result: $ac_cv_host" >&5
    1676 +echo "$as_me:1276: result: $ac_cv_host" >&5
     1798+echo "$as_me:1277: result: $ac_cv_host" >&5
    16771799 echo "${ECHO_T}$ac_cv_host" >&6
    16781800 host=$ac_cv_host
    16791801 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1680 @@ -1277,7 +1281,7 @@
     1802@@ -1277,7 +1282,7 @@
    16811803 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    16821804 
    16831805 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    16841806-       echo "$as_me:1280: checking target system type" >&5
    1685 +       echo "$as_me:1284: checking target system type" >&5
     1807+       echo "$as_me:1285: checking target system type" >&5
    16861808 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    16871809 if test "${ac_cv_target+set}" = set; then
    16881810   echo $ECHO_N "(cached) $ECHO_C" >&6
    1689 @@ -1286,12 +1290,12 @@
     1811@@ -1286,12 +1291,12 @@
    16901812 test "x$ac_cv_target_alias" = "x" &&
    16911813   ac_cv_target_alias=$ac_cv_host_alias
    16921814 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    16931815-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1694 +  { { echo "$as_me:1293: error: $ac_config_sub $ac_cv_target_alias failed" >&5
     1816+  { { echo "$as_me:1294: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    16951817 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    16961818    { (exit 1); exit 1; }; }
    … …  
    16981820 fi
    16991821-echo "$as_me:1294: result: $ac_cv_target" >&5
    1700 +echo "$as_me:1298: result: $ac_cv_target" >&5
     1822+echo "$as_me:1299: result: $ac_cv_target" >&5
    17011823 echo "${ECHO_T}$ac_cv_target" >&6
    17021824 target=$ac_cv_target
    17031825 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1704 @@ -1322,13 +1326,13 @@
     1826@@ -1322,13 +1327,13 @@
    17051827 fi
    17061828 
    17071829 test -z "$system_name" && system_name="$cf_cv_system_name"
    17081830-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
    1709 +test -n "$cf_cv_system_name" && echo "$as_me:1329: result: Configuring for $cf_cv_system_name" >&5
     1831+test -n "$cf_cv_system_name" && echo "$as_me:1330: result: Configuring for $cf_cv_system_name" >&5
    17101832 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    17111833 
    17121834 if test ".$system_name" != ".$cf_cv_system_name" ; then
    17131835-       echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1714 +       echo "$as_me:1333: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
     1836+       echo "$as_me:1334: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    17151837 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    17161838-       { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
    1717 +       { { echo "$as_me:1335: error: \"Please remove config.cache and try again.\"" >&5
     1839+       { { echo "$as_me:1336: error: \"Please remove config.cache and try again.\"" >&5
    17181840 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    17191841    { (exit 1); exit 1; }; }
    17201842 fi
    1721 @@ -1336,7 +1340,7 @@
     1843@@ -1336,7 +1341,7 @@
    17221844 # Check whether --with-system-type or --without-system-type was given.
    17231845 if test "${with_system_type+set}" = set; then
    17241846   withval="$with_system_type"
    17251847-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
    1726 +  { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5
     1848+  { echo "$as_me:1344: WARNING: overriding system type to $withval" >&5
    17271849 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    17281850  cf_cv_system_name=$withval
    17291851 fi;
    1730 @@ -1346,7 +1350,7 @@
     1852@@ -1346,7 +1351,7 @@
    17311853 
    17321854 ###    Default install-location
    17331855 
    17341856-echo "$as_me:1349: checking for prefix" >&5
    1735 +echo "$as_me:1353: checking for prefix" >&5
     1857+echo "$as_me:1354: checking for prefix" >&5
    17361858 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    17371859 if test "x$prefix" = "xNONE" ; then
    17381860        case "$cf_cv_system_name" in
    1739 @@ -1358,11 +1362,11 @@
     1861@@ -1358,11 +1363,11 @@
    17401862                ;;
    17411863        esac
    17421864 fi
    17431865-echo "$as_me:1361: result: $prefix" >&5
    1744 +echo "$as_me:1365: result: $prefix" >&5
     1866+echo "$as_me:1366: result: $prefix" >&5
    17451867 echo "${ECHO_T}$prefix" >&6
    17461868 
    17471869 if test "x$prefix" = "xNONE" ; then
    17481870-echo "$as_me:1365: checking for default include-directory" >&5
    1749 +echo "$as_me:1369: checking for default include-directory" >&5
     1871+echo "$as_me:1370: checking for default include-directory" >&5
    17501872 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    17511873 test -n "$verbose" && echo 1>&6
    17521874 for cf_symbol in \
    1753 @@ -1385,7 +1389,7 @@
     1875@@ -1385,7 +1390,7 @@
    17541876        fi
    17551877        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    17561878 done
    17571879-echo "$as_me:1388: result: $includedir" >&5
    1758 +echo "$as_me:1392: result: $includedir" >&5
     1880+echo "$as_me:1393: result: $includedir" >&5
    17591881 echo "${ECHO_T}$includedir" >&6
    17601882 fi
    17611883 
    1762 @@ -1399,7 +1403,7 @@
     1884@@ -1399,7 +1404,7 @@
    17631885 if test -n "$ac_tool_prefix"; then
    17641886   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    17651887 set dummy ${ac_tool_prefix}gcc; ac_word=$2
    17661888-echo "$as_me:1402: checking for $ac_word" >&5
    1767 +echo "$as_me:1406: checking for $ac_word" >&5
     1889+echo "$as_me:1407: checking for $ac_word" >&5
    17681890 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17691891 if test "${ac_cv_prog_CC+set}" = set; then
    17701892   echo $ECHO_N "(cached) $ECHO_C" >&6
    1771 @@ -1414,7 +1418,7 @@
     1893@@ -1414,7 +1419,7 @@
    17721894   test -z "$ac_dir" && ac_dir=.
    17731895   $as_executable_p "$ac_dir/$ac_word" || continue
    17741896 ac_cv_prog_CC="${ac_tool_prefix}gcc"
    17751897-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
    1776 +echo "$as_me:1421: found $ac_dir/$ac_word" >&5
     1898+echo "$as_me:1422: found $ac_dir/$ac_word" >&5
    17771899 break
    17781900 done
    17791901 
    1780 @@ -1422,10 +1426,10 @@
     1902@@ -1422,10 +1427,10 @@
    17811903 fi
    17821904 CC=$ac_cv_prog_CC
    17831905 if test -n "$CC"; then
    17841906-  echo "$as_me:1425: result: $CC" >&5
    1785 +  echo "$as_me:1429: result: $CC" >&5
     1907+  echo "$as_me:1430: result: $CC" >&5
    17861908 echo "${ECHO_T}$CC" >&6
    17871909 else
    17881910-  echo "$as_me:1428: result: no" >&5
    1789 +  echo "$as_me:1432: result: no" >&5
     1911+  echo "$as_me:1433: result: no" >&5
    17901912 echo "${ECHO_T}no" >&6
    17911913 fi
    17921914 
    1793 @@ -1434,7 +1438,7 @@
     1915@@ -1434,7 +1439,7 @@
    17941916   ac_ct_CC=$CC
    17951917   # Extract the first word of "gcc", so it can be a program name with args.
    17961918 set dummy gcc; ac_word=$2
    17971919-echo "$as_me:1437: checking for $ac_word" >&5
    1798 +echo "$as_me:1441: checking for $ac_word" >&5
     1920+echo "$as_me:1442: checking for $ac_word" >&5
    17991921 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18001922 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18011923   echo $ECHO_N "(cached) $ECHO_C" >&6
    1802 @@ -1449,7 +1453,7 @@
     1924@@ -1449,7 +1454,7 @@
    18031925   test -z "$ac_dir" && ac_dir=.
    18041926   $as_executable_p "$ac_dir/$ac_word" || continue
    18051927 ac_cv_prog_ac_ct_CC="gcc"
    18061928-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
    1807 +echo "$as_me:1456: found $ac_dir/$ac_word" >&5
     1929+echo "$as_me:1457: found $ac_dir/$ac_word" >&5
    18081930 break
    18091931 done
    18101932 
    1811 @@ -1457,10 +1461,10 @@
     1933@@ -1457,10 +1462,10 @@
    18121934 fi
    18131935 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18141936 if test -n "$ac_ct_CC"; then
    18151937-  echo "$as_me:1460: result: $ac_ct_CC" >&5
    1816 +  echo "$as_me:1464: result: $ac_ct_CC" >&5
     1938+  echo "$as_me:1465: result: $ac_ct_CC" >&5
    18171939 echo "${ECHO_T}$ac_ct_CC" >&6
    18181940 else
    18191941-  echo "$as_me:1463: result: no" >&5
    1820 +  echo "$as_me:1467: result: no" >&5
     1942+  echo "$as_me:1468: result: no" >&5
    18211943 echo "${ECHO_T}no" >&6
    18221944 fi
    18231945 
    1824 @@ -1473,7 +1477,7 @@
     1946@@ -1473,7 +1478,7 @@
    18251947   if test -n "$ac_tool_prefix"; then
    18261948   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    18271949 set dummy ${ac_tool_prefix}cc; ac_word=$2
    18281950-echo "$as_me:1476: checking for $ac_word" >&5
    1829 +echo "$as_me:1480: checking for $ac_word" >&5
     1951+echo "$as_me:1481: checking for $ac_word" >&5
    18301952 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18311953 if test "${ac_cv_prog_CC+set}" = set; then
    18321954   echo $ECHO_N "(cached) $ECHO_C" >&6
    1833 @@ -1488,7 +1492,7 @@
     1955@@ -1488,7 +1493,7 @@
    18341956   test -z "$ac_dir" && ac_dir=.
    18351957   $as_executable_p "$ac_dir/$ac_word" || continue
    18361958 ac_cv_prog_CC="${ac_tool_prefix}cc"
    18371959-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
    1838 +echo "$as_me:1495: found $ac_dir/$ac_word" >&5
     1960+echo "$as_me:1496: found $ac_dir/$ac_word" >&5
    18391961 break
    18401962 done
    18411963 
    1842 @@ -1496,10 +1500,10 @@
     1964@@ -1496,10 +1501,10 @@
    18431965 fi
    18441966 CC=$ac_cv_prog_CC
    18451967 if test -n "$CC"; then
    18461968-  echo "$as_me:1499: result: $CC" >&5
    1847 +  echo "$as_me:1503: result: $CC" >&5
     1969+  echo "$as_me:1504: result: $CC" >&5
    18481970 echo "${ECHO_T}$CC" >&6
    18491971 else
    18501972-  echo "$as_me:1502: result: no" >&5
    1851 +  echo "$as_me:1506: result: no" >&5
     1973+  echo "$as_me:1507: result: no" >&5
    18521974 echo "${ECHO_T}no" >&6
    18531975 fi
    18541976 
    1855 @@ -1508,7 +1512,7 @@
     1977@@ -1508,7 +1513,7 @@
    18561978   ac_ct_CC=$CC
    18571979   # Extract the first word of "cc", so it can be a program name with args.
    18581980 set dummy cc; ac_word=$2
    18591981-echo "$as_me:1511: checking for $ac_word" >&5
    1860 +echo "$as_me:1515: checking for $ac_word" >&5
     1982+echo "$as_me:1516: checking for $ac_word" >&5
    18611983 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18621984 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18631985   echo $ECHO_N "(cached) $ECHO_C" >&6
    1864 @@ -1523,7 +1527,7 @@
     1986@@ -1523,7 +1528,7 @@
    18651987   test -z "$ac_dir" && ac_dir=.
    18661988   $as_executable_p "$ac_dir/$ac_word" || continue
    18671989 ac_cv_prog_ac_ct_CC="cc"
    18681990-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
    1869 +echo "$as_me:1530: found $ac_dir/$ac_word" >&5
     1991+echo "$as_me:1531: found $ac_dir/$ac_word" >&5
    18701992 break
    18711993 done
    18721994 
    1873 @@ -1531,10 +1535,10 @@
     1995@@ -1531,10 +1536,10 @@
    18741996 fi
    18751997 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18761998 if test -n "$ac_ct_CC"; then
    18771999-  echo "$as_me:1534: result: $ac_ct_CC" >&5
    1878 +  echo "$as_me:1538: result: $ac_ct_CC" >&5
     2000+  echo "$as_me:1539: result: $ac_ct_CC" >&5
    18792001 echo "${ECHO_T}$ac_ct_CC" >&6
    18802002 else
    18812003-  echo "$as_me:1537: result: no" >&5
    1882 +  echo "$as_me:1541: result: no" >&5
     2004+  echo "$as_me:1542: result: no" >&5
    18832005 echo "${ECHO_T}no" >&6
    18842006 fi
    18852007 
    1886 @@ -1547,7 +1551,7 @@
     2008@@ -1547,7 +1552,7 @@
    18872009 if test -z "$CC"; then
    18882010   # Extract the first word of "cc", so it can be a program name with args.
    18892011 set dummy cc; ac_word=$2
    18902012-echo "$as_me:1550: checking for $ac_word" >&5
    1891 +echo "$as_me:1554: checking for $ac_word" >&5
     2013+echo "$as_me:1555: checking for $ac_word" >&5
    18922014 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18932015 if test "${ac_cv_prog_CC+set}" = set; then
    18942016   echo $ECHO_N "(cached) $ECHO_C" >&6
    1895 @@ -1567,7 +1571,7 @@
     2017@@ -1567,7 +1572,7 @@
    18962018   continue
    18972019 fi
    18982020 ac_cv_prog_CC="cc"
    18992021-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
    1900 +echo "$as_me:1574: found $ac_dir/$ac_word" >&5
     2022+echo "$as_me:1575: found $ac_dir/$ac_word" >&5
    19012023 break
    19022024 done
    19032025 
    1904 @@ -1589,10 +1593,10 @@
     2026@@ -1589,10 +1594,10 @@
    19052027 fi
    19062028 CC=$ac_cv_prog_CC
    19072029 if test -n "$CC"; then
    19082030-  echo "$as_me:1592: result: $CC" >&5
    1909 +  echo "$as_me:1596: result: $CC" >&5
     2031+  echo "$as_me:1597: result: $CC" >&5
    19102032 echo "${ECHO_T}$CC" >&6
    19112033 else
    19122034-  echo "$as_me:1595: result: no" >&5
    1913 +  echo "$as_me:1599: result: no" >&5
     2035+  echo "$as_me:1600: result: no" >&5
    19142036 echo "${ECHO_T}no" >&6
    19152037 fi
    19162038 
    1917 @@ -1603,7 +1607,7 @@
     2039@@ -1603,7 +1608,7 @@
    19182040   do
    19192041     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    19202042 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    19212043-echo "$as_me:1606: checking for $ac_word" >&5
    1922 +echo "$as_me:1610: checking for $ac_word" >&5
     2044+echo "$as_me:1611: checking for $ac_word" >&5
    19232045 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19242046 if test "${ac_cv_prog_CC+set}" = set; then
    19252047   echo $ECHO_N "(cached) $ECHO_C" >&6
    1926 @@ -1618,7 +1622,7 @@
     2048@@ -1618,7 +1623,7 @@
    19272049   test -z "$ac_dir" && ac_dir=.
    19282050   $as_executable_p "$ac_dir/$ac_word" || continue
    19292051 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    19302052-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
    1931 +echo "$as_me:1625: found $ac_dir/$ac_word" >&5
     2053+echo "$as_me:1626: found $ac_dir/$ac_word" >&5
    19322054 break
    19332055 done
    19342056 
    1935 @@ -1626,10 +1630,10 @@
     2057@@ -1626,10 +1631,10 @@
    19362058 fi
    19372059 CC=$ac_cv_prog_CC
    19382060 if test -n "$CC"; then
    19392061-  echo "$as_me:1629: result: $CC" >&5
    1940 +  echo "$as_me:1633: result: $CC" >&5
     2062+  echo "$as_me:1634: result: $CC" >&5
    19412063 echo "${ECHO_T}$CC" >&6
    19422064 else
    19432065-  echo "$as_me:1632: result: no" >&5
    1944 +  echo "$as_me:1636: result: no" >&5
     2066+  echo "$as_me:1637: result: no" >&5
    19452067 echo "${ECHO_T}no" >&6
    19462068 fi
    19472069 
    1948 @@ -1642,7 +1646,7 @@
     2070@@ -1642,7 +1647,7 @@
    19492071 do
    19502072   # Extract the first word of "$ac_prog", so it can be a program name with args.
    19512073 set dummy $ac_prog; ac_word=$2
    19522074-echo "$as_me:1645: checking for $ac_word" >&5
    1953 +echo "$as_me:1649: checking for $ac_word" >&5
     2075+echo "$as_me:1650: checking for $ac_word" >&5
    19542076 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19552077 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    19562078   echo $ECHO_N "(cached) $ECHO_C" >&6
    1957 @@ -1657,7 +1661,7 @@
     2079@@ -1657,7 +1662,7 @@
    19582080   test -z "$ac_dir" && ac_dir=.
    19592081   $as_executable_p "$ac_dir/$ac_word" || continue
    19602082 ac_cv_prog_ac_ct_CC="$ac_prog"
    19612083-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
    1962 +echo "$as_me:1664: found $ac_dir/$ac_word" >&5
     2084+echo "$as_me:1665: found $ac_dir/$ac_word" >&5
    19632085 break
    19642086 done
    19652087 
    1966 @@ -1665,10 +1669,10 @@
     2088@@ -1665,10 +1670,10 @@
    19672089 fi
    19682090 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    19692091 if test -n "$ac_ct_CC"; then
    19702092-  echo "$as_me:1668: result: $ac_ct_CC" >&5
    1971 +  echo "$as_me:1672: result: $ac_ct_CC" >&5
     2093+  echo "$as_me:1673: result: $ac_ct_CC" >&5
    19722094 echo "${ECHO_T}$ac_ct_CC" >&6
    19732095 else
    19742096-  echo "$as_me:1671: result: no" >&5
    1975 +  echo "$as_me:1675: result: no" >&5
     2097+  echo "$as_me:1676: result: no" >&5
    19762098 echo "${ECHO_T}no" >&6
    19772099 fi
    19782100 
    1979 @@ -1680,32 +1684,32 @@
     2101@@ -1680,32 +1685,32 @@
    19802102 
    19812103 fi
    19822104 
    19832105-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
    1984 +test -z "$CC" && { { echo "$as_me:1687: error: no acceptable cc found in \$PATH" >&5
     2106+test -z "$CC" && { { echo "$as_me:1688: error: no acceptable cc found in \$PATH" >&5
    19852107 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    19862108    { (exit 1); exit 1; }; }
    … …  
    19882110 # Provide some information about the compiler.
    19892111-echo "$as_me:1688:" \
    1990 +echo "$as_me:1692:" \
     2112+echo "$as_me:1693:" \
    19912113      "checking for C compiler version" >&5
    19922114 ac_compiler=`set X $ac_compile; echo $2`
    19932115-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
    1994 +{ (eval echo "$as_me:1695: \"$ac_compiler --version </dev/null >&5\"") >&5
     2116+{ (eval echo "$as_me:1696: \"$ac_compiler --version </dev/null >&5\"") >&5
    19952117   (eval $ac_compiler --version </dev/null >&5) 2>&5
    19962118   ac_status=$?
    19972119-  echo "$as_me:1694: \$? = $ac_status" >&5
    1998 +  echo "$as_me:1698: \$? = $ac_status" >&5
     2120+  echo "$as_me:1699: \$? = $ac_status" >&5
    19992121   (exit $ac_status); }
    20002122-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
    2001 +{ (eval echo "$as_me:1700: \"$ac_compiler -v </dev/null >&5\"") >&5
     2123+{ (eval echo "$as_me:1701: \"$ac_compiler -v </dev/null >&5\"") >&5
    20022124   (eval $ac_compiler -v </dev/null >&5) 2>&5
    20032125   ac_status=$?
    20042126-  echo "$as_me:1699: \$? = $ac_status" >&5
    2005 +  echo "$as_me:1703: \$? = $ac_status" >&5
     2127+  echo "$as_me:1704: \$? = $ac_status" >&5
    20062128   (exit $ac_status); }
    20072129-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
    2008 +{ (eval echo "$as_me:1705: \"$ac_compiler -V </dev/null >&5\"") >&5
     2130+{ (eval echo "$as_me:1706: \"$ac_compiler -V </dev/null >&5\"") >&5
    20092131   (eval $ac_compiler -V </dev/null >&5) 2>&5
    20102132   ac_status=$?
    20112133-  echo "$as_me:1704: \$? = $ac_status" >&5
    2012 +  echo "$as_me:1708: \$? = $ac_status" >&5
     2134+  echo "$as_me:1709: \$? = $ac_status" >&5
    20132135   (exit $ac_status); }
    20142136 
    20152137 cat >conftest.$ac_ext <<_ACEOF
    20162138-#line 1708 "configure"
    2017 +#line 1712 "configure"
     2139+#line 1713 "configure"
    20182140 #include "confdefs.h"
    20192141 
    20202142 int
    2021 @@ -1721,13 +1725,13 @@
     2143@@ -1721,13 +1726,13 @@
    20222144 # Try to create an executable without -o first, disregard a.out.
    20232145 # It will help us diagnose broken compilers, and finding out an intuition
    20242146 # of exeext.
    20252147-echo "$as_me:1724: checking for C compiler default output" >&5
    2026 +echo "$as_me:1728: checking for C compiler default output" >&5
     2148+echo "$as_me:1729: checking for C compiler default output" >&5
    20272149 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    20282150 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    20292151-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
    2030 +if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5
     2152+if { (eval echo "$as_me:1732: \"$ac_link_default\"") >&5
    20312153   (eval $ac_link_default) 2>&5
    20322154   ac_status=$?
    20332155-  echo "$as_me:1730: \$? = $ac_status" >&5
    2034 +  echo "$as_me:1734: \$? = $ac_status" >&5
     2156+  echo "$as_me:1735: \$? = $ac_status" >&5
    20352157   (exit $ac_status); }; then
    20362158   # Find the output, starting from the most likely.  This scheme is
    20372159 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    2038 @@ -1736,7 +1740,7 @@
     2160@@ -1736,7 +1741,7 @@
    20392161                 ls a.out conftest 2>/dev/null;
    20402162                 ls a.* conftest.* 2>/dev/null`; do
    … …  
    20452167             # certainly right.
    20462168             break;;
    2047 @@ -1750,34 +1754,34 @@
     2169@@ -1750,34 +1755,34 @@
    20482170 else
    20492171   echo "$as_me: failed program was:" >&5
    20502172 cat conftest.$ac_ext >&5
    20512173-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
    2052 +{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5
     2174+{ { echo "$as_me:1758: error: C compiler cannot create executables" >&5
    20532175 echo "$as_me: error: C compiler cannot create executables" >&2;}
    20542176    { (exit 77); exit 77; }; }
    … …  
    20572179 ac_exeext=$ac_cv_exeext
    20582180-echo "$as_me:1759: result: $ac_file" >&5
    2059 +echo "$as_me:1763: result: $ac_file" >&5
     2181+echo "$as_me:1764: result: $ac_file" >&5
    20602182 echo "${ECHO_T}$ac_file" >&6
    20612183 
    … …  
    20632185 # the compiler is broken, or we cross compile.
    20642186-echo "$as_me:1764: checking whether the C compiler works" >&5
    2065 +echo "$as_me:1768: checking whether the C compiler works" >&5
     2187+echo "$as_me:1769: checking whether the C compiler works" >&5
    20662188 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    20672189 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
    … …  
    20702192   if { ac_try='./$ac_file'
    20712193-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
    2072 +  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
     2194+  { (eval echo "$as_me:1775: \"$ac_try\"") >&5
    20732195   (eval $ac_try) 2>&5
    20742196   ac_status=$?
    20752197-  echo "$as_me:1773: \$? = $ac_status" >&5
    2076 +  echo "$as_me:1777: \$? = $ac_status" >&5
     2198+  echo "$as_me:1778: \$? = $ac_status" >&5
    20772199   (exit $ac_status); }; }; then
    20782200     cross_compiling=no
    … …  
    20822204     else
    20832205-       { { echo "$as_me:1780: error: cannot run C compiled programs.
    2084 +       { { echo "$as_me:1784: error: cannot run C compiled programs.
     2206+       { { echo "$as_me:1785: error: cannot run C compiled programs.
    20852207 If you meant to cross compile, use \`--host'." >&5
    20862208 echo "$as_me: error: cannot run C compiled programs.
    20872209 If you meant to cross compile, use \`--host'." >&2;}
    2088 @@ -1785,24 +1789,24 @@
     2210@@ -1785,24 +1790,24 @@
    20892211     fi
    20902212   fi
    20912213 fi
    20922214-echo "$as_me:1788: result: yes" >&5
    2093 +echo "$as_me:1792: result: yes" >&5
     2215+echo "$as_me:1793: result: yes" >&5
    20942216 echo "${ECHO_T}yes" >&6
    20952217 
    … …  
    20992221 # the compiler is broken, or we cross compile.
    21002222-echo "$as_me:1795: checking whether we are cross compiling" >&5
    2101 +echo "$as_me:1799: checking whether we are cross compiling" >&5
     2223+echo "$as_me:1800: checking whether we are cross compiling" >&5
    21022224 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    21032225-echo "$as_me:1797: result: $cross_compiling" >&5
    2104 +echo "$as_me:1801: result: $cross_compiling" >&5
     2226+echo "$as_me:1802: result: $cross_compiling" >&5
    21052227 echo "${ECHO_T}$cross_compiling" >&6
    21062228 
    21072229-echo "$as_me:1800: checking for executable suffix" >&5
    2108 +echo "$as_me:1804: checking for executable suffix" >&5
     2230+echo "$as_me:1805: checking for executable suffix" >&5
    21092231 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    21102232-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
    2111 +if { (eval echo "$as_me:1806: \"$ac_link\"") >&5
     2233+if { (eval echo "$as_me:1807: \"$ac_link\"") >&5
    21122234   (eval $ac_link) 2>&5
    21132235   ac_status=$?
    21142236-  echo "$as_me:1805: \$? = $ac_status" >&5
    2115 +  echo "$as_me:1809: \$? = $ac_status" >&5
     2237+  echo "$as_me:1810: \$? = $ac_status" >&5
    21162238   (exit $ac_status); }; then
    21172239   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    21182240 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    2119 @@ -1810,7 +1814,7 @@
     2241@@ -1810,7 +1815,7 @@
    21202242 # `rm'.
    21212243 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
    … …  
    21262248           export ac_cv_exeext
    21272249           break;;
    2128 @@ -1818,25 +1822,25 @@
     2250@@ -1818,25 +1823,25 @@
    21292251   esac
    21302252 done
    21312253 else
    21322254-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
    2133 +  { { echo "$as_me:1825: error: cannot compute EXEEXT: cannot compile and link" >&5
     2255+  { { echo "$as_me:1826: error: cannot compute EXEEXT: cannot compile and link" >&5
    21342256 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    21352257    { (exit 1); exit 1; }; }
    … …  
    21382260 rm -f conftest$ac_cv_exeext
    21392261-echo "$as_me:1827: result: $ac_cv_exeext" >&5
    2140 +echo "$as_me:1831: result: $ac_cv_exeext" >&5
     2262+echo "$as_me:1832: result: $ac_cv_exeext" >&5
    21412263 echo "${ECHO_T}$ac_cv_exeext" >&6
    21422264 
    … …  
    21452267 ac_exeext=$EXEEXT
    21462268-echo "$as_me:1833: checking for object suffix" >&5
    2147 +echo "$as_me:1837: checking for object suffix" >&5
     2269+echo "$as_me:1838: checking for object suffix" >&5
    21482270 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    21492271 if test "${ac_cv_objext+set}" = set; then
    … …  
    21522274   cat >conftest.$ac_ext <<_ACEOF
    21532275-#line 1839 "configure"
    2154 +#line 1843 "configure"
     2276+#line 1844 "configure"
    21552277 #include "confdefs.h"
    21562278 
    21572279 int
    2158 @@ -1848,14 +1852,14 @@
     2280@@ -1848,14 +1853,14 @@
    21592281 }
    21602282 _ACEOF
    21612283 rm -f conftest.o conftest.obj
    21622284-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
    2163 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
     2285+if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5
    21642286   (eval $ac_compile) 2>&5
    21652287   ac_status=$?
    21662288-  echo "$as_me:1854: \$? = $ac_status" >&5
    2167 +  echo "$as_me:1858: \$? = $ac_status" >&5
     2289+  echo "$as_me:1859: \$? = $ac_status" >&5
    21682290   (exit $ac_status); }; then
    21692291   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    … …  
    21742296        break;;
    21752297   esac
    2176 @@ -1863,24 +1867,24 @@
     2298@@ -1863,24 +1868,24 @@
    21772299 else
    21782300   echo "$as_me: failed program was:" >&5
    21792301 cat conftest.$ac_ext >&5
    21802302-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
    2181 +{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5
     2303+{ { echo "$as_me:1871: error: cannot compute OBJEXT: cannot compile" >&5
    21822304 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    21832305    { (exit 1); exit 1; }; }
    … …  
    21872309 fi
    21882310-echo "$as_me:1873: result: $ac_cv_objext" >&5
    2189 +echo "$as_me:1877: result: $ac_cv_objext" >&5
     2311+echo "$as_me:1878: result: $ac_cv_objext" >&5
    21902312 echo "${ECHO_T}$ac_cv_objext" >&6
    21912313 OBJEXT=$ac_cv_objext
    21922314 ac_objext=$OBJEXT
    21932315-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
    2194 +echo "$as_me:1881: checking whether we are using the GNU C compiler" >&5
     2316+echo "$as_me:1882: checking whether we are using the GNU C compiler" >&5
    21952317 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    21962318 if test "${ac_cv_c_compiler_gnu+set}" = set; then
    … …  
    21992321   cat >conftest.$ac_ext <<_ACEOF
    22002322-#line 1883 "configure"
    2201 +#line 1887 "configure"
     2323+#line 1888 "configure"
    22022324 #include "confdefs.h"
    22032325 
    22042326 int
    2205 @@ -1895,16 +1899,16 @@
     2327@@ -1895,16 +1900,16 @@
    22062328 }
    22072329 _ACEOF
    22082330 rm -f conftest.$ac_objext
    22092331-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
    2210 +if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5
     2332+if { (eval echo "$as_me:1903: \"$ac_compile\"") >&5
    22112333   (eval $ac_compile) 2>&5
    22122334   ac_status=$?
    22132335-  echo "$as_me:1901: \$? = $ac_status" >&5
    2214 +  echo "$as_me:1905: \$? = $ac_status" >&5
     2336+  echo "$as_me:1906: \$? = $ac_status" >&5
    22152337   (exit $ac_status); } &&
    22162338          { ac_try='test -s conftest.$ac_objext'
    22172339-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
    2218 +  { (eval echo "$as_me:1908: \"$ac_try\"") >&5
     2340+  { (eval echo "$as_me:1909: \"$ac_try\"") >&5
    22192341   (eval $ac_try) 2>&5
    22202342   ac_status=$?
    22212343-  echo "$as_me:1907: \$? = $ac_status" >&5
    2222 +  echo "$as_me:1911: \$? = $ac_status" >&5
     2344+  echo "$as_me:1912: \$? = $ac_status" >&5
    22232345   (exit $ac_status); }; }; then
    22242346   ac_compiler_gnu=yes
    22252347 else
    2226 @@ -1916,19 +1920,19 @@
     2348@@ -1916,19 +1921,19 @@
    22272349 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    22282350 
    22292351 fi
    22302352-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
    2231 +echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5
     2353+echo "$as_me:1924: result: $ac_cv_c_compiler_gnu" >&5
    22322354 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    22332355 GCC=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    22362358 CFLAGS="-g"
    22372359-echo "$as_me:1925: checking whether $CC accepts -g" >&5
    2238 +echo "$as_me:1929: checking whether $CC accepts -g" >&5
     2360+echo "$as_me:1930: checking whether $CC accepts -g" >&5
    22392361 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    22402362 if test "${ac_cv_prog_cc_g+set}" = set; then
    … …  
    22432365   cat >conftest.$ac_ext <<_ACEOF
    22442366-#line 1931 "configure"
    2245 +#line 1935 "configure"
     2367+#line 1936 "configure"
    22462368 #include "confdefs.h"
    22472369 
    22482370 int
    2249 @@ -1940,16 +1944,16 @@
     2371@@ -1940,16 +1945,16 @@
    22502372 }
    22512373 _ACEOF
    22522374 rm -f conftest.$ac_objext
    22532375-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
    2254 +if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5
     2376+if { (eval echo "$as_me:1948: \"$ac_compile\"") >&5
    22552377   (eval $ac_compile) 2>&5
    22562378   ac_status=$?
    22572379-  echo "$as_me:1946: \$? = $ac_status" >&5
    2258 +  echo "$as_me:1950: \$? = $ac_status" >&5
     2380+  echo "$as_me:1951: \$? = $ac_status" >&5
    22592381   (exit $ac_status); } &&
    22602382          { ac_try='test -s conftest.$ac_objext'
    22612383-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
    2262 +  { (eval echo "$as_me:1953: \"$ac_try\"") >&5
     2384+  { (eval echo "$as_me:1954: \"$ac_try\"") >&5
    22632385   (eval $ac_try) 2>&5
    22642386   ac_status=$?
    22652387-  echo "$as_me:1952: \$? = $ac_status" >&5
    2266 +  echo "$as_me:1956: \$? = $ac_status" >&5
     2388+  echo "$as_me:1957: \$? = $ac_status" >&5
    22672389   (exit $ac_status); }; }; then
    22682390   ac_cv_prog_cc_g=yes
    22692391 else
    2270 @@ -1959,7 +1963,7 @@
     2392@@ -1959,7 +1964,7 @@
    22712393 fi
    22722394 rm -f conftest.$ac_objext conftest.$ac_ext
    22732395 fi
    22742396-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
    2275 +echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5
     2397+echo "$as_me:1967: result: $ac_cv_prog_cc_g" >&5
    22762398 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    22772399 if test "$ac_test_CFLAGS" = set; then
    22782400   CFLAGS=$ac_save_CFLAGS
    2279 @@ -1986,16 +1990,16 @@
     2401@@ -1986,16 +1991,16 @@
    22802402 #endif
    22812403 _ACEOF
    22822404 rm -f conftest.$ac_objext
    22832405-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
    2284 +if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5
     2406+if { (eval echo "$as_me:1994: \"$ac_compile\"") >&5
    22852407   (eval $ac_compile) 2>&5
    22862408   ac_status=$?
    22872409-  echo "$as_me:1992: \$? = $ac_status" >&5
    2288 +  echo "$as_me:1996: \$? = $ac_status" >&5
     2410+  echo "$as_me:1997: \$? = $ac_status" >&5
    22892411   (exit $ac_status); } &&
    22902412          { ac_try='test -s conftest.$ac_objext'
    22912413-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
    2292 +  { (eval echo "$as_me:1999: \"$ac_try\"") >&5
     2414+  { (eval echo "$as_me:2000: \"$ac_try\"") >&5
    22932415   (eval $ac_try) 2>&5
    22942416   ac_status=$?
    22952417-  echo "$as_me:1998: \$? = $ac_status" >&5
    2296 +  echo "$as_me:2002: \$? = $ac_status" >&5
     2418+  echo "$as_me:2003: \$? = $ac_status" >&5
    22972419   (exit $ac_status); }; }; then
    22982420   for ac_declaration in \
    22992421    ''\
    2300 @@ -2007,7 +2011,7 @@
     2422@@ -2007,7 +2012,7 @@
    23012423    'void exit (int);'
    23022424 do
    23032425   cat >conftest.$ac_ext <<_ACEOF
    23042426-#line 2010 "configure"
    2305 +#line 2014 "configure"
     2427+#line 2015 "configure"
    23062428 #include "confdefs.h"
    23072429 #include <stdlib.h>
    23082430 $ac_declaration
    2309 @@ -2020,16 +2024,16 @@
     2431@@ -2020,16 +2025,16 @@
    23102432 }
    23112433 _ACEOF
    23122434 rm -f conftest.$ac_objext
    23132435-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
    2314 +if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5
     2436+if { (eval echo "$as_me:2028: \"$ac_compile\"") >&5
    23152437   (eval $ac_compile) 2>&5
    23162438   ac_status=$?
    23172439-  echo "$as_me:2026: \$? = $ac_status" >&5
    2318 +  echo "$as_me:2030: \$? = $ac_status" >&5
     2440+  echo "$as_me:2031: \$? = $ac_status" >&5
    23192441   (exit $ac_status); } &&
    23202442          { ac_try='test -s conftest.$ac_objext'
    23212443-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
    2322 +  { (eval echo "$as_me:2033: \"$ac_try\"") >&5
     2444+  { (eval echo "$as_me:2034: \"$ac_try\"") >&5
    23232445   (eval $ac_try) 2>&5
    23242446   ac_status=$?
    23252447-  echo "$as_me:2032: \$? = $ac_status" >&5
    2326 +  echo "$as_me:2036: \$? = $ac_status" >&5
     2448+  echo "$as_me:2037: \$? = $ac_status" >&5
    23272449   (exit $ac_status); }; }; then
    23282450   :
    23292451 else
    2330 @@ -2039,7 +2043,7 @@
     2452@@ -2039,7 +2044,7 @@
    23312453 fi
    23322454 rm -f conftest.$ac_objext conftest.$ac_ext
    23332455   cat >conftest.$ac_ext <<_ACEOF
    23342456-#line 2042 "configure"
    2335 +#line 2046 "configure"
     2457+#line 2047 "configure"
    23362458 #include "confdefs.h"
    23372459 $ac_declaration
    23382460 int
    2339 @@ -2051,16 +2055,16 @@
     2461@@ -2051,16 +2056,16 @@
    23402462 }
    23412463 _ACEOF
    23422464 rm -f conftest.$ac_objext
    23432465-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
    2344 +if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5
     2466+if { (eval echo "$as_me:2059: \"$ac_compile\"") >&5
    23452467   (eval $ac_compile) 2>&5
    23462468   ac_status=$?
    23472469-  echo "$as_me:2057: \$? = $ac_status" >&5
    2348 +  echo "$as_me:2061: \$? = $ac_status" >&5
     2470+  echo "$as_me:2062: \$? = $ac_status" >&5
    23492471   (exit $ac_status); } &&
    23502472          { ac_try='test -s conftest.$ac_objext'
    23512473-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
    2352 +  { (eval echo "$as_me:2064: \"$ac_try\"") >&5
     2474+  { (eval echo "$as_me:2065: \"$ac_try\"") >&5
    23532475   (eval $ac_try) 2>&5
    23542476   ac_status=$?
    23552477-  echo "$as_me:2063: \$? = $ac_status" >&5
    2356 +  echo "$as_me:2067: \$? = $ac_status" >&5
     2478+  echo "$as_me:2068: \$? = $ac_status" >&5
    23572479   (exit $ac_status); }; }; then
    23582480   break
    23592481 else
    2360 @@ -2090,11 +2094,11 @@
     2482@@ -2090,11 +2095,11 @@
    23612483 
    23622484 GCC_VERSION=none
    23632485 if test "$GCC" = yes ; then
    23642486-       echo "$as_me:2093: checking version of $CC" >&5
    2365 +       echo "$as_me:2097: checking version of $CC" >&5
     2487+       echo "$as_me:2098: checking version of $CC" >&5
    23662488 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    23672489        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    23682490        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    23692491-       echo "$as_me:2097: result: $GCC_VERSION" >&5
    2370 +       echo "$as_me:2101: result: $GCC_VERSION" >&5
     2492+       echo "$as_me:2102: result: $GCC_VERSION" >&5
    23712493 echo "${ECHO_T}$GCC_VERSION" >&6
    23722494 fi
    23732495 
    2374 @@ -2104,7 +2108,7 @@
     2496@@ -2104,7 +2109,7 @@
    23752497 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    23762498 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    23772499 ac_main_return=return
    23782500-echo "$as_me:2107: checking how to run the C preprocessor" >&5
    2379 +echo "$as_me:2111: checking how to run the C preprocessor" >&5
     2501+echo "$as_me:2112: checking how to run the C preprocessor" >&5
    23802502 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    23812503 # On Suns, sometimes $CPP names a directory.
    23822504 if test -n "$CPP" && test -d "$CPP"; then
    2383 @@ -2125,18 +2129,18 @@
     2505@@ -2125,18 +2130,18 @@
    23842506   # On the NeXT, cc -E runs the code through the compiler's parser,
    23852507   # not just through cpp. "Syntax error" is here to catch this case.
    23862508   cat >conftest.$ac_ext <<_ACEOF
    23872509-#line 2128 "configure"
    2388 +#line 2132 "configure"
     2510+#line 2133 "configure"
    23892511 #include "confdefs.h"
    23902512 #include <assert.h>
    … …  
    23922514 _ACEOF
    23932515-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
    2394 +if { (eval echo "$as_me:2137: \"$ac_cpp conftest.$ac_ext\"") >&5
     2516+if { (eval echo "$as_me:2138: \"$ac_cpp conftest.$ac_ext\"") >&5
    23952517   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    23962518   ac_status=$?
    … …  
    23992521   cat conftest.err >&5
    24002522-  echo "$as_me:2139: \$? = $ac_status" >&5
    2401 +  echo "$as_me:2143: \$? = $ac_status" >&5
     2523+  echo "$as_me:2144: \$? = $ac_status" >&5
    24022524   (exit $ac_status); } >/dev/null; then
    24032525   if test -s conftest.err; then
    24042526     ac_cpp_err=$ac_c_preproc_warn_flag
    2405 @@ -2159,17 +2163,17 @@
     2527@@ -2159,17 +2164,17 @@
    24062528   # OK, works on sane cases.  Now check whether non-existent headers
    24072529   # can be detected and how.
    24082530   cat >conftest.$ac_ext <<_ACEOF
    24092531-#line 2162 "configure"
    2410 +#line 2166 "configure"
     2532+#line 2167 "configure"
    24112533 #include "confdefs.h"
    24122534 #include <ac_nonexistent.h>
    24132535 _ACEOF
    24142536-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
    2415 +if { (eval echo "$as_me:2170: \"$ac_cpp conftest.$ac_ext\"") >&5
     2537+if { (eval echo "$as_me:2171: \"$ac_cpp conftest.$ac_ext\"") >&5
    24162538   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24172539   ac_status=$?
    … …  
    24202542   cat conftest.err >&5
    24212543-  echo "$as_me:2172: \$? = $ac_status" >&5
    2422 +  echo "$as_me:2176: \$? = $ac_status" >&5
     2544+  echo "$as_me:2177: \$? = $ac_status" >&5
    24232545   (exit $ac_status); } >/dev/null; then
    24242546   if test -s conftest.err; then
    24252547     ac_cpp_err=$ac_c_preproc_warn_flag
    2426 @@ -2206,7 +2210,7 @@
     2548@@ -2206,7 +2211,7 @@
    24272549 else
    24282550   ac_cv_prog_CPP=$CPP
    24292551 fi
    24302552-echo "$as_me:2209: result: $CPP" >&5
    2431 +echo "$as_me:2213: result: $CPP" >&5
     2553+echo "$as_me:2214: result: $CPP" >&5
    24322554 echo "${ECHO_T}$CPP" >&6
    24332555 ac_preproc_ok=false
    24342556 for ac_c_preproc_warn_flag in '' yes
    2435 @@ -2216,18 +2220,18 @@
     2557@@ -2216,18 +2221,18 @@
    24362558   # On the NeXT, cc -E runs the code through the compiler's parser,
    24372559   # not just through cpp. "Syntax error" is here to catch this case.
    24382560   cat >conftest.$ac_ext <<_ACEOF
    24392561-#line 2219 "configure"
    2440 +#line 2223 "configure"
     2562+#line 2224 "configure"
    24412563 #include "confdefs.h"
    24422564 #include <assert.h>
    … …  
    24442566 _ACEOF
    24452567-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
    2446 +if { (eval echo "$as_me:2228: \"$ac_cpp conftest.$ac_ext\"") >&5
     2568+if { (eval echo "$as_me:2229: \"$ac_cpp conftest.$ac_ext\"") >&5
    24472569   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24482570   ac_status=$?
    … …  
    24512573   cat conftest.err >&5
    24522574-  echo "$as_me:2230: \$? = $ac_status" >&5
    2453 +  echo "$as_me:2234: \$? = $ac_status" >&5
     2575+  echo "$as_me:2235: \$? = $ac_status" >&5
    24542576   (exit $ac_status); } >/dev/null; then
    24552577   if test -s conftest.err; then
    24562578     ac_cpp_err=$ac_c_preproc_warn_flag
    2457 @@ -2250,17 +2254,17 @@
     2579@@ -2250,17 +2255,17 @@
    24582580   # OK, works on sane cases.  Now check whether non-existent headers
    24592581   # can be detected and how.
    24602582   cat >conftest.$ac_ext <<_ACEOF
    24612583-#line 2253 "configure"
    2462 +#line 2257 "configure"
     2584+#line 2258 "configure"
    24632585 #include "confdefs.h"
    24642586 #include <ac_nonexistent.h>
    24652587 _ACEOF
    24662588-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
    2467 +if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5
     2589+if { (eval echo "$as_me:2262: \"$ac_cpp conftest.$ac_ext\"") >&5
    24682590   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24692591   ac_status=$?
    … …  
    24722594   cat conftest.err >&5
    24732595-  echo "$as_me:2263: \$? = $ac_status" >&5
    2474 +  echo "$as_me:2267: \$? = $ac_status" >&5
     2596+  echo "$as_me:2268: \$? = $ac_status" >&5
    24752597   (exit $ac_status); } >/dev/null; then
    24762598   if test -s conftest.err; then
    24772599     ac_cpp_err=$ac_c_preproc_warn_flag
    2478 @@ -2288,7 +2292,7 @@
     2600@@ -2288,7 +2293,7 @@
    24792601 if $ac_preproc_ok; then
    24802602   :
    24812603 else
    24822604-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
    2483 +  { { echo "$as_me:2295: error: C preprocessor \"$CPP\" fails sanity check" >&5
     2605+  { { echo "$as_me:2296: error: C preprocessor \"$CPP\" fails sanity check" >&5
    24842606 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    24852607    { (exit 1); exit 1; }; }
    24862608 fi
    2487 @@ -2301,14 +2305,14 @@
     2609@@ -2301,14 +2306,14 @@
    24882610 ac_main_return=return
    24892611 
    24902612 if test $ac_cv_c_compiler_gnu = yes; then
    24912613-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
    2492 +    echo "$as_me:2308: checking whether $CC needs -traditional" >&5
     2614+    echo "$as_me:2309: checking whether $CC needs -traditional" >&5
    24932615 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    24942616 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
    … …  
    24982620   cat >conftest.$ac_ext <<_ACEOF
    24992621-#line 2311 "configure"
    2500 +#line 2315 "configure"
     2622+#line 2316 "configure"
    25012623 #include "confdefs.h"
    25022624 #include <sgtty.h>
    25032625 int Autoconf = TIOCGETP;
    2504 @@ -2323,7 +2327,7 @@
     2626@@ -2323,7 +2328,7 @@
    25052627 
    25062628   if test $ac_cv_prog_gcc_traditional = no; then
    25072629     cat >conftest.$ac_ext <<_ACEOF
    25082630-#line 2326 "configure"
    2509 +#line 2330 "configure"
     2631+#line 2331 "configure"
    25102632 #include "confdefs.h"
    25112633 #include <termio.h>
    25122634 int Autoconf = TCGETA;
    2513 @@ -2336,14 +2340,14 @@
     2635@@ -2336,14 +2341,14 @@
    25142636 
    25152637   fi
    25162638 fi
    25172639-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
    2518 +echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5
     2640+echo "$as_me:2344: result: $ac_cv_prog_gcc_traditional" >&5
    25192641 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    25202642   if test $ac_cv_prog_gcc_traditional = yes; then
    … …  
    25242646 
    25252647-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
    2526 +echo "$as_me:2350: checking whether $CC understands -c and -o together" >&5
     2648+echo "$as_me:2351: checking whether $CC understands -c and -o together" >&5
    25272649 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    25282650 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    25292651   echo $ECHO_N "(cached) $ECHO_C" >&6
    2530 @@ -2359,15 +2363,15 @@
     2652@@ -2359,15 +2364,15 @@
    25312653 # We do the test twice because some compilers refuse to overwrite an
    25322654 # existing .o file with -o, though they will create one.
    25332655 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    25342656-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
    2535 +if { (eval echo "$as_me:2366: \"$ac_try\"") >&5
     2657+if { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    25362658   (eval $ac_try) 2>&5
    25372659   ac_status=$?
    25382660-  echo "$as_me:2365: \$? = $ac_status" >&5
    2539 +  echo "$as_me:2369: \$? = $ac_status" >&5
     2661+  echo "$as_me:2370: \$? = $ac_status" >&5
    25402662   (exit $ac_status); } &&
    25412663-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    2542 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:2371: \"$ac_try\"") >&5
     2664+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2372: \"$ac_try\"") >&5
    25432665   (eval $ac_try) 2>&5
    25442666   ac_status=$?
    25452667-  echo "$as_me:2370: \$? = $ac_status" >&5
    2546 +  echo "$as_me:2374: \$? = $ac_status" >&5
     2668+  echo "$as_me:2375: \$? = $ac_status" >&5
    25472669   (exit $ac_status); };
    25482670 then
    25492671   eval cf_cv_prog_CC_c_o=yes
    2550 @@ -2378,19 +2382,19 @@
     2672@@ -2378,19 +2383,19 @@
    25512673 
    25522674 fi
    25532675 if test $cf_cv_prog_CC_c_o = yes; then
    25542676-  echo "$as_me:2381: result: yes" >&5
    2555 +  echo "$as_me:2385: result: yes" >&5
     2677+  echo "$as_me:2386: result: yes" >&5
    25562678 echo "${ECHO_T}yes" >&6
    25572679 else
    25582680-  echo "$as_me:2384: result: no" >&5
    2559 +  echo "$as_me:2388: result: no" >&5
     2681+  echo "$as_me:2389: result: no" >&5
    25602682 echo "${ECHO_T}no" >&6
    25612683 fi
    25622684 
    25632685-echo "$as_me:2388: checking for POSIXized ISC" >&5
    2564 +echo "$as_me:2392: checking for POSIXized ISC" >&5
     2686+echo "$as_me:2393: checking for POSIXized ISC" >&5
    25652687 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    25662688 if test -d /etc/conf/kconfig.d &&
    … …  
    25682690 then
    25692691-  echo "$as_me:2393: result: yes" >&5
    2570 +  echo "$as_me:2397: result: yes" >&5
     2692+  echo "$as_me:2398: result: yes" >&5
    25712693 echo "${ECHO_T}yes" >&6
    25722694   ISC=yes # If later tests want to check for ISC.
    25732695 
    2574 @@ -2404,12 +2408,12 @@
     2696@@ -2404,12 +2409,12 @@
    25752697     CC="$CC -Xp"
    25762698   fi
    25772699 else
    25782700-  echo "$as_me:2407: result: no" >&5
    2579 +  echo "$as_me:2411: result: no" >&5
     2701+  echo "$as_me:2412: result: no" >&5
    25802702 echo "${ECHO_T}no" >&6
    25812703   ISC=
    … …  
    25832705 
    25842706-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
    2585 +echo "$as_me:2416: checking for ${CC-cc} option to accept ANSI C" >&5
     2707+echo "$as_me:2417: checking for ${CC-cc} option to accept ANSI C" >&5
    25862708 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
    25872709 if test "${cf_cv_ansi_cc+set}" = set; then
    25882710   echo $ECHO_N "(cached) $ECHO_C" >&6
    2589 @@ -2494,7 +2498,7 @@
     2711@@ -2494,7 +2499,7 @@
    25902712 
    25912713 if test -n "$cf_new_cppflags" ; then
    … …  
    25962718 
    25972719 if test -n "$cf_new_extra_cppflags" ; then
    2598 @@ -2503,7 +2507,7 @@
     2720@@ -2503,7 +2508,7 @@
    25992721 fi
    26002722 
    26012723        cat >conftest.$ac_ext <<_ACEOF
    26022724-#line 2506 "configure"
    2603 +#line 2510 "configure"
     2725+#line 2511 "configure"
    26042726 #include "confdefs.h"
    26052727 
    26062728 #ifndef CC_HAS_PROTOS
    2607 @@ -2524,16 +2528,16 @@
     2729@@ -2524,16 +2529,16 @@
    26082730 }
    26092731 _ACEOF
    26102732 rm -f conftest.$ac_objext
    26112733-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
    2612 +if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5
     2734+if { (eval echo "$as_me:2532: \"$ac_compile\"") >&5
    26132735   (eval $ac_compile) 2>&5
    26142736   ac_status=$?
    26152737-  echo "$as_me:2530: \$? = $ac_status" >&5
    2616 +  echo "$as_me:2534: \$? = $ac_status" >&5
     2738+  echo "$as_me:2535: \$? = $ac_status" >&5
    26172739   (exit $ac_status); } &&
    26182740          { ac_try='test -s conftest.$ac_objext'
    26192741-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
    2620 +  { (eval echo "$as_me:2537: \"$ac_try\"") >&5
     2742+  { (eval echo "$as_me:2538: \"$ac_try\"") >&5
    26212743   (eval $ac_try) 2>&5
    26222744   ac_status=$?
    26232745-  echo "$as_me:2536: \$? = $ac_status" >&5
    2624 +  echo "$as_me:2540: \$? = $ac_status" >&5
     2746+  echo "$as_me:2541: \$? = $ac_status" >&5
    26252747   (exit $ac_status); }; }; then
    26262748   cf_cv_ansi_cc="$cf_arg"; break
    26272749 else
    2628 @@ -2546,7 +2550,7 @@
     2750@@ -2546,7 +2551,7 @@
    26292751 CPPFLAGS="$cf_save_CPPFLAGS"
    26302752 
    26312753 fi
    26322754-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
    2633 +echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5
     2755+echo "$as_me:2554: result: $cf_cv_ansi_cc" >&5
    26342756 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    26352757 
    26362758 if test "$cf_cv_ansi_cc" != "no"; then
    2637 @@ -2612,7 +2616,7 @@
     2759@@ -2612,7 +2617,7 @@
    26382760 
    26392761 if test -n "$cf_new_cppflags" ; then
    … …  
    26442766 
    26452767 if test -n "$cf_new_extra_cppflags" ; then
    2646 @@ -2629,7 +2633,7 @@
     2768@@ -2629,7 +2634,7 @@
    26472769 fi
    26482770 
    26492771 if test "$cf_cv_ansi_cc" = "no"; then
    26502772-       { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
    2651 +       { { echo "$as_me:2636: error: Your compiler does not appear to recognize prototypes.
     2773+       { { echo "$as_me:2637: error: Your compiler does not appear to recognize prototypes.
    26522774 You have the following choices:
    26532775        a. adjust your compiler options
    26542776        b. get an up-to-date compiler
    2655 @@ -2663,13 +2667,13 @@
     2777@@ -2663,13 +2668,13 @@
    26562778   LDCONFIG=:
    26572779 else
    … …  
    26652787 set dummy ldconfig; ac_word=$2
    26662788-echo "$as_me:2672: checking for $ac_word" >&5
    2667 +echo "$as_me:2676: checking for $ac_word" >&5
     2789+echo "$as_me:2677: checking for $ac_word" >&5
    26682790 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26692791 if test "${ac_cv_path_LDCONFIG+set}" = set; then
    26702792   echo $ECHO_N "(cached) $ECHO_C" >&6
    2671 @@ -2686,7 +2690,7 @@
     2793@@ -2686,7 +2691,7 @@
    26722794   test -z "$ac_dir" && ac_dir=.
    26732795   if $as_executable_p "$ac_dir/$ac_word"; then
    26742796    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
    26752797-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
    2676 +   echo "$as_me:2693: found $ac_dir/$ac_word" >&5
     2798+   echo "$as_me:2694: found $ac_dir/$ac_word" >&5
    26772799    break
    26782800 fi
    26792801 done
    2680 @@ -2697,10 +2701,10 @@
     2802@@ -2697,10 +2702,10 @@
    26812803 LDCONFIG=$ac_cv_path_LDCONFIG
    26822804 
    26832805 if test -n "$LDCONFIG"; then
    26842806-  echo "$as_me:2700: result: $LDCONFIG" >&5
    2685 +  echo "$as_me:2704: result: $LDCONFIG" >&5
     2807+  echo "$as_me:2705: result: $LDCONFIG" >&5
    26862808 echo "${ECHO_T}$LDCONFIG" >&6
    26872809 else
    26882810-  echo "$as_me:2703: result: no" >&5
    2689 +  echo "$as_me:2707: result: no" >&5
     2811+  echo "$as_me:2708: result: no" >&5
    26902812 echo "${ECHO_T}no" >&6
    26912813 fi
    26922814 
    2693 @@ -2708,7 +2712,7 @@
     2815@@ -2708,7 +2713,7 @@
    26942816 esac
    26952817 fi
    26962818 
    26972819-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
    2698 +echo "$as_me:2715: checking if you want to ensure bool is consistent with C++" >&5
     2820+echo "$as_me:2716: checking if you want to ensure bool is consistent with C++" >&5
    26992821 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
    27002822 
    27012823 # Check whether --with-cxx or --without-cxx was given.
    2702 @@ -2718,7 +2722,7 @@
     2824@@ -2718,7 +2723,7 @@
    27032825 else
    27042826   cf_with_cxx=yes
    27052827 fi;
    27062828-echo "$as_me:2721: result: $cf_with_cxx" >&5
    2707 +echo "$as_me:2725: result: $cf_with_cxx" >&5
     2829+echo "$as_me:2726: result: $cf_with_cxx" >&5
    27082830 echo "${ECHO_T}$cf_with_cxx" >&6
    27092831 if test "X$cf_with_cxx" = Xno ; then
    27102832        CXX=""
    2711 @@ -2736,7 +2740,7 @@
     2833@@ -2736,7 +2741,7 @@
    27122834   do
    27132835     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    27142836 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    27152837-echo "$as_me:2739: checking for $ac_word" >&5
    2716 +echo "$as_me:2743: checking for $ac_word" >&5
     2838+echo "$as_me:2744: checking for $ac_word" >&5
    27172839 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27182840 if test "${ac_cv_prog_CXX+set}" = set; then
    27192841   echo $ECHO_N "(cached) $ECHO_C" >&6
    2720 @@ -2751,7 +2755,7 @@
     2842@@ -2751,7 +2756,7 @@
    27212843   test -z "$ac_dir" && ac_dir=.
    27222844   $as_executable_p "$ac_dir/$ac_word" || continue
    27232845 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    27242846-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
    2725 +echo "$as_me:2758: found $ac_dir/$ac_word" >&5
     2847+echo "$as_me:2759: found $ac_dir/$ac_word" >&5
    27262848 break
    27272849 done
    27282850 
    2729 @@ -2759,10 +2763,10 @@
     2851@@ -2759,10 +2764,10 @@
    27302852 fi
    27312853 CXX=$ac_cv_prog_CXX
    27322854 if test -n "$CXX"; then
    27332855-  echo "$as_me:2762: result: $CXX" >&5
    2734 +  echo "$as_me:2766: result: $CXX" >&5
     2856+  echo "$as_me:2767: result: $CXX" >&5
    27352857 echo "${ECHO_T}$CXX" >&6
    27362858 else
    27372859-  echo "$as_me:2765: result: no" >&5
    2738 +  echo "$as_me:2769: result: no" >&5
     2860+  echo "$as_me:2770: result: no" >&5
    27392861 echo "${ECHO_T}no" >&6
    27402862 fi
    27412863 
    2742 @@ -2775,7 +2779,7 @@
     2864@@ -2775,7 +2780,7 @@
    27432865 do
    27442866   # Extract the first word of "$ac_prog", so it can be a program name with args.
    27452867 set dummy $ac_prog; ac_word=$2
    27462868-echo "$as_me:2778: checking for $ac_word" >&5
    2747 +echo "$as_me:2782: checking for $ac_word" >&5
     2869+echo "$as_me:2783: checking for $ac_word" >&5
    27482870 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27492871 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    27502872   echo $ECHO_N "(cached) $ECHO_C" >&6
    2751 @@ -2790,7 +2794,7 @@
     2873@@ -2790,7 +2795,7 @@
    27522874   test -z "$ac_dir" && ac_dir=.
    27532875   $as_executable_p "$ac_dir/$ac_word" || continue
    27542876 ac_cv_prog_ac_ct_CXX="$ac_prog"
    27552877-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
    2756 +echo "$as_me:2797: found $ac_dir/$ac_word" >&5
     2878+echo "$as_me:2798: found $ac_dir/$ac_word" >&5
    27572879 break
    27582880 done
    27592881 
    2760 @@ -2798,10 +2802,10 @@
     2882@@ -2798,10 +2803,10 @@
    27612883 fi
    27622884 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
    27632885 if test -n "$ac_ct_CXX"; then
    27642886-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
    2765 +  echo "$as_me:2805: result: $ac_ct_CXX" >&5
     2887+  echo "$as_me:2806: result: $ac_ct_CXX" >&5
    27662888 echo "${ECHO_T}$ac_ct_CXX" >&6
    27672889 else
    27682890-  echo "$as_me:2804: result: no" >&5
    2769 +  echo "$as_me:2808: result: no" >&5
     2891+  echo "$as_me:2809: result: no" >&5
    27702892 echo "${ECHO_T}no" >&6
    27712893 fi
    27722894 
    2773 @@ -2813,32 +2817,32 @@
     2895@@ -2813,32 +2818,32 @@
    27742896 fi
    27752897 
    27762898 # Provide some information about the compiler.
    27772899-echo "$as_me:2816:" \
    2778 +echo "$as_me:2820:" \
     2900+echo "$as_me:2821:" \
    27792901      "checking for C++ compiler version" >&5
    27802902 ac_compiler=`set X $ac_compile; echo $2`
    27812903-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
    2782 +{ (eval echo "$as_me:2823: \"$ac_compiler --version </dev/null >&5\"") >&5
     2904+{ (eval echo "$as_me:2824: \"$ac_compiler --version </dev/null >&5\"") >&5
    27832905   (eval $ac_compiler --version </dev/null >&5) 2>&5
    27842906   ac_status=$?
    27852907-  echo "$as_me:2822: \$? = $ac_status" >&5
    2786 +  echo "$as_me:2826: \$? = $ac_status" >&5
     2908+  echo "$as_me:2827: \$? = $ac_status" >&5
    27872909   (exit $ac_status); }
    27882910-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
    2789 +{ (eval echo "$as_me:2828: \"$ac_compiler -v </dev/null >&5\"") >&5
     2911+{ (eval echo "$as_me:2829: \"$ac_compiler -v </dev/null >&5\"") >&5
    27902912   (eval $ac_compiler -v </dev/null >&5) 2>&5
    27912913   ac_status=$?
    27922914-  echo "$as_me:2827: \$? = $ac_status" >&5
    2793 +  echo "$as_me:2831: \$? = $ac_status" >&5
     2915+  echo "$as_me:2832: \$? = $ac_status" >&5
    27942916   (exit $ac_status); }
    27952917-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
    2796 +{ (eval echo "$as_me:2833: \"$ac_compiler -V </dev/null >&5\"") >&5
     2918+{ (eval echo "$as_me:2834: \"$ac_compiler -V </dev/null >&5\"") >&5
    27972919   (eval $ac_compiler -V </dev/null >&5) 2>&5
    27982920   ac_status=$?
    27992921-  echo "$as_me:2832: \$? = $ac_status" >&5
    2800 +  echo "$as_me:2836: \$? = $ac_status" >&5
     2922+  echo "$as_me:2837: \$? = $ac_status" >&5
    28012923   (exit $ac_status); }
    28022924 
    28032925-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
    2804 +echo "$as_me:2839: checking whether we are using the GNU C++ compiler" >&5
     2926+echo "$as_me:2840: checking whether we are using the GNU C++ compiler" >&5
    28052927 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
    28062928 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    … …  
    28092931   cat >conftest.$ac_ext <<_ACEOF
    28102932-#line 2841 "configure"
    2811 +#line 2845 "configure"
     2933+#line 2846 "configure"
    28122934 #include "confdefs.h"
    28132935 
    28142936 int
    2815 @@ -2853,16 +2857,16 @@
     2937@@ -2853,16 +2858,16 @@
    28162938 }
    28172939 _ACEOF
    28182940 rm -f conftest.$ac_objext
    28192941-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
    2820 +if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
     2942+if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
    28212943   (eval $ac_compile) 2>&5
    28222944   ac_status=$?
    28232945-  echo "$as_me:2859: \$? = $ac_status" >&5
    2824 +  echo "$as_me:2863: \$? = $ac_status" >&5
     2946+  echo "$as_me:2864: \$? = $ac_status" >&5
    28252947   (exit $ac_status); } &&
    28262948          { ac_try='test -s conftest.$ac_objext'
    28272949-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
    2828 +  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
     2950+  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
    28292951   (eval $ac_try) 2>&5
    28302952   ac_status=$?
    28312953-  echo "$as_me:2865: \$? = $ac_status" >&5
    2832 +  echo "$as_me:2869: \$? = $ac_status" >&5
     2954+  echo "$as_me:2870: \$? = $ac_status" >&5
    28332955   (exit $ac_status); }; }; then
    28342956   ac_compiler_gnu=yes
    28352957 else
    2836 @@ -2874,19 +2878,19 @@
     2958@@ -2874,19 +2879,19 @@
    28372959 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
    28382960 
    28392961 fi
    28402962-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
    2841 +echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5
     2963+echo "$as_me:2882: result: $ac_cv_cxx_compiler_gnu" >&5
    28422964 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
    28432965 GXX=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    28462968 CXXFLAGS="-g"
    28472969-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
    2848 +echo "$as_me:2887: checking whether $CXX accepts -g" >&5
     2970+echo "$as_me:2888: checking whether $CXX accepts -g" >&5
    28492971 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
    28502972 if test "${ac_cv_prog_cxx_g+set}" = set; then
    … …  
    28532975   cat >conftest.$ac_ext <<_ACEOF
    28542976-#line 2889 "configure"
    2855 +#line 2893 "configure"
     2977+#line 2894 "configure"
    28562978 #include "confdefs.h"
    28572979 
    28582980 int
    2859 @@ -2898,16 +2902,16 @@
     2981@@ -2898,16 +2903,16 @@
    28602982 }
    28612983 _ACEOF
    28622984 rm -f conftest.$ac_objext
    28632985-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
    2864 +if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5
     2986+if { (eval echo "$as_me:2906: \"$ac_compile\"") >&5
    28652987   (eval $ac_compile) 2>&5
    28662988   ac_status=$?
    28672989-  echo "$as_me:2904: \$? = $ac_status" >&5
    2868 +  echo "$as_me:2908: \$? = $ac_status" >&5
     2990+  echo "$as_me:2909: \$? = $ac_status" >&5
    28692991   (exit $ac_status); } &&
    28702992          { ac_try='test -s conftest.$ac_objext'
    28712993-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
    2872 +  { (eval echo "$as_me:2911: \"$ac_try\"") >&5
     2994+  { (eval echo "$as_me:2912: \"$ac_try\"") >&5
    28732995   (eval $ac_try) 2>&5
    28742996   ac_status=$?
    28752997-  echo "$as_me:2910: \$? = $ac_status" >&5
    2876 +  echo "$as_me:2914: \$? = $ac_status" >&5
     2998+  echo "$as_me:2915: \$? = $ac_status" >&5
    28772999   (exit $ac_status); }; }; then
    28783000   ac_cv_prog_cxx_g=yes
    28793001 else
    2880 @@ -2917,7 +2921,7 @@
     3002@@ -2917,7 +2922,7 @@
    28813003 fi
    28823004 rm -f conftest.$ac_objext conftest.$ac_ext
    28833005 fi
    28843006-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
    2885 +echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5
     3007+echo "$as_me:2925: result: $ac_cv_prog_cxx_g" >&5
    28863008 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
    28873009 if test "$ac_test_CXXFLAGS" = set; then
    28883010   CXXFLAGS=$ac_save_CXXFLAGS
    2889 @@ -2944,7 +2948,7 @@
     3011@@ -2944,7 +2949,7 @@
    28903012    'void exit (int);'
    28913013 do
    28923014   cat >conftest.$ac_ext <<_ACEOF
    28933015-#line 2947 "configure"
    2894 +#line 2951 "configure"
     3016+#line 2952 "configure"
    28953017 #include "confdefs.h"
    28963018 #include <stdlib.h>
    28973019 $ac_declaration
    2898 @@ -2957,16 +2961,16 @@
     3020@@ -2957,16 +2962,16 @@
    28993021 }
    29003022 _ACEOF
    29013023 rm -f conftest.$ac_objext
    29023024-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
    2903 +if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5
     3025+if { (eval echo "$as_me:2965: \"$ac_compile\"") >&5
    29043026   (eval $ac_compile) 2>&5
    29053027   ac_status=$?
    29063028-  echo "$as_me:2963: \$? = $ac_status" >&5
    2907 +  echo "$as_me:2967: \$? = $ac_status" >&5
     3029+  echo "$as_me:2968: \$? = $ac_status" >&5
    29083030   (exit $ac_status); } &&
    29093031          { ac_try='test -s conftest.$ac_objext'
    29103032-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
    2911 +  { (eval echo "$as_me:2970: \"$ac_try\"") >&5
     3033+  { (eval echo "$as_me:2971: \"$ac_try\"") >&5
    29123034   (eval $ac_try) 2>&5
    29133035   ac_status=$?
    29143036-  echo "$as_me:2969: \$? = $ac_status" >&5
    2915 +  echo "$as_me:2973: \$? = $ac_status" >&5
     3037+  echo "$as_me:2974: \$? = $ac_status" >&5
    29163038   (exit $ac_status); }; }; then
    29173039   :
    29183040 else
    2919 @@ -2976,7 +2980,7 @@
     3041@@ -2976,7 +2981,7 @@
    29203042 fi
    29213043 rm -f conftest.$ac_objext conftest.$ac_ext
    29223044   cat >conftest.$ac_ext <<_ACEOF
    29233045-#line 2979 "configure"
    2924 +#line 2983 "configure"
     3046+#line 2984 "configure"
    29253047 #include "confdefs.h"
    29263048 $ac_declaration
    29273049 int
    2928 @@ -2988,16 +2992,16 @@
     3050@@ -2988,16 +2993,16 @@
    29293051 }
    29303052 _ACEOF
    29313053 rm -f conftest.$ac_objext
    29323054-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
    2933 +if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
     3055+if { (eval echo "$as_me:2996: \"$ac_compile\"") >&5
    29343056   (eval $ac_compile) 2>&5
    29353057   ac_status=$?
    29363058-  echo "$as_me:2994: \$? = $ac_status" >&5
    2937 +  echo "$as_me:2998: \$? = $ac_status" >&5
     3059+  echo "$as_me:2999: \$? = $ac_status" >&5
    29383060   (exit $ac_status); } &&
    29393061          { ac_try='test -s conftest.$ac_objext'
    29403062-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
    2941 +  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
     3063+  { (eval echo "$as_me:3002: \"$ac_try\"") >&5
    29423064   (eval $ac_try) 2>&5
    29433065   ac_status=$?
    29443066-  echo "$as_me:3000: \$? = $ac_status" >&5
    2945 +  echo "$as_me:3004: \$? = $ac_status" >&5
     3067+  echo "$as_me:3005: \$? = $ac_status" >&5
    29463068   (exit $ac_status); }; }; then
    29473069   break
    29483070 else
    2949 @@ -3024,7 +3028,7 @@
     3071@@ -3024,7 +3029,7 @@
    29503072        if test "$CXX" = "g++" ; then
    29513073                # Extract the first word of "g++", so it can be a program name with args.
    29523074 set dummy g++; ac_word=$2
    29533075-echo "$as_me:3027: checking for $ac_word" >&5
    2954 +echo "$as_me:3031: checking for $ac_word" >&5
     3076+echo "$as_me:3032: checking for $ac_word" >&5
    29553077 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29563078 if test "${ac_cv_path_CXX+set}" = set; then
    29573079   echo $ECHO_N "(cached) $ECHO_C" >&6
    2958 @@ -3041,7 +3045,7 @@
     3080@@ -3041,7 +3046,7 @@
    29593081   test -z "$ac_dir" && ac_dir=.
    29603082   if $as_executable_p "$ac_dir/$ac_word"; then
    29613083    ac_cv_path_CXX="$ac_dir/$ac_word"
    29623084-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
    2963 +   echo "$as_me:3048: found $ac_dir/$ac_word" >&5
     3085+   echo "$as_me:3049: found $ac_dir/$ac_word" >&5
    29643086    break
    29653087 fi
    29663088 done
    2967 @@ -3052,16 +3056,16 @@
     3089@@ -3052,16 +3057,16 @@
    29683090 CXX=$ac_cv_path_CXX
    29693091 
    29703092 if test -n "$CXX"; then
    29713093-  echo "$as_me:3055: result: $CXX" >&5
    2972 +  echo "$as_me:3059: result: $CXX" >&5
     3094+  echo "$as_me:3060: result: $CXX" >&5
    29733095 echo "${ECHO_T}$CXX" >&6
    29743096 else
    29753097-  echo "$as_me:3058: result: no" >&5
    2976 +  echo "$as_me:3062: result: no" >&5
     3098+  echo "$as_me:3063: result: no" >&5
    29773099 echo "${ECHO_T}no" >&6
    29783100 fi
    … …  
    29813103        if test "$CXX" = "g++" ; then
    29823104-               { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
    2983 +               { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5
     3105+               { echo "$as_me:3069: WARNING: ignoring hardcoded g++" >&5
    29843106 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
    29853107                cf_with_cxx=no; CXX=""; GXX="";
    29863108        fi
    2987 @@ -3069,11 +3073,11 @@
     3109@@ -3069,11 +3074,11 @@
    29883110 
    29893111 GXX_VERSION=none
    29903112 if test "$GXX" = yes; then
    29913113-       echo "$as_me:3072: checking version of g++" >&5
    2992 +       echo "$as_me:3076: checking version of g++" >&5
     3114+       echo "$as_me:3077: checking version of g++" >&5
    29933115 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
    29943116        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    29953117        test -z "$GXX_VERSION" && GXX_VERSION=unknown
    29963118-       echo "$as_me:3076: result: $GXX_VERSION" >&5
    2997 +       echo "$as_me:3080: result: $GXX_VERSION" >&5
     3119+       echo "$as_me:3081: result: $GXX_VERSION" >&5
    29983120 echo "${ECHO_T}$GXX_VERSION" >&6
    29993121 fi
    30003122 
    3001 @@ -3081,12 +3085,12 @@
     3123@@ -3081,12 +3086,12 @@
    30023124 1*|2.[0-6]*)
    30033125        # GXX=""; CXX=""; ac_cv_prog_gxx=no
    30043126        # cf_cxx_library=no
    30053127-       { echo "$as_me:3084: WARNING: templates do not work" >&5
    3006 +       { echo "$as_me:3088: WARNING: templates do not work" >&5
     3128+       { echo "$as_me:3089: WARNING: templates do not work" >&5
    30073129 echo "$as_me: WARNING: templates do not work" >&2;}
    30083130        ;;
    … …  
    30103132 
    30113133-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
    3012 +echo "$as_me:3093: checking if you want to build C++ binding and demo" >&5
     3134+echo "$as_me:3094: checking if you want to build C++ binding and demo" >&5
    30133135 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
    30143136 
    30153137 # Check whether --with-cxx-binding or --without-cxx-binding was given.
    3016 @@ -3096,10 +3100,10 @@
     3138@@ -3096,10 +3101,10 @@
    30173139 else
    30183140   cf_with_cxx_binding=$cf_with_cxx
    30193141 fi;
    30203142-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
    3021 +echo "$as_me:3103: result: $cf_with_cxx_binding" >&5
     3143+echo "$as_me:3104: result: $cf_with_cxx_binding" >&5
    30223144 echo "${ECHO_T}$cf_with_cxx_binding" >&6
    30233145 
    30243146-echo "$as_me:3102: checking if you want to build with Ada95" >&5
    3025 +echo "$as_me:3106: checking if you want to build with Ada95" >&5
     3147+echo "$as_me:3107: checking if you want to build with Ada95" >&5
    30263148 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
    30273149 
    30283150 # Check whether --with-ada or --without-ada was given.
    3029 @@ -3109,10 +3113,23 @@
     3151@@ -3109,10 +3114,23 @@
    30303152 else
    30313153   cf_with_ada=yes
    30323154 fi;
    30333155-echo "$as_me:3112: result: $cf_with_ada" >&5
    3034 +echo "$as_me:3116: result: $cf_with_ada" >&5
     3156+echo "$as_me:3117: result: $cf_with_ada" >&5
    30353157 echo "${ECHO_T}$cf_with_ada" >&6
    30363158 
    30373159-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
    3038 +echo "$as_me:3119: checking if you want to install manpages" >&5
     3160+echo "$as_me:3120: checking if you want to install manpages" >&5
    30393161+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
    30403162+
    … …  
    30463168+  cf_with_manpages=yes
    30473169+fi;
    3048 +echo "$as_me:3129: result: $cf_with_manpages" >&5
     3170+echo "$as_me:3130: result: $cf_with_manpages" >&5
    30493171+echo "${ECHO_T}$cf_with_manpages" >&6
    30503172+
    3051 +echo "$as_me:3132: checking if you want to build programs such as tic" >&5
     3173+echo "$as_me:3133: checking if you want to build programs such as tic" >&5
    30523174 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
    30533175 
    30543176 # Check whether --with-progs or --without-progs was given.
    3055 @@ -3122,10 +3139,10 @@
     3177@@ -3122,10 +3140,10 @@
    30563178 else
    30573179   cf_with_progs=yes
    30583180 fi;
    30593181-echo "$as_me:3125: result: $cf_with_progs" >&5
    3060 +echo "$as_me:3142: result: $cf_with_progs" >&5
     3182+echo "$as_me:3143: result: $cf_with_progs" >&5
    30613183 echo "${ECHO_T}$cf_with_progs" >&6
    30623184 
    30633185-echo "$as_me:3128: checking if you wish to install curses.h" >&5
    3064 +echo "$as_me:3145: checking if you wish to install curses.h" >&5
     3186+echo "$as_me:3146: checking if you wish to install curses.h" >&5
    30653187 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
    30663188 
    30673189 # Check whether --with-curses-h or --without-curses-h was given.
    3068 @@ -3135,7 +3152,7 @@
     3190@@ -3135,7 +3153,7 @@
    30693191 else
    30703192   with_curses_h=yes
    30713193 fi;
    30723194-echo "$as_me:3138: result: $with_curses_h" >&5
    3073 +echo "$as_me:3155: result: $with_curses_h" >&5
     3195+echo "$as_me:3156: result: $with_curses_h" >&5
    30743196 echo "${ECHO_T}$with_curses_h" >&6
    30753197 
    30763198 modules_to_build="ncurses"
    3077 @@ -3161,7 +3178,7 @@
     3199@@ -3161,7 +3179,7 @@
    30783200 do
    30793201   # Extract the first word of "$ac_prog", so it can be a program name with args.
    30803202 set dummy $ac_prog; ac_word=$2
    30813203-echo "$as_me:3164: checking for $ac_word" >&5
    3082 +echo "$as_me:3181: checking for $ac_word" >&5
     3204+echo "$as_me:3182: checking for $ac_word" >&5
    30833205 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    30843206 if test "${ac_cv_prog_AWK+set}" = set; then
    30853207   echo $ECHO_N "(cached) $ECHO_C" >&6
    3086 @@ -3176,7 +3193,7 @@
     3208@@ -3176,7 +3194,7 @@
    30873209   test -z "$ac_dir" && ac_dir=.
    30883210   $as_executable_p "$ac_dir/$ac_word" || continue
    30893211 ac_cv_prog_AWK="$ac_prog"
    30903212-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    3091 +echo "$as_me:3196: found $ac_dir/$ac_word" >&5
     3213+echo "$as_me:3197: found $ac_dir/$ac_word" >&5
    30923214 break
    30933215 done
    30943216 
    3095 @@ -3184,21 +3201,21 @@
     3217@@ -3184,21 +3202,21 @@
    30963218 fi
    30973219 AWK=$ac_cv_prog_AWK
    30983220 if test -n "$AWK"; then
    30993221-  echo "$as_me:3187: result: $AWK" >&5
    3100 +  echo "$as_me:3204: result: $AWK" >&5
     3222+  echo "$as_me:3205: result: $AWK" >&5
    31013223 echo "${ECHO_T}$AWK" >&6
    31023224 else
    31033225-  echo "$as_me:3190: result: no" >&5
    3104 +  echo "$as_me:3207: result: no" >&5
     3226+  echo "$as_me:3208: result: no" >&5
    31053227 echo "${ECHO_T}no" >&6
    31063228 fi
    … …  
    31103232 
    31113233-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
    3112 +test -z "$AWK" && { { echo "$as_me:3214: error: No awk program found" >&5
     3234+test -z "$AWK" && { { echo "$as_me:3215: error: No awk program found" >&5
    31133235 echo "$as_me: error: No awk program found" >&2;}
    31143236    { (exit 1); exit 1; }; }
    31153237 
    31163238-echo "$as_me:3201: checking for egrep" >&5
    3117 +echo "$as_me:3218: checking for egrep" >&5
     3239+echo "$as_me:3219: checking for egrep" >&5
    31183240 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    31193241 if test "${ac_cv_prog_egrep+set}" = set; then
    31203242   echo $ECHO_N "(cached) $ECHO_C" >&6
    3121 @@ -3208,11 +3225,11 @@
     3243@@ -3208,11 +3226,11 @@
    31223244     else ac_cv_prog_egrep='egrep'
    31233245     fi
    31243246 fi
    31253247-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
    3126 +echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5
     3248+echo "$as_me:3229: result: $ac_cv_prog_egrep" >&5
    31273249 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    31283250  EGREP=$ac_cv_prog_egrep
    31293251 
    31303252-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
    3131 +test -z "$EGREP" && { { echo "$as_me:3232: error: No egrep program found" >&5
     3253+test -z "$EGREP" && { { echo "$as_me:3233: error: No egrep program found" >&5
    31323254 echo "$as_me: error: No egrep program found" >&2;}
    31333255    { (exit 1); exit 1; }; }
    31343256 
    3135 @@ -3228,7 +3245,7 @@
     3257@@ -3228,7 +3246,7 @@
    31363258 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    31373259 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    31383260 # ./install, which can be erroneously created by make from ./install.sh.
    31393261-echo "$as_me:3231: checking for a BSD compatible install" >&5
    3140 +echo "$as_me:3248: checking for a BSD compatible install" >&5
     3262+echo "$as_me:3249: checking for a BSD compatible install" >&5
    31413263 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    31423264 if test -z "$INSTALL"; then
    31433265 if test "${ac_cv_path_install+set}" = set; then
    3144 @@ -3277,7 +3294,7 @@
     3266@@ -3277,7 +3295,7 @@
    31453267     INSTALL=$ac_install_sh
    31463268   fi
    31473269 fi
    31483270-echo "$as_me:3280: result: $INSTALL" >&5
    3149 +echo "$as_me:3297: result: $INSTALL" >&5
     3271+echo "$as_me:3298: result: $INSTALL" >&5
    31503272 echo "${ECHO_T}$INSTALL" >&6
    31513273 
    31523274 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    3153 @@ -3302,7 +3319,7 @@
     3275@@ -3302,7 +3320,7 @@
    31543276 do
    31553277   # Extract the first word of "$ac_prog", so it can be a program name with args.
    31563278 set dummy $ac_prog; ac_word=$2
    31573279-echo "$as_me:3305: checking for $ac_word" >&5
    3158 +echo "$as_me:3322: checking for $ac_word" >&5
     3280+echo "$as_me:3323: checking for $ac_word" >&5
    31593281 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    31603282 if test "${ac_cv_prog_LINT+set}" = set; then
    31613283   echo $ECHO_N "(cached) $ECHO_C" >&6
    3162 @@ -3317,7 +3334,7 @@
     3284@@ -3317,7 +3335,7 @@
    31633285   test -z "$ac_dir" && ac_dir=.
    31643286   $as_executable_p "$ac_dir/$ac_word" || continue
    31653287 ac_cv_prog_LINT="$ac_prog"
    31663288-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
    3167 +echo "$as_me:3337: found $ac_dir/$ac_word" >&5
     3289+echo "$as_me:3338: found $ac_dir/$ac_word" >&5
    31683290 break
    31693291 done
    31703292 
    3171 @@ -3325,28 +3342,28 @@
     3293@@ -3325,28 +3343,28 @@
    31723294 fi
    31733295 LINT=$ac_cv_prog_LINT
    31743296 if test -n "$LINT"; then
    31753297-  echo "$as_me:3328: result: $LINT" >&5
    3176 +  echo "$as_me:3345: result: $LINT" >&5
     3298+  echo "$as_me:3346: result: $LINT" >&5
    31773299 echo "${ECHO_T}$LINT" >&6
    31783300 else
    31793301-  echo "$as_me:3331: result: no" >&5
    3180 +  echo "$as_me:3348: result: no" >&5
     3302+  echo "$as_me:3349: result: no" >&5
    31813303 echo "${ECHO_T}no" >&6
    31823304 fi
    … …  
    31863308 
    31873309-echo "$as_me:3338: checking whether ln -s works" >&5
    3188 +echo "$as_me:3355: checking whether ln -s works" >&5
     3310+echo "$as_me:3356: checking whether ln -s works" >&5
    31893311 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    31903312 LN_S=$as_ln_s
    31913313 if test "$LN_S" = "ln -s"; then
    31923314-  echo "$as_me:3342: result: yes" >&5
    3193 +  echo "$as_me:3359: result: yes" >&5
     3315+  echo "$as_me:3360: result: yes" >&5
    31943316 echo "${ECHO_T}yes" >&6
    31953317 else
    31963318-  echo "$as_me:3345: result: no, using $LN_S" >&5
    3197 +  echo "$as_me:3362: result: no, using $LN_S" >&5
     3319+  echo "$as_me:3363: result: no, using $LN_S" >&5
    31983320 echo "${ECHO_T}no, using $LN_S" >&6
    31993321 fi
    32003322 
    32013323-echo "$as_me:3349: checking for long file names" >&5
    3202 +echo "$as_me:3366: checking for long file names" >&5
     3324+echo "$as_me:3367: checking for long file names" >&5
    32033325 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    32043326 if test "${ac_cv_sys_long_file_names+set}" = set; then
    32053327   echo $ECHO_N "(cached) $ECHO_C" >&6
    3206 @@ -3385,7 +3402,7 @@
     3328@@ -3385,7 +3403,7 @@
    32073329   rm -rf $ac_xdir 2>/dev/null
    32083330 done
    32093331 fi
    32103332-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
    3211 +echo "$as_me:3405: result: $ac_cv_sys_long_file_names" >&5
     3333+echo "$as_me:3406: result: $ac_cv_sys_long_file_names" >&5
    32123334 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    32133335 if test $ac_cv_sys_long_file_names = yes; then
    32143336 
    3215 @@ -3395,7 +3412,136 @@
     3337@@ -3395,7 +3413,136 @@
    32163338 
    32173339 fi
    … …  
    32203342+# if we find pkg-config, check if we should install the ".pc" files.
    32213343+
    3222 +echo "$as_me:3417: checking if you want to use pkg-config" >&5
     3344+echo "$as_me:3418: checking if you want to use pkg-config" >&5
    32233345+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
    32243346+
    … …  
    32303352+  cf_pkg_config=yes
    32313353+fi;
    3232 +echo "$as_me:3427: result: $cf_pkg_config" >&5
     3354+echo "$as_me:3428: result: $cf_pkg_config" >&5
    32333355+echo "${ECHO_T}$cf_pkg_config" >&6
    32343356+
    … …  
    32403362+       # Extract the first word of "pkg-config", so it can be a program name with args.
    32413363+set dummy pkg-config; ac_word=$2
    3242 +echo "$as_me:3437: checking for $ac_word" >&5
     3364+echo "$as_me:3438: checking for $ac_word" >&5
    32433365+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    32443366+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    … …  
    32573379+  if $as_executable_p "$ac_dir/$ac_word"; then
    32583380+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    3259 +   echo "$as_me:3454: found $ac_dir/$ac_word" >&5
     3381+   echo "$as_me:3455: found $ac_dir/$ac_word" >&5
    32603382+   break
    32613383+fi
    … …  
    32693391+
    32703392+if test -n "$PKG_CONFIG"; then
    3271 +  echo "$as_me:3466: result: $PKG_CONFIG" >&5
     3393+  echo "$as_me:3467: result: $PKG_CONFIG" >&5
    32723394+echo "${ECHO_T}$PKG_CONFIG" >&6
    32733395+else
    3274 +  echo "$as_me:3469: result: no" >&5
     3396+  echo "$as_me:3470: result: no" >&5
    32753397+echo "${ECHO_T}no" >&6
    32763398+fi
    … …  
    33103432+  ;;
    33113433+*)
    3312 +  { { echo "$as_me:3507: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     3434+  { { echo "$as_me:3508: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    33133435+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    33143436+   { (exit 1); exit 1; }; }
    … …  
    33193441+
    33203442+if test "$PKG_CONFIG" != no ; then
    3321 +       echo "$as_me:3516: checking if we should install .pc files for $PKG_CONFIG" >&5
     3443+       echo "$as_me:3517: checking if we should install .pc files for $PKG_CONFIG" >&5
    33223444+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    33233445+
    … …  
    33363458+  enable_pc_files=no
    33373459+fi;
    3338 +               echo "$as_me:3533: result: $enable_pc_files" >&5
     3460+               echo "$as_me:3534: result: $enable_pc_files" >&5
    33393461+echo "${ECHO_T}$enable_pc_files" >&6
    33403462+       else
    3341 +               echo "$as_me:3536: result: no" >&5
     3463+               echo "$as_me:3537: result: no" >&5
    33423464+echo "${ECHO_T}no" >&6
    3343 +               { echo "$as_me:3538: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
     3465+               { echo "$as_me:3539: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
    33443466+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
    33453467+               enable_pc_files=no
    … …  
    33473469+fi
    33483470+
    3349 +echo "$as_me:3544: checking if we should assume mixed-case filenames" >&5
     3471+echo "$as_me:3545: checking if we should assume mixed-case filenames" >&5
    33503472 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    33513473 
    33523474 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    3353 @@ -3405,11 +3551,11 @@
     3475@@ -3405,11 +3552,11 @@
    33543476 else
    33553477   enable_mixedcase=auto
    33563478 fi;
    33573479-echo "$as_me:3408: result: $enable_mixedcase" >&5
    3358 +echo "$as_me:3554: result: $enable_mixedcase" >&5
     3480+echo "$as_me:3555: result: $enable_mixedcase" >&5
    33593481 echo "${ECHO_T}$enable_mixedcase" >&6
    33603482 if test "$enable_mixedcase" = "auto" ; then
    33613483 
    33623484-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
    3363 +echo "$as_me:3558: checking if filesystem supports mixed-case filenames" >&5
     3485+echo "$as_me:3559: checking if filesystem supports mixed-case filenames" >&5
    33643486 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    33653487 if test "${cf_cv_mixedcase+set}" = set; then
    33663488   echo $ECHO_N "(cached) $ECHO_C" >&6
    3367 @@ -3436,7 +3582,7 @@
     3489@@ -3436,7 +3583,7 @@
    33683490 fi
    33693491 
    33703492 fi
    33713493-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
    3372 +echo "$as_me:3585: result: $cf_cv_mixedcase" >&5
     3494+echo "$as_me:3586: result: $cf_cv_mixedcase" >&5
    33733495 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    33743496 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    33753497 #define MIXEDCASE_FILENAMES 1
    3376 @@ -3453,7 +3599,7 @@
     3498@@ -3453,7 +3600,7 @@
    33773499 fi
    33783500 
    33793501 # do this after mixed-case option (tags/TAGS is not as important as tic).
    33803502-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3381 +echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5
     3503+echo "$as_me:3603: checking whether ${MAKE-make} sets \${MAKE}" >&5
    33823504 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    33833505 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    33843506 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    3385 @@ -3473,18 +3619,18 @@
     3507@@ -3473,18 +3620,18 @@
    33863508 rm -f conftest.make
    33873509 fi
    33883510 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    33893511-  echo "$as_me:3476: result: yes" >&5
    3390 +  echo "$as_me:3622: result: yes" >&5
     3512+  echo "$as_me:3623: result: yes" >&5
    33913513 echo "${ECHO_T}yes" >&6
    33923514   SET_MAKE=
    33933515 else
    33943516-  echo "$as_me:3480: result: no" >&5
    3395 +  echo "$as_me:3626: result: no" >&5
     3517+  echo "$as_me:3627: result: no" >&5
    33963518 echo "${ECHO_T}no" >&6
    33973519   SET_MAKE="MAKE=${MAKE-make}"
    … …  
    34013523 set dummy ctags; ac_word=$2
    34023524-echo "$as_me:3487: checking for $ac_word" >&5
    3403 +echo "$as_me:3633: checking for $ac_word" >&5
     3525+echo "$as_me:3634: checking for $ac_word" >&5
    34043526 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34053527 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    34063528   echo $ECHO_N "(cached) $ECHO_C" >&6
    3407 @@ -3499,7 +3645,7 @@
     3529@@ -3499,7 +3646,7 @@
    34083530   test -z "$ac_dir" && ac_dir=.
    34093531   $as_executable_p "$ac_dir/$ac_word" || continue
    34103532 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    34113533-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
    3412 +echo "$as_me:3648: found $ac_dir/$ac_word" >&5
     3534+echo "$as_me:3649: found $ac_dir/$ac_word" >&5
    34133535 break
    34143536 done
    34153537 
    3416 @@ -3508,17 +3654,17 @@
     3538@@ -3508,17 +3655,17 @@
    34173539 fi
    34183540 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    34193541 if test -n "$MAKE_LOWER_TAGS"; then
    34203542-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
    3421 +  echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5
     3543+  echo "$as_me:3658: result: $MAKE_LOWER_TAGS" >&5
    34223544 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    34233545 else
    34243546-  echo "$as_me:3514: result: no" >&5
    3425 +  echo "$as_me:3660: result: no" >&5
     3547+  echo "$as_me:3661: result: no" >&5
    34263548 echo "${ECHO_T}no" >&6
    34273549 fi
    … …  
    34313553 set dummy etags; ac_word=$2
    34323554-echo "$as_me:3521: checking for $ac_word" >&5
    3433 +echo "$as_me:3667: checking for $ac_word" >&5
     3555+echo "$as_me:3668: checking for $ac_word" >&5
    34343556 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34353557 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    34363558   echo $ECHO_N "(cached) $ECHO_C" >&6
    3437 @@ -3533,7 +3679,7 @@
     3559@@ -3533,7 +3680,7 @@
    34383560   test -z "$ac_dir" && ac_dir=.
    34393561   $as_executable_p "$ac_dir/$ac_word" || continue
    34403562 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    34413563-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
    3442 +echo "$as_me:3682: found $ac_dir/$ac_word" >&5
     3564+echo "$as_me:3683: found $ac_dir/$ac_word" >&5
    34433565 break
    34443566 done
    34453567 
    3446 @@ -3542,10 +3688,10 @@
     3568@@ -3542,10 +3689,10 @@
    34473569 fi
    34483570 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    34493571 if test -n "$MAKE_UPPER_TAGS"; then
    34503572-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
    3451 +  echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5
     3573+  echo "$as_me:3692: result: $MAKE_UPPER_TAGS" >&5
    34523574 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    34533575 else
    34543576-  echo "$as_me:3548: result: no" >&5
    3455 +  echo "$as_me:3694: result: no" >&5
     3577+  echo "$as_me:3695: result: no" >&5
    34563578 echo "${ECHO_T}no" >&6
    34573579 fi
    34583580 
    3459 @@ -3565,7 +3711,7 @@
     3581@@ -3565,7 +3712,7 @@
    34603582        MAKE_LOWER_TAGS="#"
    34613583 fi
    34623584 
    34633585-echo "$as_me:3568: checking for makeflags variable" >&5
    3464 +echo "$as_me:3714: checking for makeflags variable" >&5
     3586+echo "$as_me:3715: checking for makeflags variable" >&5
    34653587 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    34663588 if test "${cf_cv_makeflags+set}" = set; then
    34673589   echo $ECHO_N "(cached) $ECHO_C" >&6
    3468 @@ -3599,13 +3745,13 @@
     3590@@ -3599,13 +3746,13 @@
    34693591        rm -f cf_makeflags.tmp
    34703592 
    34713593 fi
    34723594-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
    3473 +echo "$as_me:3748: result: $cf_cv_makeflags" >&5
     3595+echo "$as_me:3749: result: $cf_cv_makeflags" >&5
    34743596 echo "${ECHO_T}$cf_cv_makeflags" >&6
    34753597 
    … …  
    34783600 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    34793601-echo "$as_me:3608: checking for $ac_word" >&5
    3480 +echo "$as_me:3754: checking for $ac_word" >&5
     3602+echo "$as_me:3755: checking for $ac_word" >&5
    34813603 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34823604 if test "${ac_cv_prog_RANLIB+set}" = set; then
    34833605   echo $ECHO_N "(cached) $ECHO_C" >&6
    3484 @@ -3620,7 +3766,7 @@
     3606@@ -3620,7 +3767,7 @@
    34853607   test -z "$ac_dir" && ac_dir=.
    34863608   $as_executable_p "$ac_dir/$ac_word" || continue
    34873609 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    34883610-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    3489 +echo "$as_me:3769: found $ac_dir/$ac_word" >&5
     3611+echo "$as_me:3770: found $ac_dir/$ac_word" >&5
    34903612 break
    34913613 done
    34923614 
    3493 @@ -3628,10 +3774,10 @@
     3615@@ -3628,10 +3775,10 @@
    34943616 fi
    34953617 RANLIB=$ac_cv_prog_RANLIB
    34963618 if test -n "$RANLIB"; then
    34973619-  echo "$as_me:3631: result: $RANLIB" >&5
    3498 +  echo "$as_me:3777: result: $RANLIB" >&5
     3620+  echo "$as_me:3778: result: $RANLIB" >&5
    34993621 echo "${ECHO_T}$RANLIB" >&6
    35003622 else
    35013623-  echo "$as_me:3634: result: no" >&5
    3502 +  echo "$as_me:3780: result: no" >&5
     3624+  echo "$as_me:3781: result: no" >&5
    35033625 echo "${ECHO_T}no" >&6
    35043626 fi
    35053627 
    3506 @@ -3640,7 +3786,7 @@
     3628@@ -3640,7 +3787,7 @@
    35073629   ac_ct_RANLIB=$RANLIB
    35083630   # Extract the first word of "ranlib", so it can be a program name with args.
    35093631 set dummy ranlib; ac_word=$2
    35103632-echo "$as_me:3643: checking for $ac_word" >&5
    3511 +echo "$as_me:3789: checking for $ac_word" >&5
     3633+echo "$as_me:3790: checking for $ac_word" >&5
    35123634 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35133635 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    35143636   echo $ECHO_N "(cached) $ECHO_C" >&6
    3515 @@ -3655,7 +3801,7 @@
     3637@@ -3655,7 +3802,7 @@
    35163638   test -z "$ac_dir" && ac_dir=.
    35173639   $as_executable_p "$ac_dir/$ac_word" || continue
    35183640 ac_cv_prog_ac_ct_RANLIB="ranlib"
    35193641-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
    3520 +echo "$as_me:3804: found $ac_dir/$ac_word" >&5
     3642+echo "$as_me:3805: found $ac_dir/$ac_word" >&5
    35213643 break
    35223644 done
    35233645 
    3524 @@ -3664,10 +3810,10 @@
     3646@@ -3664,10 +3811,10 @@
    35253647 fi
    35263648 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    35273649 if test -n "$ac_ct_RANLIB"; then
    35283650-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
    3529 +  echo "$as_me:3813: result: $ac_ct_RANLIB" >&5
     3651+  echo "$as_me:3814: result: $ac_ct_RANLIB" >&5
    35303652 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    35313653 else
    35323654-  echo "$as_me:3670: result: no" >&5
    3533 +  echo "$as_me:3816: result: no" >&5
     3655+  echo "$as_me:3817: result: no" >&5
    35343656 echo "${ECHO_T}no" >&6
    35353657 fi
    35363658 
    3537 @@ -3679,7 +3825,7 @@
     3659@@ -3679,7 +3826,7 @@
    35383660 if test -n "$ac_tool_prefix"; then
    35393661   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    35403662 set dummy ${ac_tool_prefix}ld; ac_word=$2
    35413663-echo "$as_me:3682: checking for $ac_word" >&5
    3542 +echo "$as_me:3828: checking for $ac_word" >&5
     3664+echo "$as_me:3829: checking for $ac_word" >&5
    35433665 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35443666 if test "${ac_cv_prog_LD+set}" = set; then
    35453667   echo $ECHO_N "(cached) $ECHO_C" >&6
    3546 @@ -3694,7 +3840,7 @@
     3668@@ -3694,7 +3841,7 @@
    35473669   test -z "$ac_dir" && ac_dir=.
    35483670   $as_executable_p "$ac_dir/$ac_word" || continue
    35493671 ac_cv_prog_LD="${ac_tool_prefix}ld"
    35503672-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
    3551 +echo "$as_me:3843: found $ac_dir/$ac_word" >&5
     3673+echo "$as_me:3844: found $ac_dir/$ac_word" >&5
    35523674 break
    35533675 done
    35543676 
    3555 @@ -3702,10 +3848,10 @@
     3677@@ -3702,10 +3849,10 @@
    35563678 fi
    35573679 LD=$ac_cv_prog_LD
    35583680 if test -n "$LD"; then
    35593681-  echo "$as_me:3705: result: $LD" >&5
    3560 +  echo "$as_me:3851: result: $LD" >&5
     3682+  echo "$as_me:3852: result: $LD" >&5
    35613683 echo "${ECHO_T}$LD" >&6
    35623684 else
    35633685-  echo "$as_me:3708: result: no" >&5
    3564 +  echo "$as_me:3854: result: no" >&5
     3686+  echo "$as_me:3855: result: no" >&5
    35653687 echo "${ECHO_T}no" >&6
    35663688 fi
    35673689 
    3568 @@ -3714,7 +3860,7 @@
     3690@@ -3714,7 +3861,7 @@
    35693691   ac_ct_LD=$LD
    35703692   # Extract the first word of "ld", so it can be a program name with args.
    35713693 set dummy ld; ac_word=$2
    35723694-echo "$as_me:3717: checking for $ac_word" >&5
    3573 +echo "$as_me:3863: checking for $ac_word" >&5
     3695+echo "$as_me:3864: checking for $ac_word" >&5
    35743696 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35753697 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    35763698   echo $ECHO_N "(cached) $ECHO_C" >&6
    3577 @@ -3729,7 +3875,7 @@
     3699@@ -3729,7 +3876,7 @@
    35783700   test -z "$ac_dir" && ac_dir=.
    35793701   $as_executable_p "$ac_dir/$ac_word" || continue
    35803702 ac_cv_prog_ac_ct_LD="ld"
    35813703-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
    3582 +echo "$as_me:3878: found $ac_dir/$ac_word" >&5
     3704+echo "$as_me:3879: found $ac_dir/$ac_word" >&5
    35833705 break
    35843706 done
    35853707 
    3586 @@ -3738,10 +3884,10 @@
     3708@@ -3738,10 +3885,10 @@
    35873709 fi
    35883710 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    35893711 if test -n "$ac_ct_LD"; then
    35903712-  echo "$as_me:3741: result: $ac_ct_LD" >&5
    3591 +  echo "$as_me:3887: result: $ac_ct_LD" >&5
     3713+  echo "$as_me:3888: result: $ac_ct_LD" >&5
    35923714 echo "${ECHO_T}$ac_ct_LD" >&6
    35933715 else
    35943716-  echo "$as_me:3744: result: no" >&5
    3595 +  echo "$as_me:3890: result: no" >&5
     3717+  echo "$as_me:3891: result: no" >&5
    35963718 echo "${ECHO_T}no" >&6
    35973719 fi
    35983720 
    3599 @@ -3753,7 +3899,7 @@
     3721@@ -3753,7 +3900,7 @@
    36003722 if test -n "$ac_tool_prefix"; then
    36013723   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    36023724 set dummy ${ac_tool_prefix}ar; ac_word=$2
    36033725-echo "$as_me:3756: checking for $ac_word" >&5
    3604 +echo "$as_me:3902: checking for $ac_word" >&5
     3726+echo "$as_me:3903: checking for $ac_word" >&5
    36053727 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36063728 if test "${ac_cv_prog_AR+set}" = set; then
    36073729   echo $ECHO_N "(cached) $ECHO_C" >&6
    3608 @@ -3768,7 +3914,7 @@
     3730@@ -3768,7 +3915,7 @@
    36093731   test -z "$ac_dir" && ac_dir=.
    36103732   $as_executable_p "$ac_dir/$ac_word" || continue
    36113733 ac_cv_prog_AR="${ac_tool_prefix}ar"
    36123734-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
    3613 +echo "$as_me:3917: found $ac_dir/$ac_word" >&5
     3735+echo "$as_me:3918: found $ac_dir/$ac_word" >&5
    36143736 break
    36153737 done
    36163738 
    3617 @@ -3776,10 +3922,10 @@
     3739@@ -3776,10 +3923,10 @@
    36183740 fi
    36193741 AR=$ac_cv_prog_AR
    36203742 if test -n "$AR"; then
    36213743-  echo "$as_me:3779: result: $AR" >&5
    3622 +  echo "$as_me:3925: result: $AR" >&5
     3744+  echo "$as_me:3926: result: $AR" >&5
    36233745 echo "${ECHO_T}$AR" >&6
    36243746 else
    36253747-  echo "$as_me:3782: result: no" >&5
    3626 +  echo "$as_me:3928: result: no" >&5
     3748+  echo "$as_me:3929: result: no" >&5
    36273749 echo "${ECHO_T}no" >&6
    36283750 fi
    36293751 
    3630 @@ -3788,7 +3934,7 @@
     3752@@ -3788,7 +3935,7 @@
    36313753   ac_ct_AR=$AR
    36323754   # Extract the first word of "ar", so it can be a program name with args.
    36333755 set dummy ar; ac_word=$2
    36343756-echo "$as_me:3791: checking for $ac_word" >&5
    3635 +echo "$as_me:3937: checking for $ac_word" >&5
     3757+echo "$as_me:3938: checking for $ac_word" >&5
    36363758 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36373759 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    36383760   echo $ECHO_N "(cached) $ECHO_C" >&6
    3639 @@ -3803,7 +3949,7 @@
     3761@@ -3803,7 +3950,7 @@
    36403762   test -z "$ac_dir" && ac_dir=.
    36413763   $as_executable_p "$ac_dir/$ac_word" || continue
    36423764 ac_cv_prog_ac_ct_AR="ar"
    36433765-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
    3644 +echo "$as_me:3952: found $ac_dir/$ac_word" >&5
     3766+echo "$as_me:3953: found $ac_dir/$ac_word" >&5
    36453767 break
    36463768 done
    36473769 
    3648 @@ -3812,10 +3958,10 @@
     3770@@ -3812,10 +3959,10 @@
    36493771 fi
    36503772 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    36513773 if test -n "$ac_ct_AR"; then
    36523774-  echo "$as_me:3815: result: $ac_ct_AR" >&5
    3653 +  echo "$as_me:3961: result: $ac_ct_AR" >&5
     3775+  echo "$as_me:3962: result: $ac_ct_AR" >&5
    36543776 echo "${ECHO_T}$ac_ct_AR" >&6
    36553777 else
    36563778-  echo "$as_me:3818: result: no" >&5
    3657 +  echo "$as_me:3964: result: no" >&5
     3779+  echo "$as_me:3965: result: no" >&5
    36583780 echo "${ECHO_T}no" >&6
    36593781 fi
    36603782 
    3661 @@ -3824,25 +3970,123 @@
     3783@@ -3824,25 +3971,123 @@
    36623784   AR="$ac_cv_prog_AR"
    36633785 fi
    … …  
    36673789+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    36683790+set dummy ${ac_tool_prefix}ar; ac_word=$2
    3669 +echo "$as_me:3976: checking for $ac_word" >&5
     3791+echo "$as_me:3977: checking for $ac_word" >&5
    36703792+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36713793+if test "${ac_cv_prog_AR+set}" = set; then
    … …  
    36823804+  $as_executable_p "$ac_dir/$ac_word" || continue
    36833805+ac_cv_prog_AR="${ac_tool_prefix}ar"
    3684 +echo "$as_me:3991: found $ac_dir/$ac_word" >&5
     3806+echo "$as_me:3992: found $ac_dir/$ac_word" >&5
    36853807+break
    36863808+done
    … …  
    36923814+AR=$ac_cv_prog_AR
    36933815+if test -n "$AR"; then
    3694 +  echo "$as_me:3999: result: $AR" >&5
     3816+  echo "$as_me:4000: result: $AR" >&5
    36953817+echo "${ECHO_T}$AR" >&6
    36963818+else
    3697 +  echo "$as_me:4002: result: no" >&5
     3819+  echo "$as_me:4003: result: no" >&5
    36983820+echo "${ECHO_T}no" >&6
    36993821+fi
    3700  
    3701 -if test -z "$AR_OPTS" ; then
    3702 -       AR_OPTS=rv
     3822+
    37033823+fi
    37043824+if test -z "$ac_cv_prog_AR"; then
    … …  
    37063826+  # Extract the first word of "ar", so it can be a program name with args.
    37073827+set dummy ar; ac_word=$2
    3708 +echo "$as_me:4011: checking for $ac_word" >&5
     3828+echo "$as_me:4012: checking for $ac_word" >&5
    37093829+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    37103830+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    … …  
    37213841+  $as_executable_p "$ac_dir/$ac_word" || continue
    37223842+ac_cv_prog_ac_ct_AR="ar"
    3723 +echo "$as_me:4026: found $ac_dir/$ac_word" >&5
     3843+echo "$as_me:4027: found $ac_dir/$ac_word" >&5
    37243844+break
    37253845+done
    37263846 
     3847-if test -z "$AR_OPTS" ; then
     3848-       AR_OPTS=rv
    37273849+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
    37283850+fi
    3729  fi
     3851+fi
    37303852+ac_ct_AR=$ac_cv_prog_ac_ct_AR
    37313853+if test -n "$ac_ct_AR"; then
    3732 +  echo "$as_me:4035: result: $ac_ct_AR" >&5
     3854+  echo "$as_me:4036: result: $ac_ct_AR" >&5
    37333855+echo "${ECHO_T}$ac_ct_AR" >&6
    37343856+else
    3735 +  echo "$as_me:4038: result: no" >&5
     3857+  echo "$as_me:4039: result: no" >&5
    37363858+echo "${ECHO_T}no" >&6
    37373859+fi
    3738 +
     3860 
    37393861+  AR=$ac_ct_AR
    37403862+else
    37413863+  AR="$ac_cv_prog_AR"
    3742 +fi
    3743 +
    3744 +echo "$as_me:4047: checking for options to update archives" >&5
     3864 fi
     3865 
     3866-cf_cv_subst_AR_OPTS=$AR_OPTS
     3867-echo "$as_me:3840: result: $AR_OPTS" >&5
     3868-echo "${ECHO_T}$AR_OPTS" >&6
     3869+echo "$as_me:4048: checking for options to update archives" >&5
    37453870+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
    37463871+if test "${cf_cv_ar_flags+set}" = set; then
    37473872+  echo $ECHO_N "(cached) $ECHO_C" >&6
    37483873+else
    3749  
    3750 -cf_cv_subst_AR_OPTS=$AR_OPTS
    3751 -echo "$as_me:3840: result: $AR_OPTS" >&5
    3752 -echo "${ECHO_T}$AR_OPTS" >&6
     3874+
    37533875+       cf_cv_ar_flags=unknown
    37543876+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
    … …  
    37583880+
    37593881+               cat >conftest.$ac_ext <<EOF
    3760 +#line 4060 "configure"
     3882+#line 4061 "configure"
    37613883+int    testdata[3] = { 123, 456, 789 };
    37623884+EOF
    3763 +               if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5
     3885+               if { (eval echo "$as_me:4064: \"$ac_compile\"") >&5
    37643886+  (eval $ac_compile) 2>&5
    37653887+  ac_status=$?
    3766 +  echo "$as_me:4066: \$? = $ac_status" >&5
     3888+  echo "$as_me:4067: \$? = $ac_status" >&5
    37673889+  (exit $ac_status); } ; then
    37683890+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
    … …  
    37743896+                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
    37753897+
    3776 +echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5
     3898+echo "${as_me-configure}:4077: testing cannot compile test-program ..." 1>&5
    37773899+
    37783900+                       break
    … …  
    37823904 
    37833905 fi
    3784 +echo "$as_me:4084: result: $cf_cv_ar_flags" >&5
     3906+echo "$as_me:4085: result: $cf_cv_ar_flags" >&5
    37853907+echo "${ECHO_T}$cf_cv_ar_flags" >&6
    37863908+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
    … …  
    37883910 
    37893911-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
    3790 +echo "$as_me:4089: checking if you have specified an install-prefix" >&5
     3912+echo "$as_me:4090: checking if you have specified an install-prefix" >&5
    37913913 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    37923914 
    37933915 # Check whether --with-install-prefix or --without-install-prefix was given.
    3794 @@ -3855,7 +4099,7 @@
     3916@@ -3855,7 +4100,7 @@
    37953917                ;;
    37963918        esac
    37973919 fi;
    37983920-echo "$as_me:3858: result: $DESTDIR" >&5
    3799 +echo "$as_me:4102: result: $DESTDIR" >&5
     3921+echo "$as_me:4103: result: $DESTDIR" >&5
    38003922 echo "${ECHO_T}$DESTDIR" >&6
    38013923 
    38023924 ###############################################################################
    3803 @@ -3883,7 +4127,7 @@
     3925@@ -3883,7 +4128,7 @@
    38043926 do
    38053927   # Extract the first word of "$ac_prog", so it can be a program name with args.
    38063928 set dummy $ac_prog; ac_word=$2
    38073929-echo "$as_me:3886: checking for $ac_word" >&5
    3808 +echo "$as_me:4130: checking for $ac_word" >&5
     3930+echo "$as_me:4131: checking for $ac_word" >&5
    38093931 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    38103932 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    38113933   echo $ECHO_N "(cached) $ECHO_C" >&6
    3812 @@ -3898,7 +4142,7 @@
     3934@@ -3898,7 +4143,7 @@
    38133935   test -z "$ac_dir" && ac_dir=.
    38143936   $as_executable_p "$ac_dir/$ac_word" || continue
    38153937 ac_cv_prog_BUILD_CC="$ac_prog"
    38163938-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    3817 +echo "$as_me:4145: found $ac_dir/$ac_word" >&5
     3939+echo "$as_me:4146: found $ac_dir/$ac_word" >&5
    38183940 break
    38193941 done
    38203942 
    3821 @@ -3906,10 +4150,10 @@
     3943@@ -3906,10 +4151,10 @@
    38223944 fi
    38233945 BUILD_CC=$ac_cv_prog_BUILD_CC
    38243946 if test -n "$BUILD_CC"; then
    38253947-  echo "$as_me:3909: result: $BUILD_CC" >&5
    3826 +  echo "$as_me:4153: result: $BUILD_CC" >&5
     3948+  echo "$as_me:4154: result: $BUILD_CC" >&5
    38273949 echo "${ECHO_T}$BUILD_CC" >&6
    38283950 else
    38293951-  echo "$as_me:3912: result: no" >&5
    3830 +  echo "$as_me:4156: result: no" >&5
     3952+  echo "$as_me:4157: result: no" >&5
    38313953 echo "${ECHO_T}no" >&6
    38323954 fi
    38333955 
    3834 @@ -3917,12 +4161,12 @@
     3956@@ -3917,12 +4162,12 @@
    38353957 done
    38363958 
    38373959 fi;
    38383960-       echo "$as_me:3920: checking for native build C compiler" >&5
    3839 +       echo "$as_me:4164: checking for native build C compiler" >&5
     3961+       echo "$as_me:4165: checking for native build C compiler" >&5
    38403962 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    38413963-       echo "$as_me:3922: result: $BUILD_CC" >&5
    3842 +       echo "$as_me:4166: result: $BUILD_CC" >&5
     3964+       echo "$as_me:4167: result: $BUILD_CC" >&5
    38433965 echo "${ECHO_T}$BUILD_CC" >&6
    38443966 
    38453967-       echo "$as_me:3925: checking for native build C preprocessor" >&5
    3846 +       echo "$as_me:4169: checking for native build C preprocessor" >&5
     3968+       echo "$as_me:4170: checking for native build C preprocessor" >&5
    38473969 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    38483970 
    38493971 # Check whether --with-build-cpp or --without-build-cpp was given.
    3850 @@ -3932,10 +4176,10 @@
     3972@@ -3932,10 +4177,10 @@
    38513973 else
    38523974   BUILD_CPP='${BUILD_CC} -E'
    38533975 fi;
    38543976-       echo "$as_me:3935: result: $BUILD_CPP" >&5
    3855 +       echo "$as_me:4179: result: $BUILD_CPP" >&5
     3977+       echo "$as_me:4180: result: $BUILD_CPP" >&5
    38563978 echo "${ECHO_T}$BUILD_CPP" >&6
    38573979 
    38583980-       echo "$as_me:3938: checking for native build C flags" >&5
    3859 +       echo "$as_me:4182: checking for native build C flags" >&5
     3981+       echo "$as_me:4183: checking for native build C flags" >&5
    38603982 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    38613983 
    38623984 # Check whether --with-build-cflags or --without-build-cflags was given.
    3863 @@ -3943,10 +4187,10 @@
     3985@@ -3943,10 +4188,10 @@
    38643986   withval="$with_build_cflags"
    38653987   BUILD_CFLAGS="$withval"
    38663988 fi;
    38673989-       echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
    3868 +       echo "$as_me:4190: result: $BUILD_CFLAGS" >&5
     3990+       echo "$as_me:4191: result: $BUILD_CFLAGS" >&5
    38693991 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    38703992 
    38713993-       echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
    3872 +       echo "$as_me:4193: checking for native build C preprocessor-flags" >&5
     3994+       echo "$as_me:4194: checking for native build C preprocessor-flags" >&5
    38733995 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    38743996 
    38753997 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    3876 @@ -3954,10 +4198,10 @@
     3998@@ -3954,10 +4199,10 @@
    38773999   withval="$with_build_cppflags"
    38784000   BUILD_CPPFLAGS="$withval"
    38794001 fi;
    38804002-       echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
    3881 +       echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5
     4003+       echo "$as_me:4202: result: $BUILD_CPPFLAGS" >&5
    38824004 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    38834005 
    38844006-       echo "$as_me:3960: checking for native build linker-flags" >&5
    3885 +       echo "$as_me:4204: checking for native build linker-flags" >&5
     4007+       echo "$as_me:4205: checking for native build linker-flags" >&5
    38864008 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    38874009 
    38884010 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    3889 @@ -3965,10 +4209,10 @@
     4011@@ -3965,10 +4210,10 @@
    38904012   withval="$with_build_ldflags"
    38914013   BUILD_LDFLAGS="$withval"
    38924014 fi;
    38934015-       echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
    3894 +       echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5
     4016+       echo "$as_me:4213: result: $BUILD_LDFLAGS" >&5
    38954017 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    38964018 
    38974019-       echo "$as_me:3971: checking for native build linker-libraries" >&5
    3898 +       echo "$as_me:4215: checking for native build linker-libraries" >&5
     4020+       echo "$as_me:4216: checking for native build linker-libraries" >&5
    38994021 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    39004022 
    39014023 # Check whether --with-build-libs or --without-build-libs was given.
    3902 @@ -3976,7 +4220,7 @@
     4024@@ -3976,7 +4221,7 @@
    39034025   withval="$with_build_libs"
    39044026   BUILD_LIBS="$withval"
    39054027 fi;
    39064028-       echo "$as_me:3979: result: $BUILD_LIBS" >&5
    3907 +       echo "$as_me:4223: result: $BUILD_LIBS" >&5
     4029+       echo "$as_me:4224: result: $BUILD_LIBS" >&5
    39084030 echo "${ECHO_T}$BUILD_LIBS" >&6
    39094031 
    39104032        # this assumes we're on Unix.
    3911 @@ -3986,7 +4230,7 @@
     4033@@ -3986,7 +4231,7 @@
    39124034        : ${BUILD_CC:='${CC}'}
    39134035 
    39144036        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    39154037-               { { echo "$as_me:3989: error: Cross-build requires two compilers.
    3916 +               { { echo "$as_me:4233: error: Cross-build requires two compilers.
     4038+               { { echo "$as_me:4234: error: Cross-build requires two compilers.
    39174039 Use --with-build-cc to specify the native compiler." >&5
    39184040 echo "$as_me: error: Cross-build requires two compilers.
    39194041 Use --with-build-cc to specify the native compiler." >&2;}
    3920 @@ -4027,7 +4271,7 @@
     4042@@ -4027,7 +4272,7 @@
    39214043 LIB_INSTALL=
    39224044 LIB_UNINSTALL=
    39234045 
    39244046-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
    3925 +echo "$as_me:4274: checking if you want to build libraries with libtool" >&5
     4047+echo "$as_me:4275: checking if you want to build libraries with libtool" >&5
    39264048 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
    39274049 
    39284050 # Check whether --with-libtool or --without-libtool was given.
    3929 @@ -4037,11 +4281,11 @@
     4051@@ -4037,11 +4282,11 @@
    39304052 else
    39314053   with_libtool=no
    39324054 fi;
    39334055-echo "$as_me:4040: result: $with_libtool" >&5
    3934 +echo "$as_me:4284: result: $with_libtool" >&5
     4056+echo "$as_me:4285: result: $with_libtool" >&5
    39354057 echo "${ECHO_T}$with_libtool" >&6
    39364058 if test "$with_libtool" != "no"; then
    … …  
    39414063 if test "x$prefix" != xNONE; then
    39424064   cf_path_syntax="$prefix"
    3943 @@ -4068,7 +4312,7 @@
     4065@@ -4068,7 +4313,7 @@
    39444066   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    39454067   ;;
    39464068 *)
    39474069-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
    3948 +  { { echo "$as_me:4315: error: expected a pathname, not \"$with_libtool\"" >&5
     4070+  { { echo "$as_me:4316: error: expected a pathname, not \"$with_libtool\"" >&5
    39494071 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    39504072    { (exit 1); exit 1; }; }
    39514073   ;;
    3952 @@ -4076,9 +4320,9 @@
     4074@@ -4076,9 +4321,9 @@
    39534075 
    39544076                LIBTOOL=$with_libtool
    … …  
    39584080 set dummy libtool; ac_word=$2
    39594081-echo "$as_me:4081: checking for $ac_word" >&5
    3960 +echo "$as_me:4325: checking for $ac_word" >&5
     4082+echo "$as_me:4326: checking for $ac_word" >&5
    39614083 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    39624084 if test "${ac_cv_path_LIBTOOL+set}" = set; then
    39634085   echo $ECHO_N "(cached) $ECHO_C" >&6
    3964 @@ -4095,7 +4339,7 @@
     4086@@ -4095,7 +4340,7 @@
    39654087   test -z "$ac_dir" && ac_dir=.
    39664088   if $as_executable_p "$ac_dir/$ac_word"; then
    39674089    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
    39684090-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
    3969 +   echo "$as_me:4342: found $ac_dir/$ac_word" >&5
     4091+   echo "$as_me:4343: found $ac_dir/$ac_word" >&5
    39704092    break
    39714093 fi
    39724094 done
    3973 @@ -4106,19 +4350,19 @@
     4095@@ -4106,19 +4351,19 @@
    39744096 LIBTOOL=$ac_cv_path_LIBTOOL
    39754097 
    39764098 if test -n "$LIBTOOL"; then
    39774099-  echo "$as_me:4109: result: $LIBTOOL" >&5
    3978 +  echo "$as_me:4353: result: $LIBTOOL" >&5
     4100+  echo "$as_me:4354: result: $LIBTOOL" >&5
    39794101 echo "${ECHO_T}$LIBTOOL" >&6
    39804102 else
    39814103-  echo "$as_me:4112: result: no" >&5
    3982 +  echo "$as_me:4356: result: no" >&5
     4104+  echo "$as_me:4357: result: no" >&5
    39834105 echo "${ECHO_T}no" >&6
    39844106 fi
    … …  
    39894111+       fi
    39904112+       if test -z "$LIBTOOL" ; then
    3991 +               { { echo "$as_me:4362: error: Cannot find libtool" >&5
     4113+               { { echo "$as_me:4363: error: Cannot find libtool" >&5
    39924114 echo "$as_me: error: Cannot find libtool" >&2;}
    39934115    { (exit 1); exit 1; }; }
    … …  
    39974119        LIB_OBJECT='${OBJECTS:.o=.lo}'
    39984120        LIB_SUFFIX=.la
    3999 @@ -4130,17 +4374,17 @@
     4121@@ -4130,24 +4375,31 @@
    40004122        LIB_PREP=:
    40014123 
    40024124        # Show the version of libtool
    40034125-       echo "$as_me:4133: checking version of libtool" >&5
    4004 +       echo "$as_me:4377: checking version of libtool" >&5
     4126+       echo "$as_me:4378: checking version of libtool" >&5
    40054127 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
    40064128 
    40074129        # Save the version in a cache variable - this is not entirely a good
    40084130        # thing, but the version string from libtool is very ugly, and for
    4009         # bug reports it might be useful to have the original string.
     4131-       # bug reports it might be useful to have the original string.
     4132+       # bug reports it might be useful to have the original string. "("
    40104133        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
    40114134-       echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
    4012 +       echo "$as_me:4384: result: $cf_cv_libtool_version" >&5
     4135+       echo "$as_me:4385: result: $cf_cv_libtool_version" >&5
    40134136 echo "${ECHO_T}$cf_cv_libtool_version" >&6
    40144137        if test -z "$cf_cv_libtool_version" ; then
    40154138-               { { echo "$as_me:4143: error: This is not GNU libtool" >&5
    4016 +               { { echo "$as_me:4387: error: This is not GNU libtool" >&5
     4139+               { { echo "$as_me:4388: error: This is not GNU libtool" >&5
    40174140 echo "$as_me: error: This is not GNU libtool" >&2;}
    40184141    { (exit 1); exit 1; }; }
    40194142        fi
    4020 @@ -4168,7 +4412,7 @@
     4143 
     4144+       # special hack to add -no-undefined (which libtool should do for itself)
     4145+       case "$cf_cv_system_name" in #(vi
     4146+       cygwin*|mingw32*|uwin*|aix[456]) #(vi
     4147+               LIBTOOL="$LIBTOOL -no-undefined"
     4148+               ;;
     4149+       esac
     4150+
     4151        # special hack to add --tag option for C++ compiler
     4152-       case $cf_cv_libtool_version in
     4153-       1.[5-9]*|[2-9]*)
     4154+       case $cf_cv_libtool_version in #(vi
     4155+       1.[5-9]*|[2-9]*) #(vi
     4156                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
     4157                LIBTOOL="$LIBTOOL --tag=CC"
     4158                ;;
     4159@@ -4168,7 +4420,7 @@
    40214160 
    40224161 else
    40234162 
    40244163-echo "$as_me:4171: checking if you want to build shared libraries" >&5
    4025 +echo "$as_me:4415: checking if you want to build shared libraries" >&5
     4164+echo "$as_me:4423: checking if you want to build shared libraries" >&5
    40264165 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
    40274166 
    40284167 # Check whether --with-shared or --without-shared was given.
    4029 @@ -4178,11 +4422,11 @@
     4168@@ -4178,11 +4430,11 @@
    40304169 else
    40314170   with_shared=no
    40324171 fi;
    40334172-echo "$as_me:4181: result: $with_shared" >&5
    4034 +echo "$as_me:4425: result: $with_shared" >&5
     4173+echo "$as_me:4433: result: $with_shared" >&5
    40354174 echo "${ECHO_T}$with_shared" >&6
    40364175 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    40374176 
    40384177-echo "$as_me:4185: checking if you want to build static libraries" >&5
    4039 +echo "$as_me:4429: checking if you want to build static libraries" >&5
     4178+echo "$as_me:4437: checking if you want to build static libraries" >&5
    40404179 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
    40414180 
    40424181 # Check whether --with-normal or --without-normal was given.
    4043 @@ -4192,11 +4436,11 @@
     4182@@ -4192,11 +4444,11 @@
    40444183 else
    40454184   with_normal=yes
    40464185 fi;
    40474186-echo "$as_me:4195: result: $with_normal" >&5
    4048 +echo "$as_me:4439: result: $with_normal" >&5
     4187+echo "$as_me:4447: result: $with_normal" >&5
    40494188 echo "${ECHO_T}$with_normal" >&6
    40504189 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
    40514190 
    40524191-echo "$as_me:4199: checking if you want to build debug libraries" >&5
    4053 +echo "$as_me:4443: checking if you want to build debug libraries" >&5
     4192+echo "$as_me:4451: checking if you want to build debug libraries" >&5
    40544193 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
    40554194 
    40564195 # Check whether --with-debug or --without-debug was given.
    4057 @@ -4206,11 +4450,11 @@
     4196@@ -4206,11 +4458,11 @@
    40584197 else
    40594198   with_debug=yes
    40604199 fi;
    40614200-echo "$as_me:4209: result: $with_debug" >&5
    4062 +echo "$as_me:4453: result: $with_debug" >&5
     4201+echo "$as_me:4461: result: $with_debug" >&5
    40634202 echo "${ECHO_T}$with_debug" >&6
    40644203 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
    40654204 
    40664205-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
    4067 +echo "$as_me:4457: checking if you want to build profiling libraries" >&5
     4206+echo "$as_me:4465: checking if you want to build profiling libraries" >&5
    40684207 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
    40694208 
    40704209 # Check whether --with-profile or --without-profile was given.
    4071 @@ -4220,7 +4464,7 @@
     4210@@ -4220,7 +4472,7 @@
    40724211 else
    40734212   with_profile=no
    40744213 fi;
    40754214-echo "$as_me:4223: result: $with_profile" >&5
    4076 +echo "$as_me:4467: result: $with_profile" >&5
     4215+echo "$as_me:4475: result: $with_profile" >&5
    40774216 echo "${ECHO_T}$with_profile" >&6
    40784217 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
    40794218 
    4080 @@ -4228,19 +4472,19 @@
     4219@@ -4228,19 +4480,19 @@
    40814220 
    40824221 ###############################################################################
    40834222 
    40844223-echo "$as_me:4231: checking for specified models" >&5
    4085 +echo "$as_me:4475: checking for specified models" >&5
     4224+echo "$as_me:4483: checking for specified models" >&5
    40864225 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    40874226 test -z "$cf_list_models" && cf_list_models=normal
    40884227 test "$with_libtool" != "no" && cf_list_models=libtool
    40894228-echo "$as_me:4235: result: $cf_list_models" >&5
    4090 +echo "$as_me:4479: result: $cf_list_models" >&5
     4229+echo "$as_me:4487: result: $cf_list_models" >&5
    40914230 echo "${ECHO_T}$cf_list_models" >&6
    40924231 
    … …  
    40944233 ### up test-applications.
    40954234-echo "$as_me:4240: checking for default model" >&5
    4096 +echo "$as_me:4484: checking for default model" >&5
     4235+echo "$as_me:4492: checking for default model" >&5
    40974236 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    40984237 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    40994238-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
    4100 +echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5
     4239+echo "$as_me:4495: result: $DFT_LWR_MODEL" >&5
    41014240 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    41024241 
    41034242 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    4104 @@ -4269,7 +4513,7 @@
     4243@@ -4269,7 +4521,7 @@
    41054244 
    41064245 ###############################################################################
    41074246 
    41084247-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
    4109 +echo "$as_me:4516: checking if you want to build a separate terminfo library" >&5
     4248+echo "$as_me:4524: checking if you want to build a separate terminfo library" >&5
    41104249 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
    41114250 
    41124251 # Check whether --with-termlib or --without-termlib was given.
    4113 @@ -4279,10 +4523,10 @@
     4252@@ -4279,10 +4531,10 @@
    41144253 else
    41154254   with_termlib=no
    41164255 fi;
    41174256-echo "$as_me:4282: result: $with_termlib" >&5
    4118 +echo "$as_me:4526: result: $with_termlib" >&5
     4257+echo "$as_me:4534: result: $with_termlib" >&5
    41194258 echo "${ECHO_T}$with_termlib" >&6
    41204259 
    41214260-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
    4122 +echo "$as_me:4529: checking if you want to build a separate tic library" >&5
     4261+echo "$as_me:4537: checking if you want to build a separate tic library" >&5
    41234262 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
    41244263 
    41254264 # Check whether --with-ticlib or --without-ticlib was given.
    4126 @@ -4292,13 +4536,13 @@
     4265@@ -4292,13 +4544,13 @@
    41274266 else
    41284267   with_ticlib=no
    41294268 fi;
    41304269-echo "$as_me:4295: result: $with_ticlib" >&5
    4131 +echo "$as_me:4539: result: $with_ticlib" >&5
     4270+echo "$as_me:4547: result: $with_ticlib" >&5
    41324271 echo "${ECHO_T}$with_ticlib" >&6
    41334272 
    … …  
    41364275 
    41374276-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
    4138 +echo "$as_me:4545: checking if you want to link with the GPM mouse library" >&5
     4277+echo "$as_me:4553: checking if you want to link with the GPM mouse library" >&5
    41394278 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
    41404279 
    41414280 # Check whether --with-gpm or --without-gpm was given.
    4142 @@ -4308,27 +4552,27 @@
     4281@@ -4308,27 +4560,27 @@
    41434282 else
    41444283   with_gpm=maybe
    41454284 fi;
    41464285-echo "$as_me:4311: result: $with_gpm" >&5
    4147 +echo "$as_me:4555: result: $with_gpm" >&5
     4286+echo "$as_me:4563: result: $with_gpm" >&5
    41484287 echo "${ECHO_T}$with_gpm" >&6
    41494288 
    41504289 if test "$with_gpm" != no ; then
    41514290-       echo "$as_me:4315: checking for gpm.h" >&5
    4152 +       echo "$as_me:4559: checking for gpm.h" >&5
     4291+       echo "$as_me:4567: checking for gpm.h" >&5
    41534292 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
    41544293 if test "${ac_cv_header_gpm_h+set}" = set; then
    … …  
    41574296   cat >conftest.$ac_ext <<_ACEOF
    41584297-#line 4321 "configure"
    4159 +#line 4565 "configure"
     4298+#line 4573 "configure"
    41604299 #include "confdefs.h"
    41614300 #include <gpm.h>
    41624301 _ACEOF
    41634302-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
    4164 +if { (eval echo "$as_me:4569: \"$ac_cpp conftest.$ac_ext\"") >&5
     4303+if { (eval echo "$as_me:4577: \"$ac_cpp conftest.$ac_ext\"") >&5
    41654304   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    41664305   ac_status=$?
    … …  
    41694308   cat conftest.err >&5
    41704309-  echo "$as_me:4331: \$? = $ac_status" >&5
    4171 +  echo "$as_me:4575: \$? = $ac_status" >&5
     4310+  echo "$as_me:4583: \$? = $ac_status" >&5
    41724311   (exit $ac_status); } >/dev/null; then
    41734312   if test -s conftest.err; then
    41744313     ac_cpp_err=$ac_c_preproc_warn_flag
    4175 @@ -4347,7 +4591,7 @@
     4314@@ -4347,7 +4599,7 @@
    41764315 fi
    41774316 rm -f conftest.err conftest.$ac_ext
    41784317 fi
    41794318-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
    4180 +echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5
     4319+echo "$as_me:4602: result: $ac_cv_header_gpm_h" >&5
    41814320 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
    41824321 if test $ac_cv_header_gpm_h = yes; then
    41834322 
    4184 @@ -4358,14 +4602,14 @@
     4323@@ -4358,14 +4610,14 @@
    41854324                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
    41864325                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
    41874326 
    41884327-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
    4189 +echo "${as_me-configure}:4605: testing assuming we really have GPM library ..." 1>&5
     4328+echo "${as_me-configure}:4613: testing assuming we really have GPM library ..." 1>&5
    41904329 
    41914330                        cat >>confdefs.h <<\EOF
    … …  
    41954334                else
    41964335-                       echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
    4197 +                       echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5
     4336+                       echo "$as_me:4620: checking for Gpm_Open in -lgpm" >&5
    41984337 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    41994338 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    42004339   echo $ECHO_N "(cached) $ECHO_C" >&6
    4201 @@ -4373,7 +4617,7 @@
     4340@@ -4373,7 +4625,7 @@
    42024341   ac_check_lib_save_LIBS=$LIBS
    42034342 LIBS="-lgpm  $LIBS"
    42044343 cat >conftest.$ac_ext <<_ACEOF
    42054344-#line 4376 "configure"
    4206 +#line 4620 "configure"
     4345+#line 4628 "configure"
    42074346 #include "confdefs.h"
    42084347 
    42094348 /* Override any gcc2 internal prototype to avoid an error.  */
    4210 @@ -4392,16 +4636,16 @@
     4349@@ -4392,16 +4644,16 @@
    42114350 }
    42124351 _ACEOF
    42134352 rm -f conftest.$ac_objext conftest$ac_exeext
    42144353-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
    4215 +if { (eval echo "$as_me:4639: \"$ac_link\"") >&5
     4354+if { (eval echo "$as_me:4647: \"$ac_link\"") >&5
    42164355   (eval $ac_link) 2>&5
    42174356   ac_status=$?
    42184357-  echo "$as_me:4398: \$? = $ac_status" >&5
    4219 +  echo "$as_me:4642: \$? = $ac_status" >&5
     4358+  echo "$as_me:4650: \$? = $ac_status" >&5
    42204359   (exit $ac_status); } &&
    42214360          { ac_try='test -s conftest$ac_exeext'
    42224361-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
    4223 +  { (eval echo "$as_me:4645: \"$ac_try\"") >&5
     4362+  { (eval echo "$as_me:4653: \"$ac_try\"") >&5
    42244363   (eval $ac_try) 2>&5
    42254364   ac_status=$?
    42264365-  echo "$as_me:4404: \$? = $ac_status" >&5
    4227 +  echo "$as_me:4648: \$? = $ac_status" >&5
     4366+  echo "$as_me:4656: \$? = $ac_status" >&5
    42284367   (exit $ac_status); }; }; then
    42294368   ac_cv_lib_gpm_Gpm_Open=yes
    42304369 else
    4231 @@ -4412,13 +4656,13 @@
     4370@@ -4412,13 +4664,13 @@
    42324371 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    42334372 LIBS=$ac_check_lib_save_LIBS
    42344373 fi
    42354374-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    4236 +echo "$as_me:4659: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     4375+echo "$as_me:4667: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    42374376 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    42384377 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    … …  
    42414380 
    42424381-                               { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
    4243 +                               { { echo "$as_me:4665: error: Cannot link with GPM library" >&5
     4382+                               { { echo "$as_me:4673: error: Cannot link with GPM library" >&5
    42444383 echo "$as_me: error: Cannot link with GPM library" >&2;}
    42454384    { (exit 1); exit 1; }; }
    42464385                fi
    4247 @@ -4428,7 +4672,7 @@
     4386@@ -4428,7 +4680,7 @@
    42484387 
    42494388 else
    42504389 
    42514390-               test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
    4252 +               test "$with_gpm" != maybe && { echo "$as_me:4675: WARNING: Cannot find GPM header" >&5
     4391+               test "$with_gpm" != maybe && { echo "$as_me:4683: WARNING: Cannot find GPM header" >&5
    42534392 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
    42544393                with_gpm=no
    42554394 
    4256 @@ -4437,7 +4681,7 @@
     4395@@ -4437,7 +4689,7 @@
    42574396 fi
    42584397 
    42594398 if test "$with_gpm" != no ; then
    42604399-       echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
    4261 +       echo "$as_me:4684: checking if you want to load GPM dynamically" >&5
     4400+       echo "$as_me:4692: checking if you want to load GPM dynamically" >&5
    42624401 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
    42634402 
    42644403 # Check whether --with-dlsym or --without-dlsym was given.
    4265 @@ -4447,18 +4691,18 @@
     4404@@ -4447,18 +4699,18 @@
    42664405 else
    42674406   with_dlsym=yes
    42684407 fi;
    42694408-       echo "$as_me:4450: result: $with_dlsym" >&5
    4270 +       echo "$as_me:4694: result: $with_dlsym" >&5
     4409+       echo "$as_me:4702: result: $with_dlsym" >&5
    42714410 echo "${ECHO_T}$with_dlsym" >&6
    42724411        if test "$with_dlsym" = yes ; then
    … …  
    42744413 cf_have_dlsym=no
    42754414-echo "$as_me:4455: checking for dlsym" >&5
    4276 +echo "$as_me:4699: checking for dlsym" >&5
     4415+echo "$as_me:4707: checking for dlsym" >&5
    42774416 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
    42784417 if test "${ac_cv_func_dlsym+set}" = set; then
    … …  
    42814420   cat >conftest.$ac_ext <<_ACEOF
    42824421-#line 4461 "configure"
    4283 +#line 4705 "configure"
     4422+#line 4713 "configure"
    42844423 #include "confdefs.h"
    42854424 /* System header to define __stub macros and hopefully few prototypes,
    42864425     which can conflict with char dlsym (); below.  */
    4287 @@ -4489,16 +4733,16 @@
     4426@@ -4489,16 +4741,16 @@
    42884427 }
    42894428 _ACEOF
    42904429 rm -f conftest.$ac_objext conftest$ac_exeext
    42914430-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
    4292 +if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
     4431+if { (eval echo "$as_me:4744: \"$ac_link\"") >&5
    42934432   (eval $ac_link) 2>&5
    42944433   ac_status=$?
    42954434-  echo "$as_me:4495: \$? = $ac_status" >&5
    4296 +  echo "$as_me:4739: \$? = $ac_status" >&5
     4435+  echo "$as_me:4747: \$? = $ac_status" >&5
    42974436   (exit $ac_status); } &&
    42984437          { ac_try='test -s conftest$ac_exeext'
    42994438-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
    4300 +  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
     4439+  { (eval echo "$as_me:4750: \"$ac_try\"") >&5
    43014440   (eval $ac_try) 2>&5
    43024441   ac_status=$?
    43034442-  echo "$as_me:4501: \$? = $ac_status" >&5
    4304 +  echo "$as_me:4745: \$? = $ac_status" >&5
     4443+  echo "$as_me:4753: \$? = $ac_status" >&5
    43054444   (exit $ac_status); }; }; then
    43064445   ac_cv_func_dlsym=yes
    43074446 else
    4308 @@ -4508,14 +4752,14 @@
     4447@@ -4508,14 +4760,14 @@
    43094448 fi
    43104449 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43114450 fi
    43124451-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
    4313 +echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5
     4452+echo "$as_me:4763: result: $ac_cv_func_dlsym" >&5
    43144453 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
    43154454 if test $ac_cv_func_dlsym = yes; then
    … …  
    43194458 cf_have_libdl=no
    43204459-echo "$as_me:4518: checking for dlsym in -ldl" >&5
    4321 +echo "$as_me:4762: checking for dlsym in -ldl" >&5
     4460+echo "$as_me:4770: checking for dlsym in -ldl" >&5
    43224461 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
    43234462 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    43244463   echo $ECHO_N "(cached) $ECHO_C" >&6
    4325 @@ -4523,7 +4767,7 @@
     4464@@ -4523,7 +4775,7 @@
    43264465   ac_check_lib_save_LIBS=$LIBS
    43274466 LIBS="-ldl  $LIBS"
    43284467 cat >conftest.$ac_ext <<_ACEOF
    43294468-#line 4526 "configure"
    4330 +#line 4770 "configure"
     4469+#line 4778 "configure"
    43314470 #include "confdefs.h"
    43324471 
    43334472 /* Override any gcc2 internal prototype to avoid an error.  */
    4334 @@ -4542,16 +4786,16 @@
     4473@@ -4542,16 +4794,16 @@
    43354474 }
    43364475 _ACEOF
    43374476 rm -f conftest.$ac_objext conftest$ac_exeext
    43384477-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
    4339 +if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
     4478+if { (eval echo "$as_me:4797: \"$ac_link\"") >&5
    43404479   (eval $ac_link) 2>&5
    43414480   ac_status=$?
    43424481-  echo "$as_me:4548: \$? = $ac_status" >&5
    4343 +  echo "$as_me:4792: \$? = $ac_status" >&5
     4482+  echo "$as_me:4800: \$? = $ac_status" >&5
    43444483   (exit $ac_status); } &&
    43454484          { ac_try='test -s conftest$ac_exeext'
    43464485-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
    4347 +  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
     4486+  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
    43484487   (eval $ac_try) 2>&5
    43494488   ac_status=$?
    43504489-  echo "$as_me:4554: \$? = $ac_status" >&5
    4351 +  echo "$as_me:4798: \$? = $ac_status" >&5
     4490+  echo "$as_me:4806: \$? = $ac_status" >&5
    43524491   (exit $ac_status); }; }; then
    43534492   ac_cv_lib_dl_dlsym=yes
    43544493 else
    4355 @@ -4562,7 +4806,7 @@
     4494@@ -4562,7 +4814,7 @@
    43564495 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43574496 LIBS=$ac_check_lib_save_LIBS
    43584497 fi
    43594498-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
    4360 +echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5
     4499+echo "$as_me:4817: result: $ac_cv_lib_dl_dlsym" >&5
    43614500 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
    43624501 if test $ac_cv_lib_dl_dlsym = yes; then
    43634502 
    4364 @@ -4575,10 +4819,10 @@
     4503@@ -4575,10 +4827,10 @@
    43654504 if test "$cf_have_dlsym" = yes ; then
    43664505        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
    43674506 
    43684507-       echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
    4369 +       echo "$as_me:4822: checking whether able to link to dl*() functions" >&5
     4508+       echo "$as_me:4830: checking whether able to link to dl*() functions" >&5
    43704509 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
    43714510        cat >conftest.$ac_ext <<_ACEOF
    43724511-#line 4581 "configure"
    4373 +#line 4825 "configure"
     4512+#line 4833 "configure"
    43744513 #include "confdefs.h"
    43754514 #include <dlfcn.h>
    43764515 int
    4377 @@ -4596,16 +4840,16 @@
     4516@@ -4596,16 +4848,16 @@
    43784517 }
    43794518 _ACEOF
    43804519 rm -f conftest.$ac_objext conftest$ac_exeext
    43814520-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
    4382 +if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
     4521+if { (eval echo "$as_me:4851: \"$ac_link\"") >&5
    43834522   (eval $ac_link) 2>&5
    43844523   ac_status=$?
    43854524-  echo "$as_me:4602: \$? = $ac_status" >&5
    4386 +  echo "$as_me:4846: \$? = $ac_status" >&5
     4525+  echo "$as_me:4854: \$? = $ac_status" >&5
    43874526   (exit $ac_status); } &&
    43884527          { ac_try='test -s conftest$ac_exeext'
    43894528-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
    4390 +  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
     4529+  { (eval echo "$as_me:4857: \"$ac_try\"") >&5
    43914530   (eval $ac_try) 2>&5
    43924531   ac_status=$?
    43934532-  echo "$as_me:4608: \$? = $ac_status" >&5
    4394 +  echo "$as_me:4852: \$? = $ac_status" >&5
     4533+  echo "$as_me:4860: \$? = $ac_status" >&5
    43954534   (exit $ac_status); }; }; then
    43964535 
    43974536                cat >>confdefs.h <<\EOF
    4398 @@ -4616,15 +4860,15 @@
     4537@@ -4616,15 +4868,15 @@
    43994538   echo "$as_me: failed program was:" >&5
    44004539 cat conftest.$ac_ext >&5
    44014540 
    44024541-               { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
    4403 +               { { echo "$as_me:4863: error: Cannot link test program for libdl" >&5
     4542+               { { echo "$as_me:4871: error: Cannot link test program for libdl" >&5
    44044543 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    44054544    { (exit 1); exit 1; }; }
    … …  
    44074546 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44084547-       echo "$as_me:4624: result: ok" >&5
    4409 +       echo "$as_me:4868: result: ok" >&5
     4548+       echo "$as_me:4876: result: ok" >&5
    44104549 echo "${ECHO_T}ok" >&6
    44114550 else
    44124551-       { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
    4413 +       { { echo "$as_me:4871: error: Cannot find dlsym function" >&5
     4552+       { { echo "$as_me:4879: error: Cannot find dlsym function" >&5
    44144553 echo "$as_me: error: Cannot find dlsym function" >&2;}
    44154554    { (exit 1); exit 1; }; }
    44164555 fi
    4417 @@ -4632,12 +4876,12 @@
     4556@@ -4632,12 +4884,12 @@
    44184557                if test "$with_gpm" != yes ; then
    44194558                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
    44204559 
    44214560-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
    4422 +echo "${as_me-configure}:4879: testing assuming soname for gpm is $with_gpm ..." 1>&5
     4561+echo "${as_me-configure}:4887: testing assuming soname for gpm is $with_gpm ..." 1>&5
    44234562 
    44244563                        cf_cv_gpm_soname="$with_gpm"
    … …  
    44264565 
    44274566-echo "$as_me:4640: checking for soname of gpm library" >&5
    4428 +echo "$as_me:4884: checking for soname of gpm library" >&5
     4567+echo "$as_me:4892: checking for soname of gpm library" >&5
    44294568 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
    44304569 if test "${cf_cv_gpm_soname+set}" = set; then
    44314570   echo $ECHO_N "(cached) $ECHO_C" >&6
    4432 @@ -4655,15 +4899,15 @@
     4571@@ -4655,15 +4907,15 @@
    44334572 CF_EOF
    44344573 cf_save_LIBS="$LIBS"
    44354574        LIBS="-lgpm $LIBS"
    44364575-       if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
    4437 +       if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5
     4576+       if { (eval echo "$as_me:4910: \"$ac_compile\"") >&5
    44384577   (eval $ac_compile) 2>&5
    44394578   ac_status=$?
    44404579-  echo "$as_me:4661: \$? = $ac_status" >&5
    4441 +  echo "$as_me:4905: \$? = $ac_status" >&5
     4580+  echo "$as_me:4913: \$? = $ac_status" >&5
    44424581   (exit $ac_status); } ; then
    44434582-               if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
    4444 +               if { (eval echo "$as_me:4907: \"$ac_link\"") >&5
     4583+               if { (eval echo "$as_me:4915: \"$ac_link\"") >&5
    44454584   (eval $ac_link) 2>&5
    44464585   ac_status=$?
    44474586-  echo "$as_me:4666: \$? = $ac_status" >&5
    4448 +  echo "$as_me:4910: \$? = $ac_status" >&5
     4587+  echo "$as_me:4918: \$? = $ac_status" >&5
    44494588   (exit $ac_status); } ; then
    44504589                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
    44514590                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
    4452 @@ -4674,7 +4918,7 @@
     4591@@ -4674,7 +4926,7 @@
    44534592 fi
    44544593 
    44554594 fi
    44564595-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
    4457 +echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5
     4596+echo "$as_me:4929: result: $cf_cv_gpm_soname" >&5
    44584597 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
    44594598 
    44604599                fi
    4461 @@ -4690,7 +4934,7 @@
     4600@@ -4690,7 +4942,7 @@
    44624601 #define HAVE_LIBGPM 1
    44634602 EOF
    44644603 
    44654604-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
    4466 +echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5
     4605+echo "$as_me:4945: checking for Gpm_Wgetch in -lgpm" >&5
    44674606 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
    44684607 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    44694608   echo $ECHO_N "(cached) $ECHO_C" >&6
    4470 @@ -4698,7 +4942,7 @@
     4609@@ -4698,7 +4950,7 @@
    44714610   ac_check_lib_save_LIBS=$LIBS
    44724611 LIBS="-lgpm  $LIBS"
    44734612 cat >conftest.$ac_ext <<_ACEOF
    44744613-#line 4701 "configure"
    4475 +#line 4945 "configure"
     4614+#line 4953 "configure"
    44764615 #include "confdefs.h"
    44774616 
    44784617 /* Override any gcc2 internal prototype to avoid an error.  */
    4479 @@ -4717,16 +4961,16 @@
     4618@@ -4717,16 +4969,16 @@
    44804619 }
    44814620 _ACEOF
    44824621 rm -f conftest.$ac_objext conftest$ac_exeext
    44834622-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
    4484 +if { (eval echo "$as_me:4964: \"$ac_link\"") >&5
     4623+if { (eval echo "$as_me:4972: \"$ac_link\"") >&5
    44854624   (eval $ac_link) 2>&5
    44864625   ac_status=$?
    44874626-  echo "$as_me:4723: \$? = $ac_status" >&5
    4488 +  echo "$as_me:4967: \$? = $ac_status" >&5
     4627+  echo "$as_me:4975: \$? = $ac_status" >&5
    44894628   (exit $ac_status); } &&
    44904629          { ac_try='test -s conftest$ac_exeext'
    44914630-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
    4492 +  { (eval echo "$as_me:4970: \"$ac_try\"") >&5
     4631+  { (eval echo "$as_me:4978: \"$ac_try\"") >&5
    44934632   (eval $ac_try) 2>&5
    44944633   ac_status=$?
    44954634-  echo "$as_me:4729: \$? = $ac_status" >&5
    4496 +  echo "$as_me:4973: \$? = $ac_status" >&5
     4635+  echo "$as_me:4981: \$? = $ac_status" >&5
    44974636   (exit $ac_status); }; }; then
    44984637   ac_cv_lib_gpm_Gpm_Wgetch=yes
    44994638 else
    4500 @@ -4737,11 +4981,11 @@
     4639@@ -4737,11 +4989,11 @@
    45014640 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    45024641 LIBS=$ac_check_lib_save_LIBS
    45034642 fi
    45044643-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    4505 +echo "$as_me:4984: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
     4644+echo "$as_me:4992: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    45064645 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
    45074646 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
    45084647 
    45094648-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
    4510 +echo "$as_me:4988: checking if GPM is weakly bound to curses library" >&5
     4649+echo "$as_me:4996: checking if GPM is weakly bound to curses library" >&5
    45114650 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
    45124651 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    45134652   echo $ECHO_N "(cached) $ECHO_C" >&6
    4514 @@ -4765,15 +5009,15 @@
     4653@@ -4765,15 +5017,15 @@
    45154654        # to rely on the static library, noting that some packagers may not
    45164655        # include it.
    45174656        LIBS="-static -lgpm -dynamic $LIBS"
    45184657-       if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
    4519 +       if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5
     4658+       if { (eval echo "$as_me:5020: \"$ac_compile\"") >&5
    45204659   (eval $ac_compile) 2>&5
    45214660   ac_status=$?
    45224661-  echo "$as_me:4771: \$? = $ac_status" >&5
    4523 +  echo "$as_me:5015: \$? = $ac_status" >&5
     4662+  echo "$as_me:5023: \$? = $ac_status" >&5
    45244663   (exit $ac_status); } ; then
    45254664-               if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
    4526 +               if { (eval echo "$as_me:5017: \"$ac_link\"") >&5
     4665+               if { (eval echo "$as_me:5025: \"$ac_link\"") >&5
    45274666   (eval $ac_link) 2>&5
    45284667   ac_status=$?
    45294668-  echo "$as_me:4776: \$? = $ac_status" >&5
    4530 +  echo "$as_me:5020: \$? = $ac_status" >&5
     4669+  echo "$as_me:5028: \$? = $ac_status" >&5
    45314670   (exit $ac_status); } ; then
    45324671                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
    45334672                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
    4534 @@ -4785,11 +5029,11 @@
     4673@@ -4785,11 +5037,11 @@
    45354674 fi
    45364675 
    45374676 fi
    45384677-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
    4539 +echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5
     4678+echo "$as_me:5040: result: $cf_cv_check_gpm_wgetch" >&5
    45404679 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
    45414680 
    45424681 if test "$cf_cv_check_gpm_wgetch" != yes ; then
    45434682-       { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    4544 +       { echo "$as_me:5036: WARNING: GPM library is already linked with curses - read the FAQ" >&5
     4683+       { echo "$as_me:5044: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    45454684 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
    45464685 fi
    45474686 
    4548 @@ -4799,7 +5043,7 @@
     4687@@ -4799,7 +5051,7 @@
    45494688 
    45504689 # not everyone has "test -c"
    45514690 if test -c /dev/sysmouse 2>/dev/null ; then
    45524691-echo "$as_me:4802: checking if you want to use sysmouse" >&5
    4553 +echo "$as_me:5046: checking if you want to use sysmouse" >&5
     4692+echo "$as_me:5054: checking if you want to use sysmouse" >&5
    45544693 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
    45554694 
    45564695 # Check whether --with-sysmouse or --without-sysmouse was given.
    4557 @@ -4811,7 +5055,7 @@
     4696@@ -4811,7 +5063,7 @@
    45584697 fi;
    45594698        if test "$cf_with_sysmouse" != no ; then
    45604699        cat >conftest.$ac_ext <<_ACEOF
    45614700-#line 4814 "configure"
    4562 +#line 5058 "configure"
     4701+#line 5066 "configure"
    45634702 #include "confdefs.h"
    45644703 
    45654704 #include <osreldate.h>
    4566 @@ -4834,16 +5078,16 @@
     4705@@ -4834,16 +5086,16 @@
    45674706 }
    45684707 _ACEOF
    45694708 rm -f conftest.$ac_objext
    45704709-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
    4571 +if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5
     4710+if { (eval echo "$as_me:5089: \"$ac_compile\"") >&5
    45724711   (eval $ac_compile) 2>&5
    45734712   ac_status=$?
    45744713-  echo "$as_me:4840: \$? = $ac_status" >&5
    4575 +  echo "$as_me:5084: \$? = $ac_status" >&5
     4714+  echo "$as_me:5092: \$? = $ac_status" >&5
    45764715   (exit $ac_status); } &&
    45774716          { ac_try='test -s conftest.$ac_objext'
    45784717-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
    4579 +  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
     4718+  { (eval echo "$as_me:5095: \"$ac_try\"") >&5
    45804719   (eval $ac_try) 2>&5
    45814720   ac_status=$?
    45824721-  echo "$as_me:4846: \$? = $ac_status" >&5
    4583 +  echo "$as_me:5090: \$? = $ac_status" >&5
     4722+  echo "$as_me:5098: \$? = $ac_status" >&5
    45844723   (exit $ac_status); }; }; then
    45854724   cf_with_sysmouse=yes
    45864725 else
    4587 @@ -4853,7 +5097,7 @@
     4726@@ -4853,7 +5105,7 @@
    45884727 fi
    45894728 rm -f conftest.$ac_objext conftest.$ac_ext
    45904729        fi
    45914730-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
    4592 +echo "$as_me:5100: result: $cf_with_sysmouse" >&5
     4731+echo "$as_me:5108: result: $cf_with_sysmouse" >&5
    45934732 echo "${ECHO_T}$cf_with_sysmouse" >&6
    45944733 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
    45954734 #define USE_SYSMOUSE 1
    4596 @@ -4871,7 +5115,7 @@
     4735@@ -4871,7 +5123,7 @@
    45974736        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
    45984737 fi
    45994738 
    46004739-echo "$as_me:4874: checking for default loader flags" >&5
    4601 +echo "$as_me:5118: checking for default loader flags" >&5
     4740+echo "$as_me:5126: checking for default loader flags" >&5
    46024741 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
    46034742 case $DFT_LWR_MODEL in
    46044743 libtool) LD_MODEL=''   ;;
    4605 @@ -4880,13 +5124,13 @@
     4744@@ -4880,13 +5132,13 @@
    46064745 profile) LD_MODEL='-pg';;
    46074746 shared)  LD_MODEL=''   ;;
    46084747 esac
    46094748-echo "$as_me:4883: result: $LD_MODEL" >&5
    4610 +echo "$as_me:5127: result: $LD_MODEL" >&5
     4749+echo "$as_me:5135: result: $LD_MODEL" >&5
    46114750 echo "${ECHO_T}$LD_MODEL" >&6
    46124751 
    … …  
    46154754 
    46164755-echo "$as_me:4889: checking if rpath option should be used" >&5
    4617 +echo "$as_me:5133: checking if rpath option should be used" >&5
     4756+echo "$as_me:5141: checking if rpath option should be used" >&5
    46184757 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
    46194758 
    46204759 # Check whether --enable-rpath or --disable-rpath was given.
    4621 @@ -4896,10 +5140,10 @@
     4760@@ -4896,10 +5148,10 @@
    46224761 else
    46234762   cf_cv_ld_rpath=no
    46244763 fi;
    46254764-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
    4626 +echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5
     4765+echo "$as_me:5151: result: $cf_cv_ld_rpath" >&5
    46274766 echo "${ECHO_T}$cf_cv_ld_rpath" >&6
    46284767 
    46294768-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
    4630 +echo "$as_me:5146: checking if shared libraries should be relinked during install" >&5
     4769+echo "$as_me:5154: checking if shared libraries should be relinked during install" >&5
    46314770 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
    46324771 
    46334772 # Check whether --enable-relink or --disable-relink was given.
    4634 @@ -4909,19 +5153,20 @@
     4773@@ -4909,19 +5161,20 @@
    46354774 else
    46364775   cf_cv_do_relink=yes
    46374776 fi;
    46384777-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
    4639 +echo "$as_me:5156: result: $cf_cv_do_relink" >&5
     4778+echo "$as_me:5164: result: $cf_cv_do_relink" >&5
    46404779 echo "${ECHO_T}$cf_cv_do_relink" >&6
    46414780        ;;
    … …  
    46514790 
    46524791-       echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
    4653 +       echo "$as_me:5169: checking if release/abi version should be used for shared libs" >&5
     4792+       echo "$as_me:5177: checking if release/abi version should be used for shared libs" >&5
    46544793 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
    46554794 
    46564795 # Check whether --with-shlib-version or --without-shlib-version was given.
    4657 @@ -4936,7 +5181,7 @@
     4796@@ -4936,7 +5189,7 @@
    46584797                cf_cv_shlib_version=$withval
    46594798                ;;
    46604799        *)
    46614800-               { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
    4662 +               { { echo "$as_me:5184: error: option value must be one of: rel, abi, auto or no" >&5
     4801+               { { echo "$as_me:5192: error: option value must be one of: rel, abi, auto or no" >&5
    46634802 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    46644803    { (exit 1); exit 1; }; }
    46654804                ;;
    4666 @@ -4945,7 +5190,7 @@
     4805@@ -4945,7 +5198,7 @@
    46674806 else
    46684807   cf_cv_shlib_version=auto
    46694808 fi;
    46704809-       echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
    4671 +       echo "$as_me:5193: result: $cf_cv_shlib_version" >&5
     4810+       echo "$as_me:5201: result: $cf_cv_shlib_version" >&5
    46724811 echo "${ECHO_T}$cf_cv_shlib_version" >&6
    46734812 
    46744813        cf_cv_rm_so_locs=no
    4675 @@ -4954,14 +5199,14 @@
     4814@@ -4954,14 +5207,14 @@
    46764815        CC_SHARED_OPTS=
    46774816        if test "$GCC" = yes
    46784817        then
    46794818-               echo "$as_me:4957: checking which $CC option to use" >&5
    4680 +               echo "$as_me:5202: checking which $CC option to use" >&5
     4819+               echo "$as_me:5210: checking which $CC option to use" >&5
    46814820 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
    46824821                cf_save_CFLAGS="$CFLAGS"
    … …  
    46864825                        cat >conftest.$ac_ext <<_ACEOF
    46874826-#line 4964 "configure"
    4688 +#line 5209 "configure"
     4827+#line 5217 "configure"
    46894828 #include "confdefs.h"
    46904829 #include <stdio.h>
    46914830 int
    4692 @@ -4973,16 +5218,16 @@
     4831@@ -4973,16 +5226,16 @@
    46934832 }
    46944833 _ACEOF
    46954834 rm -f conftest.$ac_objext
    46964835-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
    4697 +if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5
     4836+if { (eval echo "$as_me:5229: \"$ac_compile\"") >&5
    46984837   (eval $ac_compile) 2>&5
    46994838   ac_status=$?
    47004839-  echo "$as_me:4979: \$? = $ac_status" >&5
    4701 +  echo "$as_me:5224: \$? = $ac_status" >&5
     4840+  echo "$as_me:5232: \$? = $ac_status" >&5
    47024841   (exit $ac_status); } &&
    47034842          { ac_try='test -s conftest.$ac_objext'
    47044843-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
    4705 +  { (eval echo "$as_me:5227: \"$ac_try\"") >&5
     4844+  { (eval echo "$as_me:5235: \"$ac_try\"") >&5
    47064845   (eval $ac_try) 2>&5
    47074846   ac_status=$?
    47084847-  echo "$as_me:4985: \$? = $ac_status" >&5
    4709 +  echo "$as_me:5230: \$? = $ac_status" >&5
     4848+  echo "$as_me:5238: \$? = $ac_status" >&5
    47104849   (exit $ac_status); }; }; then
    47114850   break
    47124851 else
    4713 @@ -4991,7 +5236,7 @@
     4852@@ -4991,7 +5244,7 @@
    47144853 fi
    47154854 rm -f conftest.$ac_objext conftest.$ac_ext
    47164855                done
    47174856-               echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
    4718 +               echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5
     4857+               echo "$as_me:5247: result: $CC_SHARED_OPTS" >&5
    47194858 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
    47204859                CFLAGS="$cf_save_CFLAGS"
    47214860        fi
    4722 @@ -4999,6 +5244,12 @@
     4861@@ -4999,6 +5252,12 @@
    47234862        cf_cv_shlib_version_infix=no
    47244863 
    … …  
    47334872                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
    47344873                ;;
    4735 @@ -5027,7 +5278,7 @@
     4874@@ -5027,7 +5286,7 @@
    47364875                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    47374876                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    47384877                cf_cv_shlib_version_infix=yes
    47394878-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    4740 +               echo "$as_me:5281: checking if ld -search_paths_first works" >&5
     4879+               echo "$as_me:5289: checking if ld -search_paths_first works" >&5
    47414880 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    47424881 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    47434882   echo $ECHO_N "(cached) $ECHO_C" >&6
    4744 @@ -5036,7 +5287,7 @@
     4883@@ -5036,7 +5295,7 @@
    47454884                        cf_save_LDFLAGS=$LDFLAGS
    47464885                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    47474886                        cat >conftest.$ac_ext <<_ACEOF
    47484887-#line 5039 "configure"
    4749 +#line 5290 "configure"
     4888+#line 5298 "configure"
    47504889 #include "confdefs.h"
    47514890 
    47524891 int
    4753 @@ -5048,16 +5299,16 @@
     4892@@ -5048,16 +5307,16 @@
    47544893 }
    47554894 _ACEOF
    47564895 rm -f conftest.$ac_objext conftest$ac_exeext
    47574896-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    4758 +if { (eval echo "$as_me:5302: \"$ac_link\"") >&5
     4897+if { (eval echo "$as_me:5310: \"$ac_link\"") >&5
    47594898   (eval $ac_link) 2>&5
    47604899   ac_status=$?
    47614900-  echo "$as_me:5054: \$? = $ac_status" >&5
    4762 +  echo "$as_me:5305: \$? = $ac_status" >&5
     4901+  echo "$as_me:5313: \$? = $ac_status" >&5
    47634902   (exit $ac_status); } &&
    47644903          { ac_try='test -s conftest$ac_exeext'
    47654904-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    4766 +  { (eval echo "$as_me:5308: \"$ac_try\"") >&5
     4905+  { (eval echo "$as_me:5316: \"$ac_try\"") >&5
    47674906   (eval $ac_try) 2>&5
    47684907   ac_status=$?
    47694908-  echo "$as_me:5060: \$? = $ac_status" >&5
    4770 +  echo "$as_me:5311: \$? = $ac_status" >&5
     4909+  echo "$as_me:5319: \$? = $ac_status" >&5
    47714910   (exit $ac_status); }; }; then
    47724911   cf_cv_ldflags_search_paths_first=yes
    47734912 else
    4774 @@ -5068,7 +5319,7 @@
     4913@@ -5068,7 +5327,7 @@
    47754914 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    47764915                                LDFLAGS=$cf_save_LDFLAGS
    47774916 fi
    47784917-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    4779 +echo "$as_me:5322: result: $cf_cv_ldflags_search_paths_first" >&5
     4918+echo "$as_me:5330: result: $cf_cv_ldflags_search_paths_first" >&5
    47804919 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    47814920                if test $cf_cv_ldflags_search_paths_first = yes; then
    47824921                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    4783 @@ -5090,10 +5341,10 @@
     4922@@ -5090,10 +5349,10 @@
    47844923        irix*)
    47854924                if test "$cf_cv_ld_rpath" = yes ; then
    … …  
    47944933                        fi
    47954934                fi
    4796 @@ -5112,7 +5363,7 @@
     4935@@ -5112,7 +5371,7 @@
    47974936                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47984937                fi
    … …  
    48034942                fi
    48044943 
    4805 @@ -5131,7 +5382,7 @@
     4944@@ -5131,7 +5390,7 @@
    48064945                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48074946                fi
    … …  
    48124951                fi
    48134952                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4814 @@ -5143,7 +5394,7 @@
     4953@@ -5143,7 +5402,7 @@
    48154954                cf_cv_shared_soname='`basename $@`'
    48164955        fi
    … …  
    48214960        nto-qnx*|openbsd*|freebsd[12].*)
    48224961                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4823 @@ -5155,7 +5406,7 @@
     4962@@ -5155,7 +5414,7 @@
    48244963                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    48254964                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
    … …  
    48304969                fi
    48314970 
    4832 @@ -5166,11 +5417,11 @@
     4971@@ -5166,11 +5425,11 @@
    48334972                cf_cv_shared_soname='`basename $@`'
    48344973        fi
    … …  
    48444983                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    48454984                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    4846 @@ -5192,7 +5443,7 @@
     4985@@ -5192,7 +5451,7 @@
    48474986 
    48484987                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
    … …  
    48534992                ;;
    48544993        osf*|mls+*)
    4855 @@ -5211,7 +5462,7 @@
     4994@@ -5211,7 +5470,7 @@
    48564995                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48574996                fi
    … …  
    48625001                fi
    48635002                cf_cv_rm_so_locs=yes
    4864 @@ -5246,7 +5497,7 @@
     5003@@ -5246,7 +5505,7 @@
    48655004                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48665005                fi
    … …  
    48715010                fi
    48725011 
    4873 @@ -5258,7 +5509,43 @@
     5012@@ -5258,7 +5517,43 @@
    48745013        fi
    48755014 
    … …  
    48815020+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
    48825021+                               cat >conftest.$ac_ext <<_ACEOF
    4883 +#line 5517 "configure"
     5022+#line 5525 "configure"
    48845023+#include "confdefs.h"
    48855024+#include <stdio.h>
    … …  
    48935032+_ACEOF
    48945033+rm -f conftest.$ac_objext
    4895 +if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5
     5034+if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5
    48965035+  (eval $ac_compile) 2>&5
    48975036+  ac_status=$?
    4898 +  echo "$as_me:5532: \$? = $ac_status" >&5
     5037+  echo "$as_me:5540: \$? = $ac_status" >&5
    48995038+  (exit $ac_status); } &&
    49005039+         { ac_try='test -s conftest.$ac_objext'
    4901 +  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
     5040+  { (eval echo "$as_me:5543: \"$ac_try\"") >&5
    49025041+  (eval $ac_try) 2>&5
    49035042+  ac_status=$?
    4904 +  echo "$as_me:5538: \$? = $ac_status" >&5
     5043+  echo "$as_me:5546: \$? = $ac_status" >&5
    49055044+  (exit $ac_status); }; }; then
    49065045+  break
    … …  
    49165055                else
    49175056                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
    4918 @@ -5285,20 +5572,20 @@
     5057@@ -5285,20 +5580,20 @@
    49195058                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    49205059                        ;;
    49215060                *)
    49225061-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    4923 +                       { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5
     5062+                       { echo "$as_me:5583: WARNING: ignored --with-shlib-version" >&5
    49245063 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    49255064                        ;;
    … …  
    49315070-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    49325071+       if test -n "$LD_RPATH_OPT" ; then
    4933 +               echo "$as_me:5583: checking if we need a space after rpath option" >&5
     5072+               echo "$as_me:5591: checking if we need a space after rpath option" >&5
    49345073 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    49355074                cf_save_LIBS="$LIBS"
    … …  
    49385077                cat >conftest.$ac_ext <<_ACEOF
    49395078-#line 5301 "configure"
    4940 +#line 5588 "configure"
     5079+#line 5596 "configure"
    49415080 #include "confdefs.h"
    49425081 
    49435082 int
    4944 @@ -5310,16 +5597,16 @@
     5083@@ -5310,16 +5605,16 @@
    49455084 }
    49465085 _ACEOF
    49475086 rm -f conftest.$ac_objext conftest$ac_exeext
    49485087-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    4949 +if { (eval echo "$as_me:5600: \"$ac_link\"") >&5
     5088+if { (eval echo "$as_me:5608: \"$ac_link\"") >&5
    49505089   (eval $ac_link) 2>&5
    49515090   ac_status=$?
    49525091-  echo "$as_me:5316: \$? = $ac_status" >&5
    4953 +  echo "$as_me:5603: \$? = $ac_status" >&5
     5092+  echo "$as_me:5611: \$? = $ac_status" >&5
    49545093   (exit $ac_status); } &&
    49555094          { ac_try='test -s conftest$ac_exeext'
    49565095-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    4957 +  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
     5096+  { (eval echo "$as_me:5614: \"$ac_try\"") >&5
    49585097   (eval $ac_try) 2>&5
    49595098   ac_status=$?
    49605099-  echo "$as_me:5322: \$? = $ac_status" >&5
    4961 +  echo "$as_me:5609: \$? = $ac_status" >&5
     5100+  echo "$as_me:5617: \$? = $ac_status" >&5
    49625101   (exit $ac_status); }; }; then
    49635102   cf_rpath_space=no
    49645103 else
    4965 @@ -5329,16 +5616,16 @@
     5104@@ -5329,16 +5624,16 @@
    49665105 fi
    49675106 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    49685107                LIBS="$cf_save_LIBS"
    49695108-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    4970 +               echo "$as_me:5619: result: $cf_rpath_space" >&5
     5109+               echo "$as_me:5627: result: $cf_rpath_space" >&5
    49715110 echo "${ECHO_T}$cf_rpath_space" >&6
    49725111-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
    … …  
    49805119                if test "$model" = "shared"; then
    49815120-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    4982 +                       { { echo "$as_me:5628: error: Shared libraries are not supported in this version" >&5
     5121+                       { { echo "$as_me:5636: error: Shared libraries are not supported in this version" >&5
    49835122 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    49845123    { (exit 1); exit 1; }; }
    49855124                fi
    4986 @@ -5348,7 +5635,7 @@
     5125@@ -5348,7 +5643,7 @@
    49875126 ###############################################################################
    49885127 
    49895128 ###    use option --disable-overwrite to leave out the link to -lcurses
    49905129-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    4991 +echo "$as_me:5638: checking if you wish to install ncurses overwriting curses" >&5
     5130+echo "$as_me:5646: checking if you wish to install ncurses overwriting curses" >&5
    49925131 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    49935132 
    49945133 # Check whether --enable-overwrite or --disable-overwrite was given.
    4995 @@ -5358,10 +5645,10 @@
     5134@@ -5358,10 +5653,10 @@
    49965135 else
    49975136   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    49985137 fi;
    49995138-echo "$as_me:5361: result: $with_overwrite" >&5
    5000 +echo "$as_me:5648: result: $with_overwrite" >&5
     5139+echo "$as_me:5656: result: $with_overwrite" >&5
    50015140 echo "${ECHO_T}$with_overwrite" >&6
    50025141 
    50035142-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    5004 +echo "$as_me:5651: checking if external terminfo-database is used" >&5
     5143+echo "$as_me:5659: checking if external terminfo-database is used" >&5
    50055144 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    50065145 
    50075146 # Check whether --enable-database or --disable-database was given.
    5008 @@ -5371,7 +5658,7 @@
     5147@@ -5371,7 +5666,7 @@
    50095148 else
    50105149   use_database=yes
    50115150 fi;
    50125151-echo "$as_me:5374: result: $use_database" >&5
    5013 +echo "$as_me:5661: result: $use_database" >&5
     5152+echo "$as_me:5669: result: $use_database" >&5
    50145153 echo "${ECHO_T}$use_database" >&6
    50155154 
    50165155 case $host_os in #(vi
    5017 @@ -5384,8 +5671,8 @@
     5156@@ -5384,8 +5679,8 @@
    50185157 esac
    50195158 
    … …  
    50265165 
    50275166 if test "$use_database" != no ; then
    5028 @@ -5393,7 +5680,7 @@
     5167@@ -5393,7 +5688,7 @@
    50295168 #define USE_DATABASE 1
    50305169 EOF
    50315170 
    50325171-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    5033 +       echo "$as_me:5683: checking which terminfo source-file will be installed" >&5
     5172+       echo "$as_me:5691: checking which terminfo source-file will be installed" >&5
    50345173 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    50355174 
    50365175 # Check whether --enable-database or --disable-database was given.
    5037 @@ -5401,10 +5688,10 @@
     5176@@ -5401,10 +5696,10 @@
    50385177   enableval="$enable_database"
    50395178   TERMINFO_SRC=$withval
    50405179 fi;
    50415180-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    5042 +       echo "$as_me:5691: result: $TERMINFO_SRC" >&5
     5181+       echo "$as_me:5699: result: $TERMINFO_SRC" >&5
    50435182 echo "${ECHO_T}$TERMINFO_SRC" >&6
    50445183 
    50455184-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    5046 +       echo "$as_me:5694: checking whether to use hashed database instead of directory/tree" >&5
     5185+       echo "$as_me:5702: checking whether to use hashed database instead of directory/tree" >&5
    50475186 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    50485187 
    50495188 # Check whether --with-hashed-db or --without-hashed-db was given.
    5050 @@ -5414,13 +5701,13 @@
     5189@@ -5414,13 +5709,13 @@
    50515190 else
    50525191   with_hashed_db=no
    50535192 fi;
    50545193-       echo "$as_me:5417: result: $with_hashed_db" >&5
    5055 +       echo "$as_me:5704: result: $with_hashed_db" >&5
     5194+       echo "$as_me:5712: result: $with_hashed_db" >&5
    50565195 echo "${ECHO_T}$with_hashed_db" >&6
    50575196 else
    … …  
    50605199 
    50615200-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    5062 +echo "$as_me:5710: checking for list of fallback descriptions" >&5
     5201+echo "$as_me:5718: checking for list of fallback descriptions" >&5
    50635202 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    50645203 
    50655204 # Check whether --with-fallbacks or --without-fallbacks was given.
    5066 @@ -5430,11 +5717,11 @@
     5205@@ -5430,11 +5725,11 @@
    50675206 else
    50685207   with_fallback=
    50695208 fi;
    50705209-echo "$as_me:5433: result: $with_fallback" >&5
    5071 +echo "$as_me:5720: result: $with_fallback" >&5
     5210+echo "$as_me:5728: result: $with_fallback" >&5
    50725211 echo "${ECHO_T}$with_fallback" >&6
    50735212 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    50745213 
    50755214-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    5076 +echo "$as_me:5724: checking if you want modern xterm or antique" >&5
     5215+echo "$as_me:5732: checking if you want modern xterm or antique" >&5
    50775216 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    50785217 
    50795218 # Check whether --with-xterm-new or --without-xterm-new was given.
    5080 @@ -5448,7 +5735,7 @@
     5219@@ -5448,7 +5743,7 @@
    50815220 no)    with_xterm_new=xterm-old;;
    50825221 *)     with_xterm_new=xterm-new;;
    50835222 esac
    50845223-echo "$as_me:5451: result: $with_xterm_new" >&5
    5085 +echo "$as_me:5738: result: $with_xterm_new" >&5
     5224+echo "$as_me:5746: result: $with_xterm_new" >&5
    50865225 echo "${ECHO_T}$with_xterm_new" >&6
    50875226 WHICH_XTERM=$with_xterm_new
    50885227 
    5089 @@ -5458,7 +5745,7 @@
     5228@@ -5458,7 +5753,7 @@
    50905229        MAKE_TERMINFO="#"
    50915230 else
    50925231 
    50935232-echo "$as_me:5461: checking for list of terminfo directories" >&5
    5094 +echo "$as_me:5748: checking for list of terminfo directories" >&5
     5233+echo "$as_me:5756: checking for list of terminfo directories" >&5
    50955234 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    50965235 
    50975236 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    5098 @@ -5468,7 +5755,7 @@
     5237@@ -5468,7 +5763,7 @@
    50995238 else
    51005239   withval=${TERMINFO_DIRS-${datadir}/terminfo}
    … …  
    51055244 for cf_src_path in $withval
    51065245 do
    5107 @@ -5498,7 +5785,7 @@
     5246@@ -5498,7 +5793,7 @@
    51085247   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    51095248   ;;
    51105249 *)
    51115250-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    5112 +  { { echo "$as_me:5788: error: expected a pathname, not \"$cf_src_path\"" >&5
     5251+  { { echo "$as_me:5796: error: expected a pathname, not \"$cf_src_path\"" >&5
    51135252 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    51145253    { (exit 1); exit 1; }; }
    51155254   ;;
    5116 @@ -5511,13 +5798,13 @@
     5255@@ -5511,13 +5806,13 @@
    51175256 
    51185257 eval 'TERMINFO_DIRS="$cf_dst_path"'
    51195258 
    51205259-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    5121 +echo "$as_me:5801: result: $TERMINFO_DIRS" >&5
     5260+echo "$as_me:5809: result: $TERMINFO_DIRS" >&5
    51225261 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    51235262 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
    … …  
    51265265 
    51275266-echo "$as_me:5520: checking for default terminfo directory" >&5
    5128 +echo "$as_me:5807: checking for default terminfo directory" >&5
     5267+echo "$as_me:5815: checking for default terminfo directory" >&5
    51295268 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    51305269 
    51315270 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    5132 @@ -5553,7 +5840,7 @@
     5271@@ -5553,7 +5848,7 @@
    51335272   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    51345273   ;;
    51355274 *)
    51365275-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    5137 +  { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5
     5276+  { { echo "$as_me:5851: error: expected a pathname, not \"$withval\"" >&5
    51385277 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    51395278    { (exit 1); exit 1; }; }
    51405279   ;;
    5141 @@ -5562,7 +5849,7 @@
     5280@@ -5562,7 +5857,7 @@
    51425281 fi
    51435282 TERMINFO="$withval"
    51445283 
    51455284-echo "$as_me:5565: result: $TERMINFO" >&5
    5146 +echo "$as_me:5852: result: $TERMINFO" >&5
     5285+echo "$as_me:5860: result: $TERMINFO" >&5
    51475286 echo "${ECHO_T}$TERMINFO" >&6
    51485287 cat >>confdefs.h <<EOF
    51495288 #define TERMINFO "$TERMINFO"
    5150 @@ -5572,7 +5859,7 @@
     5289@@ -5572,7 +5867,7 @@
    51515290 
    51525291 ###    use option --disable-big-core to make tic run on small machines
    51535292 ###    We need 4Mb, check if we can allocate 50% more than that.
    51545293-echo "$as_me:5575: checking if big-core option selected" >&5
    5155 +echo "$as_me:5862: checking if big-core option selected" >&5
     5294+echo "$as_me:5870: checking if big-core option selected" >&5
    51565295 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    51575296 
    51585297 # Check whether --enable-big-core or --disable-big-core was given.
    5159 @@ -5584,7 +5871,7 @@
     5298@@ -5584,7 +5879,7 @@
    51605299   with_big_core=no
    51615300 else
    51625301   cat >conftest.$ac_ext <<_ACEOF
    51635302-#line 5587 "configure"
    5164 +#line 5874 "configure"
     5303+#line 5882 "configure"
    51655304 #include "confdefs.h"
    51665305 
    51675306 #include <stdlib.h>
    5168 @@ -5598,15 +5885,15 @@
     5307@@ -5598,15 +5893,15 @@
    51695308 }
    51705309 _ACEOF
    51715310 rm -f conftest$ac_exeext
    51725311-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    5173 +if { (eval echo "$as_me:5888: \"$ac_link\"") >&5
     5312+if { (eval echo "$as_me:5896: \"$ac_link\"") >&5
    51745313   (eval $ac_link) 2>&5
    51755314   ac_status=$?
    51765315-  echo "$as_me:5604: \$? = $ac_status" >&5
    5177 +  echo "$as_me:5891: \$? = $ac_status" >&5
     5316+  echo "$as_me:5899: \$? = $ac_status" >&5
    51785317   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    51795318-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    5180 +  { (eval echo "$as_me:5893: \"$ac_try\"") >&5
     5319+  { (eval echo "$as_me:5901: \"$ac_try\"") >&5
    51815320   (eval $ac_try) 2>&5
    51825321   ac_status=$?
    51835322-  echo "$as_me:5609: \$? = $ac_status" >&5
    5184 +  echo "$as_me:5896: \$? = $ac_status" >&5
     5323+  echo "$as_me:5904: \$? = $ac_status" >&5
    51855324   (exit $ac_status); }; }; then
    51865325   with_big_core=yes
    51875326 else
    5188 @@ -5618,7 +5905,7 @@
     5327@@ -5618,7 +5913,7 @@
    51895328 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    51905329 fi
    51915330 fi;
    51925331-echo "$as_me:5621: result: $with_big_core" >&5
    5193 +echo "$as_me:5908: result: $with_big_core" >&5
     5332+echo "$as_me:5916: result: $with_big_core" >&5
    51945333 echo "${ECHO_T}$with_big_core" >&6
    51955334 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    51965335 #define HAVE_BIG_CORE 1
    5197 @@ -5627,7 +5914,7 @@
     5336@@ -5627,7 +5922,7 @@
    51985337 ### ISO C only guarantees 512-char strings, we have tables which load faster
    51995338 ### when constructed using "big" strings.  More than the C compiler, the awk
    52005339 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    52015340-echo "$as_me:5630: checking if big-strings option selected" >&5
    5202 +echo "$as_me:5917: checking if big-strings option selected" >&5
     5341+echo "$as_me:5925: checking if big-strings option selected" >&5
    52035342 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    52045343 
    52055344 # Check whether --enable-big-strings or --disable-big-strings was given.
    5206 @@ -5636,29 +5923,29 @@
     5345@@ -5636,29 +5931,29 @@
    52075346   with_big_strings=$enableval
    52085347 else
    … …  
    52375376 fi;
    52385377-echo "$as_me:5654: result: $with_big_strings" >&5
    5239 +echo "$as_me:5941: result: $with_big_strings" >&5
     5378+echo "$as_me:5949: result: $with_big_strings" >&5
    52405379 echo "${ECHO_T}$with_big_strings" >&6
    52415380 
    … …  
    52455384 ###    use option --enable-termcap to compile in the termcap fallback support
    52465385-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    5247 +echo "$as_me:5948: checking if you want termcap-fallback support" >&5
     5386+echo "$as_me:5956: checking if you want termcap-fallback support" >&5
    52485387 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    52495388 
    52505389 # Check whether --enable-termcap or --disable-termcap was given.
    5251 @@ -5668,13 +5955,13 @@
     5390@@ -5668,13 +5963,13 @@
    52525391 else
    52535392   with_termcap=no
    52545393 fi;
    52555394-echo "$as_me:5671: result: $with_termcap" >&5
    5256 +echo "$as_me:5958: result: $with_termcap" >&5
     5395+echo "$as_me:5966: result: $with_termcap" >&5
    52575396 echo "${ECHO_T}$with_termcap" >&6
    52585397 
    … …  
    52615400                if test -z "$with_fallback" ; then
    52625401-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    5263 +                       { { echo "$as_me:5964: error: You have disabled the database w/o specifying fallbacks" >&5
     5402+                       { { echo "$as_me:5972: error: You have disabled the database w/o specifying fallbacks" >&5
    52645403 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    52655404    { (exit 1); exit 1; }; }
    52665405                fi
    5267 @@ -5686,7 +5973,7 @@
     5406@@ -5686,7 +5981,7 @@
    52685407 else
    52695408 
    52705409 if test "$with_ticlib" != no ; then
    52715410-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    5272 +       { { echo "$as_me:5976: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
     5411+       { { echo "$as_me:5984: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    52735412 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    52745413    { (exit 1); exit 1; }; }
    52755414 fi
    5276 @@ -5695,7 +5982,7 @@
     5415@@ -5695,7 +5990,7 @@
    52775416 #define USE_TERMCAP 1
    52785417 EOF
    52795418 
    52805419-echo "$as_me:5698: checking for list of termcap files" >&5
    5281 +echo "$as_me:5985: checking for list of termcap files" >&5
     5420+echo "$as_me:5993: checking for list of termcap files" >&5
    52825421 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    52835422 
    52845423 # Check whether --with-termpath or --without-termpath was given.
    5285 @@ -5705,7 +5992,7 @@
     5424@@ -5705,7 +6000,7 @@
    52865425 else
    52875426   withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
    … …  
    52925431 for cf_src_path in $withval
    52935432 do
    5294 @@ -5735,7 +6022,7 @@
     5433@@ -5735,7 +6030,7 @@
    52955434   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    52965435   ;;
    52975436 *)
    52985437-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    5299 +  { { echo "$as_me:6025: error: expected a pathname, not \"$cf_src_path\"" >&5
     5438+  { { echo "$as_me:6033: error: expected a pathname, not \"$cf_src_path\"" >&5
    53005439 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    53015440    { (exit 1); exit 1; }; }
    53025441   ;;
    5303 @@ -5748,14 +6035,14 @@
     5442@@ -5748,14 +6043,14 @@
    53045443 
    53055444 eval 'TERMPATH="$cf_dst_path"'
    53065445 
    53075446-echo "$as_me:5751: result: $TERMPATH" >&5
    5308 +echo "$as_me:6038: result: $TERMPATH" >&5
     5447+echo "$as_me:6046: result: $TERMPATH" >&5
    53095448 echo "${ECHO_T}$TERMPATH" >&6
    53105449 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
    … …  
    53145453 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    53155454-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    5316 +echo "$as_me:6045: checking if fast termcap-loader is needed" >&5
     5455+echo "$as_me:6053: checking if fast termcap-loader is needed" >&5
    53175456 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    53185457 
    53195458 # Check whether --enable-getcap or --disable-getcap was given.
    5320 @@ -5765,13 +6052,13 @@
     5459@@ -5765,13 +6060,13 @@
    53215460 else
    53225461   with_getcap=no
    53235462 fi;
    53245463-echo "$as_me:5768: result: $with_getcap" >&5
    5325 +echo "$as_me:6055: result: $with_getcap" >&5
     5464+echo "$as_me:6063: result: $with_getcap" >&5
    53265465 echo "${ECHO_T}$with_getcap" >&6
    53275466 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    53305469 
    53315470-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    5332 +echo "$as_me:6061: checking if translated termcaps will be cached in ~/.terminfo" >&5
     5471+echo "$as_me:6069: checking if translated termcaps will be cached in ~/.terminfo" >&5
    53335472 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    53345473 
    53355474 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    5336 @@ -5781,7 +6068,7 @@
     5475@@ -5781,7 +6076,7 @@
    53375476 else
    53385477   with_getcap_cache=no
    53395478 fi;
    53405479-echo "$as_me:5784: result: $with_getcap_cache" >&5
    5341 +echo "$as_me:6071: result: $with_getcap_cache" >&5
     5480+echo "$as_me:6079: result: $with_getcap_cache" >&5
    53425481 echo "${ECHO_T}$with_getcap_cache" >&6
    53435482 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    53445483 #define USE_GETCAP_CACHE 1
    5345 @@ -5790,7 +6077,7 @@
     5484@@ -5790,7 +6085,7 @@
    53465485 fi
    53475486 
    53485487 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    53495488-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    5350 +echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5
     5489+echo "$as_me:6088: checking if ~/.terminfo is wanted" >&5
    53515490 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    53525491 
    53535492 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    5354 @@ -5800,13 +6087,13 @@
     5493@@ -5800,13 +6095,13 @@
    53555494 else
    53565495   with_home_terminfo=yes
    53575496 fi;
    53585497-echo "$as_me:5803: result: $with_home_terminfo" >&5
    5359 +echo "$as_me:6090: result: $with_home_terminfo" >&5
     5498+echo "$as_me:6098: result: $with_home_terminfo" >&5
    53605499 echo "${ECHO_T}$with_home_terminfo" >&6
    53615500 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    53645503 
    53655504-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    5366 +echo "$as_me:6096: checking if you want to use restricted environment when running as root" >&5
     5505+echo "$as_me:6104: checking if you want to use restricted environment when running as root" >&5
    53675506 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    53685507 
    53695508 # Check whether --enable-root-environ or --disable-root-environ was given.
    5370 @@ -5816,7 +6103,7 @@
     5509@@ -5816,7 +6111,7 @@
    53715510 else
    53725511   with_root_environ=yes
    53735512 fi;
    53745513-echo "$as_me:5819: result: $with_root_environ" >&5
    5375 +echo "$as_me:6106: result: $with_root_environ" >&5
     5514+echo "$as_me:6114: result: $with_root_environ" >&5
    53765515 echo "${ECHO_T}$with_root_environ" >&6
    53775516 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    53785517 #define USE_ROOT_ENVIRON 1
    5379 @@ -5830,13 +6117,13 @@
     5518@@ -5830,13 +6125,13 @@
    53805519        unlink
    53815520 do
    53825521 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    53835522-echo "$as_me:5833: checking for $ac_func" >&5
    5384 +echo "$as_me:6120: checking for $ac_func" >&5
     5523+echo "$as_me:6128: checking for $ac_func" >&5
    53855524 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    53865525 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    53895528   cat >conftest.$ac_ext <<_ACEOF
    53905529-#line 5839 "configure"
    5391 +#line 6126 "configure"
     5530+#line 6134 "configure"
    53925531 #include "confdefs.h"
    53935532 /* System header to define __stub macros and hopefully few prototypes,
    53945533     which can conflict with char $ac_func (); below.  */
    5395 @@ -5867,16 +6154,16 @@
     5534@@ -5867,16 +6162,16 @@
    53965535 }
    53975536 _ACEOF
    53985537 rm -f conftest.$ac_objext conftest$ac_exeext
    53995538-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    5400 +if { (eval echo "$as_me:6157: \"$ac_link\"") >&5
     5539+if { (eval echo "$as_me:6165: \"$ac_link\"") >&5
    54015540   (eval $ac_link) 2>&5
    54025541   ac_status=$?
    54035542-  echo "$as_me:5873: \$? = $ac_status" >&5
    5404 +  echo "$as_me:6160: \$? = $ac_status" >&5
     5543+  echo "$as_me:6168: \$? = $ac_status" >&5
    54055544   (exit $ac_status); } &&
    54065545          { ac_try='test -s conftest$ac_exeext'
    54075546-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    5408 +  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
     5547+  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
    54095548   (eval $ac_try) 2>&5
    54105549   ac_status=$?
    54115550-  echo "$as_me:5879: \$? = $ac_status" >&5
    5412 +  echo "$as_me:6166: \$? = $ac_status" >&5
     5551+  echo "$as_me:6174: \$? = $ac_status" >&5
    54135552   (exit $ac_status); }; }; then
    54145553   eval "$as_ac_var=yes"
    54155554 else
    5416 @@ -5886,7 +6173,7 @@
     5555@@ -5886,7 +6181,7 @@
    54175556 fi
    54185557 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54195558 fi
    54205559-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    5421 +echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5
     5560+echo "$as_me:6184: result: `eval echo '${'$as_ac_var'}'`" >&5
    54225561 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54235562 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54245563   cat >>confdefs.h <<EOF
    5425 @@ -5903,13 +6190,13 @@
     5564@@ -5903,13 +6198,13 @@
    54265565                symlink
    54275566 do
    54285567 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    54295568-echo "$as_me:5906: checking for $ac_func" >&5
    5430 +echo "$as_me:6193: checking for $ac_func" >&5
     5569+echo "$as_me:6201: checking for $ac_func" >&5
    54315570 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    54325571 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    54355574   cat >conftest.$ac_ext <<_ACEOF
    54365575-#line 5912 "configure"
    5437 +#line 6199 "configure"
     5576+#line 6207 "configure"
    54385577 #include "confdefs.h"
    54395578 /* System header to define __stub macros and hopefully few prototypes,
    54405579     which can conflict with char $ac_func (); below.  */
    5441 @@ -5940,16 +6227,16 @@
     5580@@ -5940,16 +6235,16 @@
    54425581 }
    54435582 _ACEOF
    54445583 rm -f conftest.$ac_objext conftest$ac_exeext
    54455584-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    5446 +if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
     5585+if { (eval echo "$as_me:6238: \"$ac_link\"") >&5
    54475586   (eval $ac_link) 2>&5
    54485587   ac_status=$?
    54495588-  echo "$as_me:5946: \$? = $ac_status" >&5
    5450 +  echo "$as_me:6233: \$? = $ac_status" >&5
     5589+  echo "$as_me:6241: \$? = $ac_status" >&5
    54515590   (exit $ac_status); } &&
    54525591          { ac_try='test -s conftest$ac_exeext'
    54535592-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    5454 +  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
     5593+  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
    54555594   (eval $ac_try) 2>&5
    54565595   ac_status=$?
    54575596-  echo "$as_me:5952: \$? = $ac_status" >&5
    5458 +  echo "$as_me:6239: \$? = $ac_status" >&5
     5597+  echo "$as_me:6247: \$? = $ac_status" >&5
    54595598   (exit $ac_status); }; }; then
    54605599   eval "$as_ac_var=yes"
    54615600 else
    5462 @@ -5959,7 +6246,7 @@
     5601@@ -5959,7 +6254,7 @@
    54635602 fi
    54645603 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54655604 fi
    54665605-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    5467 +echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5
     5606+echo "$as_me:6257: result: `eval echo '${'$as_ac_var'}'`" >&5
    54685607 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54695608 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54705609   cat >>confdefs.h <<EOF
    5471 @@ -5970,7 +6257,7 @@
     5610@@ -5970,7 +6265,7 @@
    54725611 done
    54735612 
    54745613 else
    54755614-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    5476 +       echo "$as_me:6260: checking if link/symlink functions work" >&5
     5615+       echo "$as_me:6268: checking if link/symlink functions work" >&5
    54775616 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    54785617 if test "${cf_cv_link_funcs+set}" = set; then
    54795618   echo $ECHO_N "(cached) $ECHO_C" >&6
    5480 @@ -5983,7 +6270,7 @@
     5619@@ -5983,7 +6278,7 @@
    54815620                        eval 'ac_cv_func_'$cf_func'=error'
    54825621 else
    54835622   cat >conftest.$ac_ext <<_ACEOF
    54845623-#line 5986 "configure"
    5485 +#line 6273 "configure"
     5624+#line 6281 "configure"
    54865625 #include "confdefs.h"
    54875626 
    54885627 #include <sys/types.h>
    5489 @@ -6013,15 +6300,15 @@
     5628@@ -6013,15 +6308,15 @@
    54905629 
    54915630 _ACEOF
    54925631 rm -f conftest$ac_exeext
    54935632-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    5494 +if { (eval echo "$as_me:6303: \"$ac_link\"") >&5
     5633+if { (eval echo "$as_me:6311: \"$ac_link\"") >&5
    54955634   (eval $ac_link) 2>&5
    54965635   ac_status=$?
    54975636-  echo "$as_me:6019: \$? = $ac_status" >&5
    5498 +  echo "$as_me:6306: \$? = $ac_status" >&5
     5637+  echo "$as_me:6314: \$? = $ac_status" >&5
    54995638   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    55005639-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    5501 +  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
     5640+  { (eval echo "$as_me:6316: \"$ac_try\"") >&5
    55025641   (eval $ac_try) 2>&5
    55035642   ac_status=$?
    55045643-  echo "$as_me:6024: \$? = $ac_status" >&5
    5505 +  echo "$as_me:6311: \$? = $ac_status" >&5
     5644+  echo "$as_me:6319: \$? = $ac_status" >&5
    55065645   (exit $ac_status); }; }; then
    55075646 
    55085647                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    5509 @@ -6039,7 +6326,7 @@
     5648@@ -6039,7 +6334,7 @@
    55105649                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    55115650 
    55125651 fi
    55135652-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    5514 +echo "$as_me:6329: result: $cf_cv_link_funcs" >&5
     5653+echo "$as_me:6337: result: $cf_cv_link_funcs" >&5
    55155654 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    55165655        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    55175656 #define HAVE_LINK 1
    5518 @@ -6057,7 +6344,7 @@
     5657@@ -6057,7 +6352,7 @@
    55195658 # soft links (symbolic links) are useful for some systems where hard links do
    55205659 # not work, or to make it simpler to copy terminfo trees around.
    55215660 if test "$ac_cv_func_symlink" = yes ; then
    55225661-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    5523 +    echo "$as_me:6347: checking if tic should use symbolic links" >&5
     5662+    echo "$as_me:6355: checking if tic should use symbolic links" >&5
    55245663 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    55255664 
    55265665 # Check whether --enable-symlinks or --disable-symlinks was given.
    5527 @@ -6067,21 +6354,21 @@
     5666@@ -6067,21 +6362,21 @@
    55285667 else
    55295668   with_symlinks=no
    55305669 fi;
    55315670-    echo "$as_me:6070: result: $with_symlinks" >&5
    5532 +    echo "$as_me:6357: result: $with_symlinks" >&5
     5671+    echo "$as_me:6365: result: $with_symlinks" >&5
    55335672 echo "${ECHO_T}$with_symlinks" >&6
    55345673 fi
    … …  
    55385677 if test "$with_symlinks" = no ; then
    55395678-    echo "$as_me:6077: checking if tic should use hard links" >&5
    5540 +    echo "$as_me:6364: checking if tic should use hard links" >&5
     5679+    echo "$as_me:6372: checking if tic should use hard links" >&5
    55415680 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    55425681     if test "$ac_cv_func_link" = yes ; then
    … …  
    55465685     fi
    55475686-    echo "$as_me:6084: result: $with_links" >&5
    5548 +    echo "$as_me:6371: result: $with_links" >&5
     5687+    echo "$as_me:6379: result: $with_links" >&5
    55495688 echo "${ECHO_T}$with_links" >&6
    55505689 fi
    55515690 
    5552 @@ -6094,7 +6381,7 @@
     5691@@ -6094,7 +6389,7 @@
    55535692 EOF
    55545693 
    55555694 ###   use option --enable-broken-linker to force on use of broken-linker support
    55565695-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    5557 +echo "$as_me:6384: checking if you want broken-linker support code" >&5
     5696+echo "$as_me:6392: checking if you want broken-linker support code" >&5
    55585697 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    55595698 
    55605699 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    5561 @@ -6104,7 +6391,7 @@
     5700@@ -6104,7 +6399,7 @@
    55625701 else
    55635702   with_broken_linker=${BROKEN_LINKER-no}
    55645703 fi;
    55655704-echo "$as_me:6107: result: $with_broken_linker" >&5
    5566 +echo "$as_me:6394: result: $with_broken_linker" >&5
     5705+echo "$as_me:6402: result: $with_broken_linker" >&5
    55675706 echo "${ECHO_T}$with_broken_linker" >&6
    55685707 
    55695708 BROKEN_LINKER=0
    5570 @@ -6124,14 +6411,14 @@
     5709@@ -6124,14 +6419,14 @@
    55715710                BROKEN_LINKER=1
    55725711                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    55735712 
    55745713-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    5575 +echo "${as_me-configure}:6414: testing cygwin linker is broken anyway ..." 1>&5
     5714+echo "${as_me-configure}:6422: testing cygwin linker is broken anyway ..." 1>&5
    55765715 
    55775716                ;;
    … …  
    55815720 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    55825721-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    5583 +echo "$as_me:6421: checking if tputs should process BSD-style prefix padding" >&5
     5722+echo "$as_me:6429: checking if tputs should process BSD-style prefix padding" >&5
    55845723 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    55855724 
    55865725 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    5587 @@ -6141,7 +6428,7 @@
     5726@@ -6141,7 +6436,7 @@
    55885727 else
    55895728   with_bsdpad=no
    55905729 fi;
    55915730-echo "$as_me:6144: result: $with_bsdpad" >&5
    5592 +echo "$as_me:6431: result: $with_bsdpad" >&5
     5731+echo "$as_me:6439: result: $with_bsdpad" >&5
    55935732 echo "${ECHO_T}$with_bsdpad" >&6
    55945733 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    55955734 #define BSD_TPUTS 1
    5596 @@ -6158,7 +6445,7 @@
     5735@@ -6158,7 +6453,7 @@
    55975736 
    55985737 # Check to define _XOPEN_SOURCE "automatically"
    55995738 
    56005739-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    5601 +echo "$as_me:6448: checking if $CC -U and -D options work together" >&5
     5740+echo "$as_me:6456: checking if $CC -U and -D options work together" >&5
    56025741 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    56035742 if test "${cf_cv_cc_u_d_options+set}" = set; then
    56045743   echo $ECHO_N "(cached) $ECHO_C" >&6
    5605 @@ -6167,7 +6454,7 @@
     5744@@ -6167,7 +6462,7 @@
    56065745        cf_save_CPPFLAGS="$CPPFLAGS"
    56075746        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    56085747        cat >conftest.$ac_ext <<_ACEOF
    56095748-#line 6170 "configure"
    5610 +#line 6457 "configure"
     5749+#line 6465 "configure"
    56115750 #include "confdefs.h"
    56125751 
    56135752 int
    5614 @@ -6186,16 +6473,16 @@
     5753@@ -6186,16 +6481,16 @@
    56155754 }
    56165755 _ACEOF
    56175756 rm -f conftest.$ac_objext
    56185757-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    5619 +if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5
     5758+if { (eval echo "$as_me:6484: \"$ac_compile\"") >&5
    56205759   (eval $ac_compile) 2>&5
    56215760   ac_status=$?
    56225761-  echo "$as_me:6192: \$? = $ac_status" >&5
    5623 +  echo "$as_me:6479: \$? = $ac_status" >&5
     5762+  echo "$as_me:6487: \$? = $ac_status" >&5
    56245763   (exit $ac_status); } &&
    56255764          { ac_try='test -s conftest.$ac_objext'
    56265765-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    5627 +  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
     5766+  { (eval echo "$as_me:6490: \"$ac_try\"") >&5
    56285767   (eval $ac_try) 2>&5
    56295768   ac_status=$?
    56305769-  echo "$as_me:6198: \$? = $ac_status" >&5
    5631 +  echo "$as_me:6485: \$? = $ac_status" >&5
     5770+  echo "$as_me:6493: \$? = $ac_status" >&5
    56325771   (exit $ac_status); }; }; then
    56335772 
    56345773        cf_cv_cc_u_d_options=yes
    5635 @@ -6209,14 +6496,14 @@
     5774@@ -6209,14 +6504,14 @@
    56365775        CPPFLAGS="$cf_save_CPPFLAGS"
    56375776 
    56385777 fi
    56395778-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    5640 +echo "$as_me:6499: result: $cf_cv_cc_u_d_options" >&5
     5779+echo "$as_me:6507: result: $cf_cv_cc_u_d_options" >&5
    56415780 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    56425781 
    … …  
    56505789        ;;
    56515790 freebsd*|dragonfly*) #(vi
    5652 @@ -6233,16 +6520,16 @@
     5791@@ -6233,16 +6528,16 @@
    56535792 irix[56].*) #(vi
    56545793        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    56585797 
    56595798-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    5660 +echo "$as_me:6525: checking if we must define _GNU_SOURCE" >&5
     5799+echo "$as_me:6533: checking if we must define _GNU_SOURCE" >&5
    56615800 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    56625801 if test "${cf_cv_gnu_source+set}" = set; then
    … …  
    56665805 cat >conftest.$ac_ext <<_ACEOF
    56675806-#line 6245 "configure"
    5668 +#line 6532 "configure"
     5807+#line 6540 "configure"
    56695808 #include "confdefs.h"
    56705809 #include <sys/types.h>
    56715810 int
    5672 @@ -6257,16 +6544,16 @@
     5811@@ -6257,16 +6552,16 @@
    56735812 }
    56745813 _ACEOF
    56755814 rm -f conftest.$ac_objext
    56765815-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    5677 +if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5
     5816+if { (eval echo "$as_me:6555: \"$ac_compile\"") >&5
    56785817   (eval $ac_compile) 2>&5
    56795818   ac_status=$?
    56805819-  echo "$as_me:6263: \$? = $ac_status" >&5
    5681 +  echo "$as_me:6550: \$? = $ac_status" >&5
     5820+  echo "$as_me:6558: \$? = $ac_status" >&5
    56825821   (exit $ac_status); } &&
    56835822          { ac_try='test -s conftest.$ac_objext'
    56845823-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    5685 +  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
     5824+  { (eval echo "$as_me:6561: \"$ac_try\"") >&5
    56865825   (eval $ac_try) 2>&5
    56875826   ac_status=$?
    56885827-  echo "$as_me:6269: \$? = $ac_status" >&5
    5689 +  echo "$as_me:6556: \$? = $ac_status" >&5
     5828+  echo "$as_me:6564: \$? = $ac_status" >&5
    56905829   (exit $ac_status); }; }; then
    56915830   cf_cv_gnu_source=no
    56925831 else
    5693 @@ -6275,7 +6562,7 @@
     5832@@ -6275,7 +6570,7 @@
    56945833 cf_save="$CPPFLAGS"
    56955834         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    56965835         cat >conftest.$ac_ext <<_ACEOF
    56975836-#line 6278 "configure"
    5698 +#line 6565 "configure"
     5837+#line 6573 "configure"
    56995838 #include "confdefs.h"
    57005839 #include <sys/types.h>
    57015840 int
    5702 @@ -6290,16 +6577,16 @@
     5841@@ -6290,16 +6585,16 @@
    57035842 }
    57045843 _ACEOF
    57055844 rm -f conftest.$ac_objext
    57065845-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
    5707 +if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5
     5846+if { (eval echo "$as_me:6588: \"$ac_compile\"") >&5
    57085847   (eval $ac_compile) 2>&5
    57095848   ac_status=$?
    57105849-  echo "$as_me:6296: \$? = $ac_status" >&5
    5711 +  echo "$as_me:6583: \$? = $ac_status" >&5
     5850+  echo "$as_me:6591: \$? = $ac_status" >&5
    57125851   (exit $ac_status); } &&
    57135852          { ac_try='test -s conftest.$ac_objext'
    57145853-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
    5715 +  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
     5854+  { (eval echo "$as_me:6594: \"$ac_try\"") >&5
    57165855   (eval $ac_try) 2>&5
    57175856   ac_status=$?
    57185857-  echo "$as_me:6302: \$? = $ac_status" >&5
    5719 +  echo "$as_me:6589: \$? = $ac_status" >&5
     5858+  echo "$as_me:6597: \$? = $ac_status" >&5
    57205859   (exit $ac_status); }; }; then
    57215860   cf_cv_gnu_source=no
    57225861 else
    5723 @@ -6314,7 +6601,7 @@
     5862@@ -6314,7 +6609,7 @@
    57245863 rm -f conftest.$ac_objext conftest.$ac_ext
    57255864 
    57265865 fi
    57275866-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
    5728 +echo "$as_me:6604: result: $cf_cv_gnu_source" >&5
     5867+echo "$as_me:6612: result: $cf_cv_gnu_source" >&5
    57295868 echo "${ECHO_T}$cf_cv_gnu_source" >&6
    57305869 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    57315870 
    5732 @@ -6341,14 +6628,14 @@
     5871@@ -6341,14 +6636,14 @@
    57335872        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
    57345873        ;;
    57355874 *)
    57365875-       echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
    5737 +       echo "$as_me:6631: checking if we should define _XOPEN_SOURCE" >&5
     5876+       echo "$as_me:6639: checking if we should define _XOPEN_SOURCE" >&5
    57385877 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
    57395878 if test "${cf_cv_xopen_source+set}" = set; then
    … …  
    57435882        cat >conftest.$ac_ext <<_ACEOF
    57445883-#line 6351 "configure"
    5745 +#line 6638 "configure"
     5884+#line 6646 "configure"
    57465885 #include "confdefs.h"
    57475886 #include <sys/types.h>
    57485887 int
    5749 @@ -6363,16 +6650,16 @@
     5888@@ -6363,16 +6658,16 @@
    57505889 }
    57515890 _ACEOF
    57525891 rm -f conftest.$ac_objext
    57535892-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
    5754 +if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5
     5893+if { (eval echo "$as_me:6661: \"$ac_compile\"") >&5
    57555894   (eval $ac_compile) 2>&5
    57565895   ac_status=$?
    57575896-  echo "$as_me:6369: \$? = $ac_status" >&5
    5758 +  echo "$as_me:6656: \$? = $ac_status" >&5
     5897+  echo "$as_me:6664: \$? = $ac_status" >&5
    57595898   (exit $ac_status); } &&
    57605899          { ac_try='test -s conftest.$ac_objext'
    57615900-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
    5762 +  { (eval echo "$as_me:6659: \"$ac_try\"") >&5
     5901+  { (eval echo "$as_me:6667: \"$ac_try\"") >&5
    57635902   (eval $ac_try) 2>&5
    57645903   ac_status=$?
    57655904-  echo "$as_me:6375: \$? = $ac_status" >&5
    5766 +  echo "$as_me:6662: \$? = $ac_status" >&5
     5905+  echo "$as_me:6670: \$? = $ac_status" >&5
    57675906   (exit $ac_status); }; }; then
    57685907   cf_cv_xopen_source=no
    57695908 else
    5770 @@ -6381,7 +6668,7 @@
     5909@@ -6381,7 +6676,7 @@
    57715910 cf_save="$CPPFLAGS"
    57725911         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
    57735912         cat >conftest.$ac_ext <<_ACEOF
    57745913-#line 6384 "configure"
    5775 +#line 6671 "configure"
     5914+#line 6679 "configure"
    57765915 #include "confdefs.h"
    57775916 #include <sys/types.h>
    57785917 int
    5779 @@ -6396,16 +6683,16 @@
     5918@@ -6396,16 +6691,16 @@
    57805919 }
    57815920 _ACEOF
    57825921 rm -f conftest.$ac_objext
    57835922-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
    5784 +if { (eval echo "$as_me:6686: \"$ac_compile\"") >&5
     5923+if { (eval echo "$as_me:6694: \"$ac_compile\"") >&5
    57855924   (eval $ac_compile) 2>&5
    57865925   ac_status=$?
    57875926-  echo "$as_me:6402: \$? = $ac_status" >&5
    5788 +  echo "$as_me:6689: \$? = $ac_status" >&5
     5927+  echo "$as_me:6697: \$? = $ac_status" >&5
    57895928   (exit $ac_status); } &&
    57905929          { ac_try='test -s conftest.$ac_objext'
    57915930-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
    5792 +  { (eval echo "$as_me:6692: \"$ac_try\"") >&5
     5931+  { (eval echo "$as_me:6700: \"$ac_try\"") >&5
    57935932   (eval $ac_try) 2>&5
    57945933   ac_status=$?
    57955934-  echo "$as_me:6408: \$? = $ac_status" >&5
    5796 +  echo "$as_me:6695: \$? = $ac_status" >&5
     5935+  echo "$as_me:6703: \$? = $ac_status" >&5
    57975936   (exit $ac_status); }; }; then
    57985937   cf_cv_xopen_source=no
    57995938 else
    5800 @@ -6420,7 +6707,7 @@
     5939@@ -6420,7 +6715,7 @@
    58015940 rm -f conftest.$ac_objext conftest.$ac_ext
    58025941 
    58035942 fi
    58045943-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
    5805 +echo "$as_me:6710: result: $cf_cv_xopen_source" >&5
     5944+echo "$as_me:6718: result: $cf_cv_xopen_source" >&5
    58065945 echo "${ECHO_T}$cf_cv_xopen_source" >&6
    58075946        if test "$cf_cv_xopen_source" != no ; then
    58085947 
    5809 @@ -6454,16 +6741,16 @@
     5948@@ -6454,16 +6749,16 @@
    58105949        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
    58115950                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
    58125951 
    58135952-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
    5814 +echo "$as_me:6744: checking if we should define _POSIX_C_SOURCE" >&5
     5953+echo "$as_me:6752: checking if we should define _POSIX_C_SOURCE" >&5
    58155954 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
    58165955 if test "${cf_cv_posix_c_source+set}" = set; then
    … …  
    58195958 
    58205959-echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
    5821 +echo "${as_me-configure}:6750: testing if the symbol is already defined go no further ..." 1>&5
     5960+echo "${as_me-configure}:6758: testing if the symbol is already defined go no further ..." 1>&5
    58225961 
    58235962        cat >conftest.$ac_ext <<_ACEOF
    58245963-#line 6466 "configure"
    5825 +#line 6753 "configure"
     5964+#line 6761 "configure"
    58265965 #include "confdefs.h"
    58275966 #include <sys/types.h>
    58285967 int
    5829 @@ -6478,16 +6765,16 @@
     5968@@ -6478,16 +6773,16 @@
    58305969 }
    58315970 _ACEOF
    58325971 rm -f conftest.$ac_objext
    58335972-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
    5834 +if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
     5973+if { (eval echo "$as_me:6776: \"$ac_compile\"") >&5
    58355974   (eval $ac_compile) 2>&5
    58365975   ac_status=$?
    58375976-  echo "$as_me:6484: \$? = $ac_status" >&5
    5838 +  echo "$as_me:6771: \$? = $ac_status" >&5
     5977+  echo "$as_me:6779: \$? = $ac_status" >&5
    58395978   (exit $ac_status); } &&
    58405979          { ac_try='test -s conftest.$ac_objext'
    58415980-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
    5842 +  { (eval echo "$as_me:6774: \"$ac_try\"") >&5
     5981+  { (eval echo "$as_me:6782: \"$ac_try\"") >&5
    58435982   (eval $ac_try) 2>&5
    58445983   ac_status=$?
    58455984-  echo "$as_me:6490: \$? = $ac_status" >&5
    5846 +  echo "$as_me:6777: \$? = $ac_status" >&5
     5985+  echo "$as_me:6785: \$? = $ac_status" >&5
    58475986   (exit $ac_status); }; }; then
    58485987   cf_cv_posix_c_source=no
    58495988 else
    5850 @@ -6508,7 +6795,7 @@
     5989@@ -6508,7 +6803,7 @@
    58515990         esac
    58525991         if test "$cf_want_posix_source" = yes ; then
    58535992                cat >conftest.$ac_ext <<_ACEOF
    58545993-#line 6511 "configure"
    5855 +#line 6798 "configure"
     5994+#line 6806 "configure"
    58565995 #include "confdefs.h"
    58575996 #include <sys/types.h>
    58585997 int
    5859 @@ -6523,16 +6810,16 @@
     5998@@ -6523,16 +6818,16 @@
    58605999 }
    58616000 _ACEOF
    58626001 rm -f conftest.$ac_objext
    58636002-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
    5864 +if { (eval echo "$as_me:6813: \"$ac_compile\"") >&5
     6003+if { (eval echo "$as_me:6821: \"$ac_compile\"") >&5
    58656004   (eval $ac_compile) 2>&5
    58666005   ac_status=$?
    58676006-  echo "$as_me:6529: \$? = $ac_status" >&5
    5868 +  echo "$as_me:6816: \$? = $ac_status" >&5
     6007+  echo "$as_me:6824: \$? = $ac_status" >&5
    58696008   (exit $ac_status); } &&
    58706009          { ac_try='test -s conftest.$ac_objext'
    58716010-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
    5872 +  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
     6011+  { (eval echo "$as_me:6827: \"$ac_try\"") >&5
    58736012   (eval $ac_try) 2>&5
    58746013   ac_status=$?
    58756014-  echo "$as_me:6535: \$? = $ac_status" >&5
    5876 +  echo "$as_me:6822: \$? = $ac_status" >&5
     6015+  echo "$as_me:6830: \$? = $ac_status" >&5
    58776016   (exit $ac_status); }; }; then
    58786017   :
    58796018 else
    5880 @@ -6543,15 +6830,15 @@
     6019@@ -6543,15 +6838,15 @@
    58816020 rm -f conftest.$ac_objext conftest.$ac_ext
    58826021         fi
    58836022 
    58846023-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    5885 +echo "${as_me-configure}:6833: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
     6024+echo "${as_me-configure}:6841: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    58866025 
    58876026         CFLAGS="$cf_trim_CFLAGS"
    … …  
    58896028 
    58906029-echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
    5891 +echo "${as_me-configure}:6838: testing if the second compile does not leave our definition intact error ..." 1>&5
     6030+echo "${as_me-configure}:6846: testing if the second compile does not leave our definition intact error ..." 1>&5
    58926031 
    58936032         cat >conftest.$ac_ext <<_ACEOF
    58946033-#line 6554 "configure"
    5895 +#line 6841 "configure"
     6034+#line 6849 "configure"
    58966035 #include "confdefs.h"
    58976036 #include <sys/types.h>
    58986037 int
    5899 @@ -6566,16 +6853,16 @@
     6038@@ -6566,16 +6861,16 @@
    59006039 }
    59016040 _ACEOF
    59026041 rm -f conftest.$ac_objext
    59036042-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
    5904 +if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5
     6043+if { (eval echo "$as_me:6864: \"$ac_compile\"") >&5
    59056044   (eval $ac_compile) 2>&5
    59066045   ac_status=$?
    59076046-  echo "$as_me:6572: \$? = $ac_status" >&5
    5908 +  echo "$as_me:6859: \$? = $ac_status" >&5
     6047+  echo "$as_me:6867: \$? = $ac_status" >&5
    59096048   (exit $ac_status); } &&
    59106049          { ac_try='test -s conftest.$ac_objext'
    59116050-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
    5912 +  { (eval echo "$as_me:6862: \"$ac_try\"") >&5
     6051+  { (eval echo "$as_me:6870: \"$ac_try\"") >&5
    59136052   (eval $ac_try) 2>&5
    59146053   ac_status=$?
    59156054-  echo "$as_me:6578: \$? = $ac_status" >&5
    5916 +  echo "$as_me:6865: \$? = $ac_status" >&5
     6055+  echo "$as_me:6873: \$? = $ac_status" >&5
    59176056   (exit $ac_status); }; }; then
    59186057   :
    59196058 else
    5920 @@ -6591,7 +6878,7 @@
     6059@@ -6591,7 +6886,7 @@
    59216060 rm -f conftest.$ac_objext conftest.$ac_ext
    59226061 
    59236062 fi
    59246063-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
    5925 +echo "$as_me:6881: result: $cf_cv_posix_c_source" >&5
     6064+echo "$as_me:6889: result: $cf_cv_posix_c_source" >&5
    59266065 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
    59276066 
    59286067 if test "$cf_cv_posix_c_source" != no ; then
    5929 @@ -6610,14 +6897,14 @@
     6068@@ -6610,14 +6905,14 @@
    59306069 
    59316070 # Work around breakage on OS X
    59326071 
    59336072-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
    5934 +echo "$as_me:6900: checking if SIGWINCH is defined" >&5
     6073+echo "$as_me:6908: checking if SIGWINCH is defined" >&5
    59356074 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
    59366075 if test "${cf_cv_define_sigwinch+set}" = set; then
    … …  
    59406079        cat >conftest.$ac_ext <<_ACEOF
    59416080-#line 6620 "configure"
    5942 +#line 6907 "configure"
     6081+#line 6915 "configure"
    59436082 #include "confdefs.h"
    59446083 
    59456084 #include <sys/types.h>
    5946 @@ -6632,23 +6919,23 @@
     6085@@ -6632,23 +6927,23 @@
    59476086 }
    59486087 _ACEOF
    59496088 rm -f conftest.$ac_objext
    59506089-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
    5951 +if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5
     6090+if { (eval echo "$as_me:6930: \"$ac_compile\"") >&5
    59526091   (eval $ac_compile) 2>&5
    59536092   ac_status=$?
    59546093-  echo "$as_me:6638: \$? = $ac_status" >&5
    5955 +  echo "$as_me:6925: \$? = $ac_status" >&5
     6094+  echo "$as_me:6933: \$? = $ac_status" >&5
    59566095   (exit $ac_status); } &&
    59576096          { ac_try='test -s conftest.$ac_objext'
    59586097-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
    5959 +  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
     6098+  { (eval echo "$as_me:6936: \"$ac_try\"") >&5
    59606099   (eval $ac_try) 2>&5
    59616100   ac_status=$?
    59626101-  echo "$as_me:6644: \$? = $ac_status" >&5
    5963 +  echo "$as_me:6931: \$? = $ac_status" >&5
     6102+  echo "$as_me:6939: \$? = $ac_status" >&5
    59646103   (exit $ac_status); }; }; then
    59656104   cf_cv_define_sigwinch=yes
    … …  
    59696108 cat >conftest.$ac_ext <<_ACEOF
    59706109-#line 6651 "configure"
    5971 +#line 6938 "configure"
     6110+#line 6946 "configure"
    59726111 #include "confdefs.h"
    59736112 
    59746113 #undef _XOPEN_SOURCE
    5975 @@ -6666,16 +6953,16 @@
     6114@@ -6666,16 +6961,16 @@
    59766115 }
    59776116 _ACEOF
    59786117 rm -f conftest.$ac_objext
    59796118-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
    5980 +if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5
     6119+if { (eval echo "$as_me:6964: \"$ac_compile\"") >&5
    59816120   (eval $ac_compile) 2>&5
    59826121   ac_status=$?
    59836122-  echo "$as_me:6672: \$? = $ac_status" >&5
    5984 +  echo "$as_me:6959: \$? = $ac_status" >&5
     6123+  echo "$as_me:6967: \$? = $ac_status" >&5
    59856124   (exit $ac_status); } &&
    59866125          { ac_try='test -s conftest.$ac_objext'
    59876126-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
    5988 +  { (eval echo "$as_me:6962: \"$ac_try\"") >&5
     6127+  { (eval echo "$as_me:6970: \"$ac_try\"") >&5
    59896128   (eval $ac_try) 2>&5
    59906129   ac_status=$?
    59916130-  echo "$as_me:6678: \$? = $ac_status" >&5
    5992 +  echo "$as_me:6965: \$? = $ac_status" >&5
     6131+  echo "$as_me:6973: \$? = $ac_status" >&5
    59936132   (exit $ac_status); }; }; then
    59946133   cf_cv_define_sigwinch=maybe
    59956134 else
    5996 @@ -6689,11 +6976,11 @@
     6135@@ -6689,11 +6984,11 @@
    59976136 rm -f conftest.$ac_objext conftest.$ac_ext
    59986137 
    59996138 fi
    60006139-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
    6001 +echo "$as_me:6979: result: $cf_cv_define_sigwinch" >&5
     6140+echo "$as_me:6987: result: $cf_cv_define_sigwinch" >&5
    60026141 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
    60036142 
    60046143 if test "$cf_cv_define_sigwinch" = maybe ; then
    60056144-echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
    6006 +echo "$as_me:6983: checking for actual SIGWINCH definition" >&5
     6145+echo "$as_me:6991: checking for actual SIGWINCH definition" >&5
    60076146 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
    60086147 if test "${cf_cv_fixup_sigwinch+set}" = set; then
    60096148   echo $ECHO_N "(cached) $ECHO_C" >&6
    6010 @@ -6704,7 +6991,7 @@
     6149@@ -6704,7 +6999,7 @@
    60116150 while test $cf_sigwinch != 1
    60126151 do
    60136152        cat >conftest.$ac_ext <<_ACEOF
    60146153-#line 6707 "configure"
    6015 +#line 6994 "configure"
     6154+#line 7002 "configure"
    60166155 #include "confdefs.h"
    60176156 
    60186157 #undef _XOPEN_SOURCE
    6019 @@ -6726,16 +7013,16 @@
     6158@@ -6726,16 +7021,16 @@
    60206159 }
    60216160 _ACEOF
    60226161 rm -f conftest.$ac_objext
    60236162-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
    6024 +if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5
     6163+if { (eval echo "$as_me:7024: \"$ac_compile\"") >&5
    60256164   (eval $ac_compile) 2>&5
    60266165   ac_status=$?
    60276166-  echo "$as_me:6732: \$? = $ac_status" >&5
    6028 +  echo "$as_me:7019: \$? = $ac_status" >&5
     6167+  echo "$as_me:7027: \$? = $ac_status" >&5
    60296168   (exit $ac_status); } &&
    60306169          { ac_try='test -s conftest.$ac_objext'
    60316170-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
    6032 +  { (eval echo "$as_me:7022: \"$ac_try\"") >&5
     6171+  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
    60336172   (eval $ac_try) 2>&5
    60346173   ac_status=$?
    60356174-  echo "$as_me:6738: \$? = $ac_status" >&5
    6036 +  echo "$as_me:7025: \$? = $ac_status" >&5
     6175+  echo "$as_me:7033: \$? = $ac_status" >&5
    60376176   (exit $ac_status); }; }; then
    60386177   cf_cv_fixup_sigwinch=$cf_sigwinch
    60396178         break
    6040 @@ -6749,7 +7036,7 @@
     6179@@ -6749,7 +7044,7 @@
    60416180 done
    60426181 
    60436182 fi
    60446183-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
    6045 +echo "$as_me:7039: result: $cf_cv_fixup_sigwinch" >&5
     6184+echo "$as_me:7047: result: $cf_cv_fixup_sigwinch" >&5
    60466185 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
    60476186 
    60486187        if test "$cf_cv_fixup_sigwinch" != unknown ; then
    6049 @@ -6759,13 +7046,13 @@
     6188@@ -6759,13 +7054,13 @@
    60506189 
    60516190 # Checks for CODESET support.
    60526191 
    60536192-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
    6054 +  echo "$as_me:7049: checking for nl_langinfo and CODESET" >&5
     6193+  echo "$as_me:7057: checking for nl_langinfo and CODESET" >&5
    60556194 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
    60566195 if test "${am_cv_langinfo_codeset+set}" = set; then
    … …  
    60596198   cat >conftest.$ac_ext <<_ACEOF
    60606199-#line 6768 "configure"
    6061 +#line 7055 "configure"
     6200+#line 7063 "configure"
    60626201 #include "confdefs.h"
    60636202 #include <langinfo.h>
    60646203 int
    6065 @@ -6777,16 +7064,16 @@
     6204@@ -6777,16 +7072,16 @@
    60666205 }
    60676206 _ACEOF
    60686207 rm -f conftest.$ac_objext conftest$ac_exeext
    60696208-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
    6070 +if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
     6209+if { (eval echo "$as_me:7075: \"$ac_link\"") >&5
    60716210   (eval $ac_link) 2>&5
    60726211   ac_status=$?
    60736212-  echo "$as_me:6783: \$? = $ac_status" >&5
    6074 +  echo "$as_me:7070: \$? = $ac_status" >&5
     6213+  echo "$as_me:7078: \$? = $ac_status" >&5
    60756214   (exit $ac_status); } &&
    60766215          { ac_try='test -s conftest$ac_exeext'
    60776216-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
    6078 +  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
     6217+  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
    60796218   (eval $ac_try) 2>&5
    60806219   ac_status=$?
    60816220-  echo "$as_me:6789: \$? = $ac_status" >&5
    6082 +  echo "$as_me:7076: \$? = $ac_status" >&5
     6221+  echo "$as_me:7084: \$? = $ac_status" >&5
    60836222   (exit $ac_status); }; }; then
    60846223   am_cv_langinfo_codeset=yes
    60856224 else
    6086 @@ -6797,7 +7084,7 @@
     6225@@ -6797,7 +7092,7 @@
    60876226 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    60886227 
    60896228 fi
    60906229-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
    6091 +echo "$as_me:7087: result: $am_cv_langinfo_codeset" >&5
     6230+echo "$as_me:7095: result: $am_cv_langinfo_codeset" >&5
    60926231 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    60936232   if test $am_cv_langinfo_codeset = yes; then
    60946233 
    6095 @@ -6811,7 +7098,7 @@
     6234@@ -6811,7 +7106,7 @@
    60966235 NCURSES_OK_WCHAR_T=
    60976236 NCURSES_OK_WINT_T=
    60986237 
    60996238-echo "$as_me:6814: checking if you want wide-character code" >&5
    6100 +echo "$as_me:7101: checking if you want wide-character code" >&5
     6239+echo "$as_me:7109: checking if you want wide-character code" >&5
    61016240 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
    61026241 
    61036242 # Check whether --enable-widec or --disable-widec was given.
    6104 @@ -6821,7 +7108,7 @@
     6243@@ -6821,7 +7116,7 @@
    61056244 else
    61066245   with_widec=no
    61076246 fi;
    61086247-echo "$as_me:6824: result: $with_widec" >&5
    6109 +echo "$as_me:7111: result: $with_widec" >&5
     6248+echo "$as_me:7119: result: $with_widec" >&5
    61106249 echo "${ECHO_T}$with_widec" >&6
    61116250 if test "$with_widec" = yes ; then
    61126251        LIB_SUFFIX="w${LIB_SUFFIX}"
    6113 @@ -6829,10 +7116,10 @@
     6252@@ -6829,10 +7124,10 @@
    61146253 #define USE_WIDEC_SUPPORT 1
    61156254 EOF
    61166255 
    61176256-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    6118 +echo "$as_me:7119: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
     6257+echo "$as_me:7127: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    61196258 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
    61206259 cat >conftest.$ac_ext <<_ACEOF
    61216260-#line 6835 "configure"
    6122 +#line 7122 "configure"
     6261+#line 7130 "configure"
    61236262 #include "confdefs.h"
    61246263 #include <sys/types.h>
    61256264 
    6126 @@ -6848,16 +7135,16 @@
     6265@@ -6848,16 +7143,16 @@
    61276266 }
    61286267 _ACEOF
    61296268 rm -f conftest.$ac_objext
    61306269-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
    6131 +if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5
     6270+if { (eval echo "$as_me:7146: \"$ac_compile\"") >&5
    61326271   (eval $ac_compile) 2>&5
    61336272   ac_status=$?
    61346273-  echo "$as_me:6854: \$? = $ac_status" >&5
    6135 +  echo "$as_me:7141: \$? = $ac_status" >&5
     6274+  echo "$as_me:7149: \$? = $ac_status" >&5
    61366275   (exit $ac_status); } &&
    61376276          { ac_try='test -s conftest.$ac_objext'
    61386277-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
    6139 +  { (eval echo "$as_me:7144: \"$ac_try\"") >&5
     6278+  { (eval echo "$as_me:7152: \"$ac_try\"") >&5
    61406279   (eval $ac_try) 2>&5
    61416280   ac_status=$?
    61426281-  echo "$as_me:6860: \$? = $ac_status" >&5
    6143 +  echo "$as_me:7147: \$? = $ac_status" >&5
     6282+  echo "$as_me:7155: \$? = $ac_status" >&5
    61446283   (exit $ac_status); }; }; then
    61456284   cf_result=no
    61466285 else
    6147 @@ -6866,16 +7153,16 @@
     6286@@ -6866,16 +7161,16 @@
    61486287 cf_result=yes
    61496288 fi
    61506289 rm -f conftest.$ac_objext conftest.$ac_ext
    61516290-echo "$as_me:6869: result: $cf_result" >&5
    6152 +echo "$as_me:7156: result: $cf_result" >&5
     6291+echo "$as_me:7164: result: $cf_result" >&5
    61536292 echo "${ECHO_T}$cf_result" >&6
    61546293 
    … …  
    61576296 elif test "x" != "x" ; then
    61586297-       echo "$as_me:6875: checking checking for compatible value versus " >&5
    6159 +       echo "$as_me:7162: checking checking for compatible value versus " >&5
     6298+       echo "$as_me:7170: checking checking for compatible value versus " >&5
    61606299 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
    61616300        cat >conftest.$ac_ext <<_ACEOF
    61626301-#line 6878 "configure"
    6163 +#line 7165 "configure"
     6302+#line 7173 "configure"
    61646303 #include "confdefs.h"
    61656304 #include <sys/types.h>
    61666305 
    6167 @@ -6891,16 +7178,16 @@
     6306@@ -6891,16 +7186,16 @@
    61686307 }
    61696308 _ACEOF
    61706309 rm -f conftest.$ac_objext
    61716310-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
    6172 +if { (eval echo "$as_me:7181: \"$ac_compile\"") >&5
     6311+if { (eval echo "$as_me:7189: \"$ac_compile\"") >&5
    61736312   (eval $ac_compile) 2>&5
    61746313   ac_status=$?
    61756314-  echo "$as_me:6897: \$? = $ac_status" >&5
    6176 +  echo "$as_me:7184: \$? = $ac_status" >&5
     6315+  echo "$as_me:7192: \$? = $ac_status" >&5
    61776316   (exit $ac_status); } &&
    61786317          { ac_try='test -s conftest.$ac_objext'
    61796318-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
    6180 +  { (eval echo "$as_me:7187: \"$ac_try\"") >&5
     6319+  { (eval echo "$as_me:7195: \"$ac_try\"") >&5
    61816320   (eval $ac_try) 2>&5
    61826321   ac_status=$?
    61836322-  echo "$as_me:6903: \$? = $ac_status" >&5
    6184 +  echo "$as_me:7190: \$? = $ac_status" >&5
     6323+  echo "$as_me:7198: \$? = $ac_status" >&5
    61856324   (exit $ac_status); }; }; then
    61866325   cf_result=yes
    61876326 else
    6188 @@ -6909,7 +7196,7 @@
     6327@@ -6909,7 +7204,7 @@
    61896328 cf_result=no
    61906329 fi
    61916330 rm -f conftest.$ac_objext conftest.$ac_ext
    61926331-       echo "$as_me:6912: result: $cf_result" >&5
    6193 +       echo "$as_me:7199: result: $cf_result" >&5
     6332+       echo "$as_me:7207: result: $cf_result" >&5
    61946333 echo "${ECHO_T}$cf_result" >&6
    61956334        if test "$cf_result" = no ; then
    61966335                # perhaps we can override it - try...
    6197 @@ -6923,13 +7210,13 @@
     6336@@ -6923,13 +7218,13 @@
    61986337 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
    61996338 do
    62006339 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    62016340-echo "$as_me:6926: checking for $ac_func" >&5
    6202 +echo "$as_me:7213: checking for $ac_func" >&5
     6341+echo "$as_me:7221: checking for $ac_func" >&5
    62036342 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    62046343 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    62076346   cat >conftest.$ac_ext <<_ACEOF
    62086347-#line 6932 "configure"
    6209 +#line 7219 "configure"
     6348+#line 7227 "configure"
    62106349 #include "confdefs.h"
    62116350 /* System header to define __stub macros and hopefully few prototypes,
    62126351     which can conflict with char $ac_func (); below.  */
    6213 @@ -6960,16 +7247,16 @@
     6352@@ -6960,16 +7255,16 @@
    62146353 }
    62156354 _ACEOF
    62166355 rm -f conftest.$ac_objext conftest$ac_exeext
    62176356-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
    6218 +if { (eval echo "$as_me:7250: \"$ac_link\"") >&5
     6357+if { (eval echo "$as_me:7258: \"$ac_link\"") >&5
    62196358   (eval $ac_link) 2>&5
    62206359   ac_status=$?
    62216360-  echo "$as_me:6966: \$? = $ac_status" >&5
    6222 +  echo "$as_me:7253: \$? = $ac_status" >&5
     6361+  echo "$as_me:7261: \$? = $ac_status" >&5
    62236362   (exit $ac_status); } &&
    62246363          { ac_try='test -s conftest$ac_exeext'
    62256364-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
    6226 +  { (eval echo "$as_me:7256: \"$ac_try\"") >&5
     6365+  { (eval echo "$as_me:7264: \"$ac_try\"") >&5
    62276366   (eval $ac_try) 2>&5
    62286367   ac_status=$?
    62296368-  echo "$as_me:6972: \$? = $ac_status" >&5
    6230 +  echo "$as_me:7259: \$? = $ac_status" >&5
     6369+  echo "$as_me:7267: \$? = $ac_status" >&5
    62316370   (exit $ac_status); }; }; then
    62326371   eval "$as_ac_var=yes"
    62336372 else
    6234 @@ -6979,7 +7266,7 @@
     6373@@ -6979,7 +7274,7 @@
    62356374 fi
    62366375 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    62376376 fi
    62386377-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
    6239 +echo "$as_me:7269: result: `eval echo '${'$as_ac_var'}'`" >&5
     6378+echo "$as_me:7277: result: `eval echo '${'$as_ac_var'}'`" >&5
    62406379 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    62416380 if test `eval echo '${'$as_ac_var'}'` = yes; then
    62426381   cat >>confdefs.h <<EOF
    6243 @@ -6991,7 +7278,7 @@
     6382@@ -6991,7 +7286,7 @@
    62446383 
    62456384        if test "$ac_cv_func_putwc" != yes ; then
    62466385 
    62476386-echo "$as_me:6994: checking for multibyte character support" >&5
    6248 +echo "$as_me:7281: checking for multibyte character support" >&5
     6387+echo "$as_me:7289: checking for multibyte character support" >&5
    62496388 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
    62506389 if test "${cf_cv_utf8_lib+set}" = set; then
    62516390   echo $ECHO_N "(cached) $ECHO_C" >&6
    6252 @@ -6999,7 +7286,7 @@
     6391@@ -6999,7 +7294,7 @@
    62536392 
    62546393        cf_save_LIBS="$LIBS"
    62556394        cat >conftest.$ac_ext <<_ACEOF
    62566395-#line 7002 "configure"
    6257 +#line 7289 "configure"
     6396+#line 7297 "configure"
    62586397 #include "confdefs.h"
    62596398 
    62606399 #include <stdlib.h>
    6261 @@ -7012,16 +7299,16 @@
     6400@@ -7012,16 +7307,16 @@
    62626401 }
    62636402 _ACEOF
    62646403 rm -f conftest.$ac_objext conftest$ac_exeext
    62656404-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
    6266 +if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
     6405+if { (eval echo "$as_me:7310: \"$ac_link\"") >&5
    62676406   (eval $ac_link) 2>&5
    62686407   ac_status=$?
    62696408-  echo "$as_me:7018: \$? = $ac_status" >&5
    6270 +  echo "$as_me:7305: \$? = $ac_status" >&5
     6409+  echo "$as_me:7313: \$? = $ac_status" >&5
    62716410   (exit $ac_status); } &&
    62726411          { ac_try='test -s conftest$ac_exeext'
    62736412-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
    6274 +  { (eval echo "$as_me:7308: \"$ac_try\"") >&5
     6413+  { (eval echo "$as_me:7316: \"$ac_try\"") >&5
    62756414   (eval $ac_try) 2>&5
    62766415   ac_status=$?
    62776416-  echo "$as_me:7024: \$? = $ac_status" >&5
    6278 +  echo "$as_me:7311: \$? = $ac_status" >&5
     6417+  echo "$as_me:7319: \$? = $ac_status" >&5
    62796418   (exit $ac_status); }; }; then
    62806419   cf_cv_utf8_lib=yes
    62816420 else
    6282 @@ -7033,10 +7320,10 @@
     6421@@ -7033,10 +7328,10 @@
    62836422 cf_cv_header_path_utf8=
    62846423 cf_cv_library_path_utf8=
    62856424 
    62866425-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    6287 +echo "${as_me-configure}:7323: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
     6426+echo "${as_me-configure}:7331: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    62886427 
    62896428 cat >conftest.$ac_ext <<_ACEOF
    62906429-#line 7039 "configure"
    6291 +#line 7326 "configure"
     6430+#line 7334 "configure"
    62926431 #include "confdefs.h"
    62936432 
    62946433 #include <libutf8.h>
    6295 @@ -7049,16 +7336,16 @@
     6434@@ -7049,16 +7344,16 @@
    62966435 }
    62976436 _ACEOF
    62986437 rm -f conftest.$ac_objext conftest$ac_exeext
    62996438-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
    6300 +if { (eval echo "$as_me:7339: \"$ac_link\"") >&5
     6439+if { (eval echo "$as_me:7347: \"$ac_link\"") >&5
    63016440   (eval $ac_link) 2>&5
    63026441   ac_status=$?
    63036442-  echo "$as_me:7055: \$? = $ac_status" >&5
    6304 +  echo "$as_me:7342: \$? = $ac_status" >&5
     6443+  echo "$as_me:7350: \$? = $ac_status" >&5
    63056444   (exit $ac_status); } &&
    63066445          { ac_try='test -s conftest$ac_exeext'
    63076446-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
    6308 +  { (eval echo "$as_me:7345: \"$ac_try\"") >&5
     6447+  { (eval echo "$as_me:7353: \"$ac_try\"") >&5
    63096448   (eval $ac_try) 2>&5
    63106449   ac_status=$?
    63116450-  echo "$as_me:7061: \$? = $ac_status" >&5
    6312 +  echo "$as_me:7348: \$? = $ac_status" >&5
     6451+  echo "$as_me:7356: \$? = $ac_status" >&5
    63136452   (exit $ac_status); }; }; then
    63146453   cf_cv_find_linkage_utf8=yes
    63156454 else
    6316 @@ -7067,12 +7354,41 @@
     6455@@ -7067,12 +7362,41 @@
    63176456 
    63186457     cf_cv_find_linkage_utf8=no
    … …  
    63216460+    test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
    63226461+
    6323 +echo "${as_me-configure}:7359: testing find linkage for utf8 library ..." 1>&5
    6324 +
    6325 +echo "${as_me-configure}:7361: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
     6462+echo "${as_me-configure}:7367: testing find linkage for utf8 library ..." 1>&5
     6463+
     6464+echo "${as_me-configure}:7369: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    63266465 
    63276466     cf_save_CPPFLAGS="$CPPFLAGS"
    … …  
    63586497 test "/usr" != "$prefix" && \
    63596498 test -d "/usr" && \
    6360 @@ -7143,16 +7459,18 @@
     6499@@ -7143,16 +7467,18 @@
    63616500        test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
    63626501 }
    … …  
    63706509 
    63716510-echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    6372 +echo "${as_me-configure}:7469: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
     6511+echo "${as_me-configure}:7477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    63736512 
    63746513         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
    63756514         cat >conftest.$ac_ext <<_ACEOF
    63766515-#line 7155 "configure"
    6377 +#line 7473 "configure"
     6516+#line 7481 "configure"
    63786517 #include "confdefs.h"
    63796518 
    63806519 #include <libutf8.h>
    6381 @@ -7165,21 +7483,21 @@
     6520@@ -7165,21 +7491,21 @@
    63826521 }
    63836522 _ACEOF
    63846523 rm -f conftest.$ac_objext
    63856524-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
    6386 +if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
     6525+if { (eval echo "$as_me:7494: \"$ac_compile\"") >&5
    63876526   (eval $ac_compile) 2>&5
    63886527   ac_status=$?
    63896528-  echo "$as_me:7171: \$? = $ac_status" >&5
    6390 +  echo "$as_me:7489: \$? = $ac_status" >&5
     6529+  echo "$as_me:7497: \$? = $ac_status" >&5
    63916530   (exit $ac_status); } &&
    63926531          { ac_try='test -s conftest.$ac_objext'
    63936532-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
    6394 +  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
     6533+  { (eval echo "$as_me:7500: \"$ac_try\"") >&5
    63956534   (eval $ac_try) 2>&5
    63966535   ac_status=$?
    63976536-  echo "$as_me:7177: \$? = $ac_status" >&5
    6398 +  echo "$as_me:7495: \$? = $ac_status" >&5
     6537+  echo "$as_me:7503: \$? = $ac_status" >&5
    63996538   (exit $ac_status); }; }; then
    64006539 
    … …  
    64026541 
    64036542-echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    6404 +echo "${as_me-configure}:7500: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
     6543+echo "${as_me-configure}:7508: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    64056544 
    64066545             cf_cv_find_linkage_utf8=maybe
    64076546             cf_test_CPPFLAGS="$CPPFLAGS"
    6408 @@ -7197,13 +7515,39 @@
     6547@@ -7197,13 +7523,39 @@
    64096548 
    64106549     if test "$cf_cv_find_linkage_utf8" = maybe ; then
    64116550 
    64126551-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    6413 +echo "${as_me-configure}:7518: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
     6552+echo "${as_me-configure}:7526: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    64146553 
    64156554       cf_save_LIBS="$LIBS"
    … …  
    64486587 test "/usr" != "$prefix" && \
    64496588 test -d "/usr" && \
    6450 @@ -7260,18 +7604,20 @@
     6589@@ -7260,18 +7612,20 @@
    64516590        test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
    64526591 }
    … …  
    64606599 
    64616600-echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    6462 +echo "${as_me-configure}:7614: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
     6601+echo "${as_me-configure}:7622: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    64636602 
    64646603             CPPFLAGS="$cf_test_CPPFLAGS"
    … …  
    64676606             cat >conftest.$ac_ext <<_ACEOF
    64686607-#line 7274 "configure"
    6469 +#line 7620 "configure"
     6608+#line 7628 "configure"
    64706609 #include "confdefs.h"
    64716610 
    64726611 #include <libutf8.h>
    6473 @@ -7284,21 +7630,21 @@
     6612@@ -7284,21 +7638,21 @@
    64746613 }
    64756614 _ACEOF
    64766615 rm -f conftest.$ac_objext conftest$ac_exeext
    64776616-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
    6478 +if { (eval echo "$as_me:7633: \"$ac_link\"") >&5
     6617+if { (eval echo "$as_me:7641: \"$ac_link\"") >&5
    64796618   (eval $ac_link) 2>&5
    64806619   ac_status=$?
    64816620-  echo "$as_me:7290: \$? = $ac_status" >&5
    6482 +  echo "$as_me:7636: \$? = $ac_status" >&5
     6621+  echo "$as_me:7644: \$? = $ac_status" >&5
    64836622   (exit $ac_status); } &&
    64846623          { ac_try='test -s conftest$ac_exeext'
    64856624-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
    6486 +  { (eval echo "$as_me:7639: \"$ac_try\"") >&5
     6625+  { (eval echo "$as_me:7647: \"$ac_try\"") >&5
    64876626   (eval $ac_try) 2>&5
    64886627   ac_status=$?
    64896628-  echo "$as_me:7296: \$? = $ac_status" >&5
    6490 +  echo "$as_me:7642: \$? = $ac_status" >&5
     6629+  echo "$as_me:7650: \$? = $ac_status" >&5
    64916630   (exit $ac_status); }; }; then
    64926631 
    … …  
    64946633 
    64956634-echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    6496 +echo "${as_me-configure}:7647: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
     6635+echo "${as_me-configure}:7655: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    64976636 
    64986637                 cf_cv_find_linkage_utf8=yes
    64996638                 cf_cv_library_file_utf8="-lutf8"
    6500 @@ -7336,7 +7682,7 @@
     6639@@ -7336,7 +7690,7 @@
    65016640 fi
    65026641 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    65036642 fi
    65046643-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
    6505 +echo "$as_me:7685: result: $cf_cv_utf8_lib" >&5
     6644+echo "$as_me:7693: result: $cf_cv_utf8_lib" >&5
    65066645 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
    65076646 
    65086647 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    6509 @@ -7364,13 +7710,13 @@
     6648@@ -7364,13 +7718,13 @@
    65106649                fi
    65116650 
    … …  
    65196658                          cat >conftest.$ac_ext <<_ACEOF
    65206659-#line 7373 "configure"
    6521 +#line 7719 "configure"
     6660+#line 7727 "configure"
    65226661 #include "confdefs.h"
    65236662 #include <stdio.h>
    65246663 int
    6525 @@ -7382,16 +7728,16 @@
     6664@@ -7382,16 +7736,16 @@
    65266665 }
    65276666 _ACEOF
    65286667 rm -f conftest.$ac_objext
    65296668-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
    6530 +if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5
     6669+if { (eval echo "$as_me:7739: \"$ac_compile\"") >&5
    65316670   (eval $ac_compile) 2>&5
    65326671   ac_status=$?
    65336672-  echo "$as_me:7388: \$? = $ac_status" >&5
    6534 +  echo "$as_me:7734: \$? = $ac_status" >&5
     6673+  echo "$as_me:7742: \$? = $ac_status" >&5
    65356674   (exit $ac_status); } &&
    65366675          { ac_try='test -s conftest.$ac_objext'
    65376676-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
    6538 +  { (eval echo "$as_me:7737: \"$ac_try\"") >&5
     6677+  { (eval echo "$as_me:7745: \"$ac_try\"") >&5
    65396678   (eval $ac_try) 2>&5
    65406679   ac_status=$?
    65416680-  echo "$as_me:7394: \$? = $ac_status" >&5
    6542 +  echo "$as_me:7740: \$? = $ac_status" >&5
     6681+  echo "$as_me:7748: \$? = $ac_status" >&5
    65436682   (exit $ac_status); }; }; then
    65446683   :
    65456684 else
    6546 @@ -7408,13 +7754,13 @@
     6685@@ -7408,13 +7762,13 @@
    65476686                if test "$cf_have_incdir" = no ; then
    65486687                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    65496688 
    65506689-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
    6551 +echo "${as_me-configure}:7757: testing adding $cf_add_incdir to include-path ..." 1>&5
     6690+echo "${as_me-configure}:7765: testing adding $cf_add_incdir to include-path ..." 1>&5
    65526691 
    65536692-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
    … …  
    65636702                  break
    65646703                fi
    6565 @@ -7442,7 +7788,7 @@
     6704@@ -7442,7 +7796,7 @@
    65666705       if test "$cf_have_libdir" = no ; then
    65676706         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    65686707 
    65696708-echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
    6570 +echo "${as_me-configure}:7791: testing adding $cf_add_libdir to library-path ..." 1>&5
     6709+echo "${as_me-configure}:7799: testing adding $cf_add_libdir to library-path ..." 1>&5
    65716710 
    65726711         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    65736712       fi
    6574 @@ -7459,14 +7805,14 @@
     6713@@ -7459,14 +7813,14 @@
    65756714        fi
    65766715 
    65776716 # This is needed on Tru64 5.0 to declare mbstate_t
    65786717-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
    6579 +echo "$as_me:7808: checking if we must include wchar.h to declare mbstate_t" >&5
     6718+echo "$as_me:7816: checking if we must include wchar.h to declare mbstate_t" >&5
    65806719 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
    65816720 if test "${cf_cv_mbstate_t+set}" = set; then
    … …  
    65856724 cat >conftest.$ac_ext <<_ACEOF
    65866725-#line 7469 "configure"
    6587 +#line 7815 "configure"
     6726+#line 7823 "configure"
    65886727 #include "confdefs.h"
    65896728 
    65906729 #include <stdlib.h>
    6591 @@ -7484,23 +7830,23 @@
     6730@@ -7484,23 +7838,23 @@
    65926731 }
    65936732 _ACEOF
    65946733 rm -f conftest.$ac_objext
    65956734-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
    6596 +if { (eval echo "$as_me:7833: \"$ac_compile\"") >&5
     6735+if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
    65976736   (eval $ac_compile) 2>&5
    65986737   ac_status=$?
    65996738-  echo "$as_me:7490: \$? = $ac_status" >&5
    6600 +  echo "$as_me:7836: \$? = $ac_status" >&5
     6739+  echo "$as_me:7844: \$? = $ac_status" >&5
    66016740   (exit $ac_status); } &&
    66026741          { ac_try='test -s conftest.$ac_objext'
    66036742-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
    6604 +  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
     6743+  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
    66056744   (eval $ac_try) 2>&5
    66066745   ac_status=$?
    66076746-  echo "$as_me:7496: \$? = $ac_status" >&5
    6608 +  echo "$as_me:7842: \$? = $ac_status" >&5
     6747+  echo "$as_me:7850: \$? = $ac_status" >&5
    66096748   (exit $ac_status); }; }; then
    66106749   cf_cv_mbstate_t=no
    … …  
    66146753 cat >conftest.$ac_ext <<_ACEOF
    66156754-#line 7503 "configure"
    6616 +#line 7849 "configure"
     6755+#line 7857 "configure"
    66176756 #include "confdefs.h"
    66186757 
    66196758 #include <stdlib.h>
    6620 @@ -7519,16 +7865,16 @@
     6759@@ -7519,16 +7873,16 @@
    66216760 }
    66226761 _ACEOF
    66236762 rm -f conftest.$ac_objext
    66246763-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
    6625 +if { (eval echo "$as_me:7868: \"$ac_compile\"") >&5
     6764+if { (eval echo "$as_me:7876: \"$ac_compile\"") >&5
    66266765   (eval $ac_compile) 2>&5
    66276766   ac_status=$?
    66286767-  echo "$as_me:7525: \$? = $ac_status" >&5
    6629 +  echo "$as_me:7871: \$? = $ac_status" >&5
     6768+  echo "$as_me:7879: \$? = $ac_status" >&5
    66306769   (exit $ac_status); } &&
    66316770          { ac_try='test -s conftest.$ac_objext'
    66326771-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
    6633 +  { (eval echo "$as_me:7874: \"$ac_try\"") >&5
     6772+  { (eval echo "$as_me:7882: \"$ac_try\"") >&5
    66346773   (eval $ac_try) 2>&5
    66356774   ac_status=$?
    66366775-  echo "$as_me:7531: \$? = $ac_status" >&5
    6637 +  echo "$as_me:7877: \$? = $ac_status" >&5
     6776+  echo "$as_me:7885: \$? = $ac_status" >&5
    66386777   (exit $ac_status); }; }; then
    66396778   cf_cv_mbstate_t=yes
    66406779 else
    6641 @@ -7540,7 +7886,7 @@
     6780@@ -7540,7 +7894,7 @@
    66426781 fi
    66436782 rm -f conftest.$ac_objext conftest.$ac_ext
    66446783 fi
    66456784-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
    6646 +echo "$as_me:7889: result: $cf_cv_mbstate_t" >&5
     6785+echo "$as_me:7897: result: $cf_cv_mbstate_t" >&5
    66476786 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
    66486787 
    66496788 if test "$cf_cv_mbstate_t" = yes ; then
    6650 @@ -7557,14 +7903,14 @@
     6789@@ -7557,14 +7911,14 @@
    66516790 fi
    66526791 
    66536792 # This is needed on Tru64 5.0 to declare wchar_t
    66546793-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
    6655 +echo "$as_me:7906: checking if we must include wchar.h to declare wchar_t" >&5
     6794+echo "$as_me:7914: checking if we must include wchar.h to declare wchar_t" >&5
    66566795 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
    66576796 if test "${cf_cv_wchar_t+set}" = set; then
    … …  
    66616800 cat >conftest.$ac_ext <<_ACEOF
    66626801-#line 7567 "configure"
    6663 +#line 7913 "configure"
     6802+#line 7921 "configure"
    66646803 #include "confdefs.h"
    66656804 
    66666805 #include <stdlib.h>
    6667 @@ -7582,23 +7928,23 @@
     6806@@ -7582,23 +7936,23 @@
    66686807 }
    66696808 _ACEOF
    66706809 rm -f conftest.$ac_objext
    66716810-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
    6672 +if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5
     6811+if { (eval echo "$as_me:7939: \"$ac_compile\"") >&5
    66736812   (eval $ac_compile) 2>&5
    66746813   ac_status=$?
    66756814-  echo "$as_me:7588: \$? = $ac_status" >&5
    6676 +  echo "$as_me:7934: \$? = $ac_status" >&5
     6815+  echo "$as_me:7942: \$? = $ac_status" >&5
    66776816   (exit $ac_status); } &&
    66786817          { ac_try='test -s conftest.$ac_objext'
    66796818-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
    6680 +  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
     6819+  { (eval echo "$as_me:7945: \"$ac_try\"") >&5
    66816820   (eval $ac_try) 2>&5
    66826821   ac_status=$?
    66836822-  echo "$as_me:7594: \$? = $ac_status" >&5
    6684 +  echo "$as_me:7940: \$? = $ac_status" >&5
     6823+  echo "$as_me:7948: \$? = $ac_status" >&5
    66856824   (exit $ac_status); }; }; then
    66866825   cf_cv_wchar_t=no
    … …  
    66906829 cat >conftest.$ac_ext <<_ACEOF
    66916830-#line 7601 "configure"
    6692 +#line 7947 "configure"
     6831+#line 7955 "configure"
    66936832 #include "confdefs.h"
    66946833 
    66956834 #include <stdlib.h>
    6696 @@ -7617,16 +7963,16 @@
     6835@@ -7617,16 +7971,16 @@
    66976836 }
    66986837 _ACEOF
    66996838 rm -f conftest.$ac_objext
    67006839-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
    6701 +if { (eval echo "$as_me:7966: \"$ac_compile\"") >&5
     6840+if { (eval echo "$as_me:7974: \"$ac_compile\"") >&5
    67026841   (eval $ac_compile) 2>&5
    67036842   ac_status=$?
    67046843-  echo "$as_me:7623: \$? = $ac_status" >&5
    6705 +  echo "$as_me:7969: \$? = $ac_status" >&5
     6844+  echo "$as_me:7977: \$? = $ac_status" >&5
    67066845   (exit $ac_status); } &&
    67076846          { ac_try='test -s conftest.$ac_objext'
    67086847-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
    6709 +  { (eval echo "$as_me:7972: \"$ac_try\"") >&5
     6848+  { (eval echo "$as_me:7980: \"$ac_try\"") >&5
    67106849   (eval $ac_try) 2>&5
    67116850   ac_status=$?
    67126851-  echo "$as_me:7629: \$? = $ac_status" >&5
    6713 +  echo "$as_me:7975: \$? = $ac_status" >&5
     6852+  echo "$as_me:7983: \$? = $ac_status" >&5
    67146853   (exit $ac_status); }; }; then
    67156854   cf_cv_wchar_t=yes
    67166855 else
    6717 @@ -7638,7 +7984,7 @@
     6856@@ -7638,7 +7992,7 @@
    67186857 fi
    67196858 rm -f conftest.$ac_objext conftest.$ac_ext
    67206859 fi
    67216860-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
    6722 +echo "$as_me:7987: result: $cf_cv_wchar_t" >&5
     6861+echo "$as_me:7995: result: $cf_cv_wchar_t" >&5
    67236862 echo "${ECHO_T}$cf_cv_wchar_t" >&6
    67246863 
    67256864 if test "$cf_cv_wchar_t" = yes ; then
    6726 @@ -7660,14 +8006,14 @@
     6865@@ -7660,14 +8014,14 @@
    67276866 fi
    67286867 
    67296868 # This is needed on Tru64 5.0 to declare wint_t
    67306869-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
    6731 +echo "$as_me:8009: checking if we must include wchar.h to declare wint_t" >&5
     6870+echo "$as_me:8017: checking if we must include wchar.h to declare wint_t" >&5
    67326871 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
    67336872 if test "${cf_cv_wint_t+set}" = set; then
    … …  
    67376876 cat >conftest.$ac_ext <<_ACEOF
    67386877-#line 7670 "configure"
    6739 +#line 8016 "configure"
     6878+#line 8024 "configure"
    67406879 #include "confdefs.h"
    67416880 
    67426881 #include <stdlib.h>
    6743 @@ -7685,23 +8031,23 @@
     6882@@ -7685,23 +8039,23 @@
    67446883 }
    67456884 _ACEOF
    67466885 rm -f conftest.$ac_objext
    67476886-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
    6748 +if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
     6887+if { (eval echo "$as_me:8042: \"$ac_compile\"") >&5
    67496888   (eval $ac_compile) 2>&5
    67506889   ac_status=$?
    67516890-  echo "$as_me:7691: \$? = $ac_status" >&5
    6752 +  echo "$as_me:8037: \$? = $ac_status" >&5
     6891+  echo "$as_me:8045: \$? = $ac_status" >&5
    67536892   (exit $ac_status); } &&
    67546893          { ac_try='test -s conftest.$ac_objext'
    67556894-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
    6756 +  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
     6895+  { (eval echo "$as_me:8048: \"$ac_try\"") >&5
    67576896   (eval $ac_try) 2>&5
    67586897   ac_status=$?
    67596898-  echo "$as_me:7697: \$? = $ac_status" >&5
    6760 +  echo "$as_me:8043: \$? = $ac_status" >&5
     6899+  echo "$as_me:8051: \$? = $ac_status" >&5
    67616900   (exit $ac_status); }; }; then
    67626901   cf_cv_wint_t=no
    … …  
    67666905 cat >conftest.$ac_ext <<_ACEOF
    67676906-#line 7704 "configure"
    6768 +#line 8050 "configure"
     6907+#line 8058 "configure"
    67696908 #include "confdefs.h"
    67706909 
    67716910 #include <stdlib.h>
    6772 @@ -7720,16 +8066,16 @@
     6911@@ -7720,16 +8074,16 @@
    67736912 }
    67746913 _ACEOF
    67756914 rm -f conftest.$ac_objext
    67766915-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
    6777 +if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5
     6916+if { (eval echo "$as_me:8077: \"$ac_compile\"") >&5
    67786917   (eval $ac_compile) 2>&5
    67796918   ac_status=$?
    67806919-  echo "$as_me:7726: \$? = $ac_status" >&5
    6781 +  echo "$as_me:8072: \$? = $ac_status" >&5
     6920+  echo "$as_me:8080: \$? = $ac_status" >&5
    67826921   (exit $ac_status); } &&
    67836922          { ac_try='test -s conftest.$ac_objext'
    67846923-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
    6785 +  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
     6924+  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
    67866925   (eval $ac_try) 2>&5
    67876926   ac_status=$?
    67886927-  echo "$as_me:7732: \$? = $ac_status" >&5
    6789 +  echo "$as_me:8078: \$? = $ac_status" >&5
     6928+  echo "$as_me:8086: \$? = $ac_status" >&5
    67906929   (exit $ac_status); }; }; then
    67916930   cf_cv_wint_t=yes
    67926931 else
    6793 @@ -7741,7 +8087,7 @@
     6932@@ -7741,7 +8095,7 @@
    67946933 fi
    67956934 rm -f conftest.$ac_objext conftest.$ac_ext
    67966935 fi
    67976936-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
    6798 +echo "$as_me:8090: result: $cf_cv_wint_t" >&5
     6937+echo "$as_me:8098: result: $cf_cv_wint_t" >&5
    67996938 echo "${ECHO_T}$cf_cv_wint_t" >&6
    68006939 
    68016940 if test "$cf_cv_wint_t" = yes ; then
    6802 @@ -7780,7 +8126,7 @@
     6941@@ -7780,7 +8134,7 @@
    68036942        ;;
    68046943 esac
    68056944 
    68066945-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
    6807 +echo "$as_me:8129: checking whether to enable _LP64 definition in curses.h" >&5
     6946+echo "$as_me:8137: checking whether to enable _LP64 definition in curses.h" >&5
    68086947 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
    68096948 
    68106949 # Check whether --enable-lp64 or --disable-lp64 was given.
    6811 @@ -7790,7 +8136,7 @@
     6950@@ -7790,7 +8144,7 @@
    68126951 else
    68136952   with_lp64=$default_with_lp64
    68146953 fi;
    68156954-echo "$as_me:7793: result: $with_lp64" >&5
    6816 +echo "$as_me:8139: result: $with_lp64" >&5
     6955+echo "$as_me:8147: result: $with_lp64" >&5
    68176956 echo "${ECHO_T}$with_lp64" >&6
    68186957 
    68196958 if test "$with_lp64" = yes ; then
    6820 @@ -7806,7 +8152,7 @@
     6959@@ -7806,7 +8160,7 @@
    68216960 fi;
    68226961 if test "$enable_largefile" != no; then
    68236962 
    68246963-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
    6825 +  echo "$as_me:8155: checking for special C compiler options needed for large files" >&5
     6964+  echo "$as_me:8163: checking for special C compiler options needed for large files" >&5
    68266965 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
    68276966 if test "${ac_cv_sys_largefile_CC+set}" = set; then
    68286967   echo $ECHO_N "(cached) $ECHO_C" >&6
    6829 @@ -7818,7 +8164,7 @@
     6968@@ -7818,7 +8172,7 @@
    68306969         # IRIX 6.2 and later do not support large files by default,
    68316970         # so use the C compiler's -n32 option if that helps.
    68326971          cat >conftest.$ac_ext <<_ACEOF
    68336972-#line 7821 "configure"
    6834 +#line 8167 "configure"
     6973+#line 8175 "configure"
    68356974 #include "confdefs.h"
    68366975 #include <sys/types.h>
    68376976  /* Check that off_t can represent 2**63 - 1 correctly.
    6838 @@ -7838,16 +8184,16 @@
     6977@@ -7838,16 +8192,16 @@
    68396978 }
    68406979 _ACEOF
    68416980         rm -f conftest.$ac_objext
    68426981-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
    6843 +if { (eval echo "$as_me:8187: \"$ac_compile\"") >&5
     6982+if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
    68446983   (eval $ac_compile) 2>&5
    68456984   ac_status=$?
    68466985-  echo "$as_me:7844: \$? = $ac_status" >&5
    6847 +  echo "$as_me:8190: \$? = $ac_status" >&5
     6986+  echo "$as_me:8198: \$? = $ac_status" >&5
    68486987   (exit $ac_status); } &&
    68496988          { ac_try='test -s conftest.$ac_objext'
    68506989-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
    6851 +  { (eval echo "$as_me:8193: \"$ac_try\"") >&5
     6990+  { (eval echo "$as_me:8201: \"$ac_try\"") >&5
    68526991   (eval $ac_try) 2>&5
    68536992   ac_status=$?
    68546993-  echo "$as_me:7850: \$? = $ac_status" >&5
    6855 +  echo "$as_me:8196: \$? = $ac_status" >&5
     6994+  echo "$as_me:8204: \$? = $ac_status" >&5
    68566995   (exit $ac_status); }; }; then
    68576996   break
    68586997 else
    6859 @@ -7857,16 +8203,16 @@
     6998@@ -7857,16 +8211,16 @@
    68606999 rm -f conftest.$ac_objext
    68617000         CC="$CC -n32"
    68627001         rm -f conftest.$ac_objext
    68637002-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
    6864 +if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
     7003+if { (eval echo "$as_me:8214: \"$ac_compile\"") >&5
    68657004   (eval $ac_compile) 2>&5
    68667005   ac_status=$?
    68677006-  echo "$as_me:7863: \$? = $ac_status" >&5
    6868 +  echo "$as_me:8209: \$? = $ac_status" >&5
     7007+  echo "$as_me:8217: \$? = $ac_status" >&5
    68697008   (exit $ac_status); } &&
    68707009          { ac_try='test -s conftest.$ac_objext'
    68717010-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
    6872 +  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
     7011+  { (eval echo "$as_me:8220: \"$ac_try\"") >&5
    68737012   (eval $ac_try) 2>&5
    68747013   ac_status=$?
    68757014-  echo "$as_me:7869: \$? = $ac_status" >&5
    6876 +  echo "$as_me:8215: \$? = $ac_status" >&5
     7015+  echo "$as_me:8223: \$? = $ac_status" >&5
    68777016   (exit $ac_status); }; }; then
    68787017   ac_cv_sys_largefile_CC=' -n32'; break
    68797018 else
    6880 @@ -7880,13 +8226,13 @@
     7019@@ -7880,13 +8234,13 @@
    68817020        rm -f conftest.$ac_ext
    68827021     fi
    68837022 fi
    68847023-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
    6885 +echo "$as_me:8229: result: $ac_cv_sys_largefile_CC" >&5
     7024+echo "$as_me:8237: result: $ac_cv_sys_largefile_CC" >&5
    68867025 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
    68877026   if test "$ac_cv_sys_largefile_CC" != no; then
    … …  
    68907029 
    68917030-  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    6892 +  echo "$as_me:8235: checking for _FILE_OFFSET_BITS value needed for large files" >&5
     7031+  echo "$as_me:8243: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    68937032 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
    68947033 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    68957034   echo $ECHO_N "(cached) $ECHO_C" >&6
    6896 @@ -7894,7 +8240,7 @@
     7035@@ -7894,7 +8248,7 @@
    68977036   while :; do
    68987037   ac_cv_sys_file_offset_bits=no
    68997038   cat >conftest.$ac_ext <<_ACEOF
    69007039-#line 7897 "configure"
    6901 +#line 8243 "configure"
     7040+#line 8251 "configure"
    69027041 #include "confdefs.h"
    69037042 #include <sys/types.h>
    69047043  /* Check that off_t can represent 2**63 - 1 correctly.
    6905 @@ -7914,16 +8260,16 @@
     7044@@ -7914,16 +8268,16 @@
    69067045 }
    69077046 _ACEOF
    69087047 rm -f conftest.$ac_objext
    69097048-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
    6910 +if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5
     7049+if { (eval echo "$as_me:8271: \"$ac_compile\"") >&5
    69117050   (eval $ac_compile) 2>&5
    69127051   ac_status=$?
    69137052-  echo "$as_me:7920: \$? = $ac_status" >&5
    6914 +  echo "$as_me:8266: \$? = $ac_status" >&5
     7053+  echo "$as_me:8274: \$? = $ac_status" >&5
    69157054   (exit $ac_status); } &&
    69167055          { ac_try='test -s conftest.$ac_objext'
    69177056-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
    6918 +  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
     7057+  { (eval echo "$as_me:8277: \"$ac_try\"") >&5
    69197058   (eval $ac_try) 2>&5
    69207059   ac_status=$?
    69217060-  echo "$as_me:7926: \$? = $ac_status" >&5
    6922 +  echo "$as_me:8272: \$? = $ac_status" >&5
     7061+  echo "$as_me:8280: \$? = $ac_status" >&5
    69237062   (exit $ac_status); }; }; then
    69247063   break
    69257064 else
    6926 @@ -7932,7 +8278,7 @@
     7065@@ -7932,7 +8286,7 @@
    69277066 fi
    69287067 rm -f conftest.$ac_objext conftest.$ac_ext
    69297068   cat >conftest.$ac_ext <<_ACEOF
    69307069-#line 7935 "configure"
    6931 +#line 8281 "configure"
     7070+#line 8289 "configure"
    69327071 #include "confdefs.h"
    69337072 #define _FILE_OFFSET_BITS 64
    69347073 #include <sys/types.h>
    6935 @@ -7953,16 +8299,16 @@
     7074@@ -7953,16 +8307,16 @@
    69367075 }
    69377076 _ACEOF
    69387077 rm -f conftest.$ac_objext
    69397078-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
    6940 +if { (eval echo "$as_me:8302: \"$ac_compile\"") >&5
     7079+if { (eval echo "$as_me:8310: \"$ac_compile\"") >&5
    69417080   (eval $ac_compile) 2>&5
    69427081   ac_status=$?
    69437082-  echo "$as_me:7959: \$? = $ac_status" >&5
    6944 +  echo "$as_me:8305: \$? = $ac_status" >&5
     7083+  echo "$as_me:8313: \$? = $ac_status" >&5
    69457084   (exit $ac_status); } &&
    69467085          { ac_try='test -s conftest.$ac_objext'
    69477086-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
    6948 +  { (eval echo "$as_me:8308: \"$ac_try\"") >&5
     7087+  { (eval echo "$as_me:8316: \"$ac_try\"") >&5
    69497088   (eval $ac_try) 2>&5
    69507089   ac_status=$?
    69517090-  echo "$as_me:7965: \$? = $ac_status" >&5
    6952 +  echo "$as_me:8311: \$? = $ac_status" >&5
     7091+  echo "$as_me:8319: \$? = $ac_status" >&5
    69537092   (exit $ac_status); }; }; then
    69547093   ac_cv_sys_file_offset_bits=64; break
    69557094 else
    6956 @@ -7973,7 +8319,7 @@
     7095@@ -7973,7 +8327,7 @@
    69577096   break
    69587097 done
    69597098 fi
    69607099-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
    6961 +echo "$as_me:8322: result: $ac_cv_sys_file_offset_bits" >&5
     7100+echo "$as_me:8330: result: $ac_cv_sys_file_offset_bits" >&5
    69627101 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
    69637102 if test "$ac_cv_sys_file_offset_bits" != no; then
    69647103 
    6965 @@ -7983,7 +8329,7 @@
     7104@@ -7983,7 +8337,7 @@
    69667105 
    69677106 fi
    69687107 rm -f conftest*
    69697108-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
    6970 +  echo "$as_me:8332: checking for _LARGE_FILES value needed for large files" >&5
     7109+  echo "$as_me:8340: checking for _LARGE_FILES value needed for large files" >&5
    69717110 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
    69727111 if test "${ac_cv_sys_large_files+set}" = set; then
    69737112   echo $ECHO_N "(cached) $ECHO_C" >&6
    6974 @@ -7991,7 +8337,7 @@
     7113@@ -7991,7 +8345,7 @@
    69757114   while :; do
    69767115   ac_cv_sys_large_files=no
    69777116   cat >conftest.$ac_ext <<_ACEOF
    69787117-#line 7994 "configure"
    6979 +#line 8340 "configure"
     7118+#line 8348 "configure"
    69807119 #include "confdefs.h"
    69817120 #include <sys/types.h>
    69827121  /* Check that off_t can represent 2**63 - 1 correctly.
    6983 @@ -8011,16 +8357,16 @@
     7122@@ -8011,16 +8365,16 @@
    69847123 }
    69857124 _ACEOF
    69867125 rm -f conftest.$ac_objext
    69877126-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
    6988 +if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
     7127+if { (eval echo "$as_me:8368: \"$ac_compile\"") >&5
    69897128   (eval $ac_compile) 2>&5
    69907129   ac_status=$?
    69917130-  echo "$as_me:8017: \$? = $ac_status" >&5
    6992 +  echo "$as_me:8363: \$? = $ac_status" >&5
     7131+  echo "$as_me:8371: \$? = $ac_status" >&5
    69937132   (exit $ac_status); } &&
    69947133          { ac_try='test -s conftest.$ac_objext'
    69957134-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
    6996 +  { (eval echo "$as_me:8366: \"$ac_try\"") >&5
     7135+  { (eval echo "$as_me:8374: \"$ac_try\"") >&5
    69977136   (eval $ac_try) 2>&5
    69987137   ac_status=$?
    69997138-  echo "$as_me:8023: \$? = $ac_status" >&5
    7000 +  echo "$as_me:8369: \$? = $ac_status" >&5
     7139+  echo "$as_me:8377: \$? = $ac_status" >&5
    70017140   (exit $ac_status); }; }; then
    70027141   break
    70037142 else
    7004 @@ -8029,7 +8375,7 @@
     7143@@ -8029,7 +8383,7 @@
    70057144 fi
    70067145 rm -f conftest.$ac_objext conftest.$ac_ext
    70077146   cat >conftest.$ac_ext <<_ACEOF
    70087147-#line 8032 "configure"
    7009 +#line 8378 "configure"
     7148+#line 8386 "configure"
    70107149 #include "confdefs.h"
    70117150 #define _LARGE_FILES 1
    70127151 #include <sys/types.h>
    7013 @@ -8050,16 +8396,16 @@
     7152@@ -8050,16 +8404,16 @@
    70147153 }
    70157154 _ACEOF
    70167155 rm -f conftest.$ac_objext
    70177156-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
    7018 +if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5
     7157+if { (eval echo "$as_me:8407: \"$ac_compile\"") >&5
    70197158   (eval $ac_compile) 2>&5
    70207159   ac_status=$?
    70217160-  echo "$as_me:8056: \$? = $ac_status" >&5
    7022 +  echo "$as_me:8402: \$? = $ac_status" >&5
     7161+  echo "$as_me:8410: \$? = $ac_status" >&5
    70237162   (exit $ac_status); } &&
    70247163          { ac_try='test -s conftest.$ac_objext'
    70257164-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
    7026 +  { (eval echo "$as_me:8405: \"$ac_try\"") >&5
     7165+  { (eval echo "$as_me:8413: \"$ac_try\"") >&5
    70277166   (eval $ac_try) 2>&5
    70287167   ac_status=$?
    70297168-  echo "$as_me:8062: \$? = $ac_status" >&5
    7030 +  echo "$as_me:8408: \$? = $ac_status" >&5
     7169+  echo "$as_me:8416: \$? = $ac_status" >&5
    70317170   (exit $ac_status); }; }; then
    70327171   ac_cv_sys_large_files=1; break
    70337172 else
    7034 @@ -8070,7 +8416,7 @@
     7173@@ -8070,7 +8424,7 @@
    70357174   break
    70367175 done
    70377176 fi
    70387177-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
    7039 +echo "$as_me:8419: result: $ac_cv_sys_large_files" >&5
     7178+echo "$as_me:8427: result: $ac_cv_sys_large_files" >&5
    70407179 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
    70417180 if test "$ac_cv_sys_large_files" != no; then
    70427181 
    7043 @@ -8083,7 +8429,7 @@
     7182@@ -8083,7 +8437,7 @@
    70447183 fi
    70457184 
    70467185     if test "$enable_largefile" != no ; then
    70477186-       echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    7048 +       echo "$as_me:8432: checking for _LARGEFILE_SOURCE value needed for large files" >&5
     7187+       echo "$as_me:8440: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    70497188 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
    70507189 if test "${ac_cv_sys_largefile_source+set}" = set; then
    70517190   echo $ECHO_N "(cached) $ECHO_C" >&6
    7052 @@ -8091,7 +8437,7 @@
     7191@@ -8091,7 +8445,7 @@
    70537192   while :; do
    70547193   ac_cv_sys_largefile_source=no
    70557194   cat >conftest.$ac_ext <<_ACEOF
    70567195-#line 8094 "configure"
    7057 +#line 8440 "configure"
     7196+#line 8448 "configure"
    70587197 #include "confdefs.h"
    70597198 #include <stdio.h>
    70607199 int
    7061 @@ -8103,16 +8449,16 @@
     7200@@ -8103,16 +8457,16 @@
    70627201 }
    70637202 _ACEOF
    70647203 rm -f conftest.$ac_objext
    70657204-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
    7066 +if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5
     7205+if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5
    70677206   (eval $ac_compile) 2>&5
    70687207   ac_status=$?
    70697208-  echo "$as_me:8109: \$? = $ac_status" >&5
    7070 +  echo "$as_me:8455: \$? = $ac_status" >&5
     7209+  echo "$as_me:8463: \$? = $ac_status" >&5
    70717210   (exit $ac_status); } &&
    70727211          { ac_try='test -s conftest.$ac_objext'
    70737212-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
    7074 +  { (eval echo "$as_me:8458: \"$ac_try\"") >&5
     7213+  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
    70757214   (eval $ac_try) 2>&5
    70767215   ac_status=$?
    70777216-  echo "$as_me:8115: \$? = $ac_status" >&5
    7078 +  echo "$as_me:8461: \$? = $ac_status" >&5
     7217+  echo "$as_me:8469: \$? = $ac_status" >&5
    70797218   (exit $ac_status); }; }; then
    70807219   break
    70817220 else
    7082 @@ -8121,7 +8467,7 @@
     7221@@ -8121,7 +8475,7 @@
    70837222 fi
    70847223 rm -f conftest.$ac_objext conftest.$ac_ext
    70857224   cat >conftest.$ac_ext <<_ACEOF
    70867225-#line 8124 "configure"
    7087 +#line 8470 "configure"
     7226+#line 8478 "configure"
    70887227 #include "confdefs.h"
    70897228 #define _LARGEFILE_SOURCE 1
    70907229 #include <stdio.h>
    7091 @@ -8134,16 +8480,16 @@
     7230@@ -8134,16 +8488,16 @@
    70927231 }
    70937232 _ACEOF
    70947233 rm -f conftest.$ac_objext
    70957234-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
    7096 +if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5
     7235+if { (eval echo "$as_me:8491: \"$ac_compile\"") >&5
    70977236   (eval $ac_compile) 2>&5
    70987237   ac_status=$?
    70997238-  echo "$as_me:8140: \$? = $ac_status" >&5
    7100 +  echo "$as_me:8486: \$? = $ac_status" >&5
     7239+  echo "$as_me:8494: \$? = $ac_status" >&5
    71017240   (exit $ac_status); } &&
    71027241          { ac_try='test -s conftest.$ac_objext'
    71037242-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
    7104 +  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
     7243+  { (eval echo "$as_me:8497: \"$ac_try\"") >&5
    71057244   (eval $ac_try) 2>&5
    71067245   ac_status=$?
    71077246-  echo "$as_me:8146: \$? = $ac_status" >&5
    7108 +  echo "$as_me:8492: \$? = $ac_status" >&5
     7247+  echo "$as_me:8500: \$? = $ac_status" >&5
    71097248   (exit $ac_status); }; }; then
    71107249   ac_cv_sys_largefile_source=1; break
    71117250 else
    7112 @@ -8154,7 +8500,7 @@
     7251@@ -8154,7 +8508,7 @@
    71137252   break
    71147253 done
    71157254 fi
    71167255-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
    7117 +echo "$as_me:8503: result: $ac_cv_sys_largefile_source" >&5
     7256+echo "$as_me:8511: result: $ac_cv_sys_largefile_source" >&5
    71187257 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
    71197258 if test "$ac_cv_sys_largefile_source" != no; then
    71207259 
    7121 @@ -8168,13 +8514,13 @@
     7260@@ -8168,13 +8522,13 @@
    71227261 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
    71237262 # in glibc 2.1.3, but that breaks too many other things.
    71247263 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
    71257264-echo "$as_me:8171: checking for fseeko" >&5
    7126 +echo "$as_me:8517: checking for fseeko" >&5
     7265+echo "$as_me:8525: checking for fseeko" >&5
    71277266 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
    71287267 if test "${ac_cv_func_fseeko+set}" = set; then
    … …  
    71317270   cat >conftest.$ac_ext <<_ACEOF
    71327271-#line 8177 "configure"
    7133 +#line 8523 "configure"
     7272+#line 8531 "configure"
    71347273 #include "confdefs.h"
    71357274 #include <stdio.h>
    71367275 int
    7137 @@ -8186,16 +8532,16 @@
     7276@@ -8186,16 +8540,16 @@
    71387277 }
    71397278 _ACEOF
    71407279 rm -f conftest.$ac_objext conftest$ac_exeext
    71417280-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
    7142 +if { (eval echo "$as_me:8535: \"$ac_link\"") >&5
     7281+if { (eval echo "$as_me:8543: \"$ac_link\"") >&5
    71437282   (eval $ac_link) 2>&5
    71447283   ac_status=$?
    71457284-  echo "$as_me:8192: \$? = $ac_status" >&5
    7146 +  echo "$as_me:8538: \$? = $ac_status" >&5
     7285+  echo "$as_me:8546: \$? = $ac_status" >&5
    71477286   (exit $ac_status); } &&
    71487287          { ac_try='test -s conftest$ac_exeext'
    71497288-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
    7150 +  { (eval echo "$as_me:8541: \"$ac_try\"") >&5
     7289+  { (eval echo "$as_me:8549: \"$ac_try\"") >&5
    71517290   (eval $ac_try) 2>&5
    71527291   ac_status=$?
    71537292-  echo "$as_me:8198: \$? = $ac_status" >&5
    7154 +  echo "$as_me:8544: \$? = $ac_status" >&5
     7293+  echo "$as_me:8552: \$? = $ac_status" >&5
    71557294   (exit $ac_status); }; }; then
    71567295   ac_cv_func_fseeko=yes
    71577296 else
    7158 @@ -8205,7 +8551,7 @@
     7297@@ -8205,7 +8559,7 @@
    71597298 fi
    71607299 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    71617300 fi
    71627301-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
    7163 +echo "$as_me:8554: result: $ac_cv_func_fseeko" >&5
     7302+echo "$as_me:8562: result: $ac_cv_func_fseeko" >&5
    71647303 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
    71657304 if test $ac_cv_func_fseeko = yes; then
    71667305 
    7167 @@ -8226,14 +8572,14 @@
     7306@@ -8226,14 +8580,14 @@
    71687307        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
    71697308        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
    71707309 
    71717310-       echo "$as_me:8229: checking whether to use struct dirent64" >&5
    7172 +       echo "$as_me:8575: checking whether to use struct dirent64" >&5
     7311+       echo "$as_me:8583: checking whether to use struct dirent64" >&5
    71737312 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
    71747313 if test "${cf_cv_struct_dirent64+set}" = set; then
    … …  
    71787317                cat >conftest.$ac_ext <<_ACEOF
    71797318-#line 8236 "configure"
    7180 +#line 8582 "configure"
     7319+#line 8590 "configure"
    71817320 #include "confdefs.h"
    71827321 
    71837322 #include <sys/types.h>
    7184 @@ -8254,16 +8600,16 @@
     7323@@ -8254,16 +8608,16 @@
    71857324 }
    71867325 _ACEOF
    71877326 rm -f conftest.$ac_objext
    71887327-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
    7189 +if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5
     7328+if { (eval echo "$as_me:8611: \"$ac_compile\"") >&5
    71907329   (eval $ac_compile) 2>&5
    71917330   ac_status=$?
    71927331-  echo "$as_me:8260: \$? = $ac_status" >&5
    7193 +  echo "$as_me:8606: \$? = $ac_status" >&5
     7332+  echo "$as_me:8614: \$? = $ac_status" >&5
    71947333   (exit $ac_status); } &&
    71957334          { ac_try='test -s conftest.$ac_objext'
    71967335-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
    7197 +  { (eval echo "$as_me:8609: \"$ac_try\"") >&5
     7336+  { (eval echo "$as_me:8617: \"$ac_try\"") >&5
    71987337   (eval $ac_try) 2>&5
    71997338   ac_status=$?
    72007339-  echo "$as_me:8266: \$? = $ac_status" >&5
    7201 +  echo "$as_me:8612: \$? = $ac_status" >&5
     7340+  echo "$as_me:8620: \$? = $ac_status" >&5
    72027341   (exit $ac_status); }; }; then
    72037342   cf_cv_struct_dirent64=yes
    72047343 else
    7205 @@ -8274,7 +8620,7 @@
     7344@@ -8274,7 +8628,7 @@
    72067345 rm -f conftest.$ac_objext conftest.$ac_ext
    72077346 
    72087347 fi
    72097348-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
    7210 +echo "$as_me:8623: result: $cf_cv_struct_dirent64" >&5
     7349+echo "$as_me:8631: result: $cf_cv_struct_dirent64" >&5
    72117350 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
    72127351        test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
    72137352 #define HAVE_STRUCT_DIRENT64 1
    7214 @@ -8283,7 +8629,7 @@
     7353@@ -8283,7 +8637,7 @@
    72157354     fi
    72167355 
    72177356 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
    72187357-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    7219 +echo "$as_me:8632: checking if you want tparm not to use X/Open fixed-parameter list" >&5
     7358+echo "$as_me:8640: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    72207359 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
    72217360 
    72227361 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
    7223 @@ -8293,14 +8639,14 @@
     7362@@ -8293,14 +8647,14 @@
    72247363 else
    72257364   with_tparm_varargs=yes
    72267365 fi;
    72277366-echo "$as_me:8296: result: $with_tparm_varargs" >&5
    7228 +echo "$as_me:8642: result: $with_tparm_varargs" >&5
     7367+echo "$as_me:8650: result: $with_tparm_varargs" >&5
    72297368 echo "${ECHO_T}$with_tparm_varargs" >&6
    72307369 NCURSES_TPARM_VARARGS=0
    … …  
    72347373 if test "$with_ticlib" != no ; then
    72357374-echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    7236 +echo "$as_me:8649: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
     7375+echo "$as_me:8657: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    72377376 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
    72387377 
    72397378 # Check whether --enable-tic-depends or --disable-tic-depends was given.
    7240 @@ -8310,14 +8656,14 @@
     7379@@ -8310,14 +8664,14 @@
    72417380 else
    72427381   with_tic_depends=yes
    72437382 fi;
    72447383-echo "$as_me:8313: result: $with_tic_depends" >&5
    7245 +echo "$as_me:8659: result: $with_tic_depends" >&5
     7384+echo "$as_me:8667: result: $with_tic_depends" >&5
    72467385 echo "${ECHO_T}$with_tic_depends" >&6
    72477386 else
    … …  
    72517390 ###   use option --with-bool to override bool's type
    72527391-echo "$as_me:8320: checking for type of bool" >&5
    7253 +echo "$as_me:8666: checking for type of bool" >&5
     7392+echo "$as_me:8674: checking for type of bool" >&5
    72547393 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
    72557394 
    72567395 # Check whether --with-bool or --without-bool was given.
    7257 @@ -8327,10 +8673,10 @@
     7396@@ -8327,10 +8681,10 @@
    72587397 else
    72597398   NCURSES_BOOL=auto
    72607399 fi;
    72617400-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
    7262 +echo "$as_me:8676: result: $NCURSES_BOOL" >&5
     7401+echo "$as_me:8684: result: $NCURSES_BOOL" >&5
    72637402 echo "${ECHO_T}$NCURSES_BOOL" >&6
    72647403 
    72657404-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
    7266 +echo "$as_me:8679: checking for alternate terminal capabilities file" >&5
     7405+echo "$as_me:8687: checking for alternate terminal capabilities file" >&5
    72677406 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
    72687407 
    72697408 # Check whether --with-caps or --without-caps was given.
    7270 @@ -8341,11 +8687,11 @@
     7409@@ -8341,11 +8695,11 @@
    72717410   TERMINFO_CAPS=Caps
    72727411 fi;
    72737412 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
    72747413-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
    7275 +echo "$as_me:8690: result: $TERMINFO_CAPS" >&5
     7414+echo "$as_me:8698: result: $TERMINFO_CAPS" >&5
    72767415 echo "${ECHO_T}$TERMINFO_CAPS" >&6
    72777416 
    72787417 ###   use option --with-chtype to override chtype's type
    72797418-echo "$as_me:8348: checking for type of chtype" >&5
    7280 +echo "$as_me:8694: checking for type of chtype" >&5
     7419+echo "$as_me:8702: checking for type of chtype" >&5
    72817420 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    72827421 
    72837422 # Check whether --with-chtype or --without-chtype was given.
    7284 @@ -8355,11 +8701,11 @@
     7423@@ -8355,11 +8709,11 @@
    72857424 else
    72867425   NCURSES_CHTYPE=auto
    72877426 fi;
    72887427-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
    7289 +echo "$as_me:8704: result: $NCURSES_CHTYPE" >&5
     7428+echo "$as_me:8712: result: $NCURSES_CHTYPE" >&5
    72907429 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
    72917430 
    72927431 ###   use option --with-ospeed to override ospeed's type
    72937432-echo "$as_me:8362: checking for type of ospeed" >&5
    7294 +echo "$as_me:8708: checking for type of ospeed" >&5
     7433+echo "$as_me:8716: checking for type of ospeed" >&5
    72957434 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
    72967435 
    72977436 # Check whether --with-ospeed or --without-ospeed was given.
    7298 @@ -8369,11 +8715,11 @@
     7437@@ -8369,11 +8723,11 @@
    72997438 else
    73007439   NCURSES_OSPEED=short
    73017440 fi;
    73027441-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
    7303 +echo "$as_me:8718: result: $NCURSES_OSPEED" >&5
     7442+echo "$as_me:8726: result: $NCURSES_OSPEED" >&5
    73047443 echo "${ECHO_T}$NCURSES_OSPEED" >&6
    73057444 
    73067445 ###   use option --with-mmask-t to override mmask_t's type
    73077446-echo "$as_me:8376: checking for type of mmask_t" >&5
    7308 +echo "$as_me:8722: checking for type of mmask_t" >&5
     7447+echo "$as_me:8730: checking for type of mmask_t" >&5
    73097448 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
    73107449 
    73117450 # Check whether --with-mmask-t or --without-mmask-t was given.
    7312 @@ -8383,11 +8729,11 @@
     7451@@ -8383,11 +8737,11 @@
    73137452 else
    73147453   NCURSES_MMASK_T=auto
    73157454 fi;
    73167455-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
    7317 +echo "$as_me:8732: result: $NCURSES_MMASK_T" >&5
     7456+echo "$as_me:8740: result: $NCURSES_MMASK_T" >&5
    73187457 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
    73197458 
    73207459 ### Enable compiling-in rcs id's
    73217460-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
    7322 +echo "$as_me:8736: checking if RCS identifiers should be compiled-in" >&5
     7461+echo "$as_me:8744: checking if RCS identifiers should be compiled-in" >&5
    73237462 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
    73247463 
    73257464 # Check whether --with-rcs-ids or --without-rcs-ids was given.
    7326 @@ -8397,7 +8743,7 @@
     7465@@ -8397,7 +8751,7 @@
    73277466 else
    73287467   with_rcs_ids=no
    73297468 fi;
    73307469-echo "$as_me:8400: result: $with_rcs_ids" >&5
    7331 +echo "$as_me:8746: result: $with_rcs_ids" >&5
     7470+echo "$as_me:8754: result: $with_rcs_ids" >&5
    73327471 echo "${ECHO_T}$with_rcs_ids" >&6
    73337472 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
    73347473 #define USE_RCS_IDS 1
    7335 @@ -8405,7 +8751,7 @@
     7474@@ -8405,7 +8759,7 @@
    73367475 
    73377476 ###############################################################################
    73387477 
    73397478-echo "$as_me:8408: checking format of man-pages" >&5
    7340 +echo "$as_me:8754: checking format of man-pages" >&5
     7479+echo "$as_me:8762: checking format of man-pages" >&5
    73417480 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
    73427481 
    73437482 # Check whether --with-manpage-format or --without-manpage-format was given.
    7344 @@ -8433,7 +8779,7 @@
     7483@@ -8433,7 +8787,7 @@
    73457484   cf_catonly=yes
    73467485   cf_example=date
    … …  
    73517490     test -z "$cf_dir" && cf_dir=/usr/man
    73527491     for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
    7353 @@ -8494,14 +8840,14 @@
     7492@@ -8494,14 +8848,14 @@
    73547493   ;;
    73557494 esac
    73567495 
    73577496-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
    7358 +echo "$as_me:8843: result: $MANPAGE_FORMAT" >&5
     7497+echo "$as_me:8851: result: $MANPAGE_FORMAT" >&5
    73597498 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
    73607499 if test -n "$cf_unknown" ; then
    73617500-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
    7362 +  { echo "$as_me:8846: WARNING: Unexpected manpage-format $cf_unknown" >&5
     7501+  { echo "$as_me:8854: WARNING: Unexpected manpage-format $cf_unknown" >&5
    73637502 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
    73647503 fi
    73657504 
    73667505-echo "$as_me:8504: checking for manpage renaming" >&5
    7367 +echo "$as_me:8850: checking for manpage renaming" >&5
     7506+echo "$as_me:8858: checking for manpage renaming" >&5
    73687507 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
    73697508 
    73707509 # Check whether --with-manpage-renames or --without-manpage-renames was given.
    7371 @@ -8529,7 +8875,7 @@
     7510@@ -8529,7 +8883,7 @@
    73727511   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
    73737512     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
    73747513   elif test ! -f $MANPAGE_RENAMES ; then
    73757514-    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
    7376 +    { { echo "$as_me:8878: error: not a filename: $MANPAGE_RENAMES" >&5
     7515+    { { echo "$as_me:8886: error: not a filename: $MANPAGE_RENAMES" >&5
    73777516 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    73787517    { (exit 1); exit 1; }; }
    73797518   fi
    7380 @@ -8543,10 +8889,10 @@
     7519@@ -8543,10 +8897,10 @@
    73817520   fi
    73827521 fi
    73837522 
    73847523-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
    7385 +echo "$as_me:8892: result: $MANPAGE_RENAMES" >&5
     7524+echo "$as_me:8900: result: $MANPAGE_RENAMES" >&5
    73867525 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
    73877526 
    73887527-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
    7389 +echo "$as_me:8895: checking if manpage aliases will be installed" >&5
     7528+echo "$as_me:8903: checking if manpage aliases will be installed" >&5
    73907529 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
    73917530 
    73927531 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
    7393 @@ -8557,7 +8903,7 @@
     7532@@ -8557,7 +8911,7 @@
    73947533   MANPAGE_ALIASES=yes
    73957534 fi;
    73967535 
    73977536-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
    7398 +echo "$as_me:8906: result: $MANPAGE_ALIASES" >&5
     7537+echo "$as_me:8914: result: $MANPAGE_ALIASES" >&5
    73997538 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
    74007539 
    74017540 if test "$LN_S" = "ln -s"; then
    7402 @@ -8568,7 +8914,7 @@
     7541@@ -8568,7 +8922,7 @@
    74037542 
    74047543 MANPAGE_SYMLINKS=no
    74057544 if test "$MANPAGE_ALIASES" = yes ; then
    74067545-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
    7407 +echo "$as_me:8917: checking if manpage symlinks should be used" >&5
     7546+echo "$as_me:8925: checking if manpage symlinks should be used" >&5
    74087547 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
    74097548 
    74107549 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
    7411 @@ -8581,17 +8927,17 @@
     7550@@ -8581,17 +8935,17 @@
    74127551 
    74137552 if test "$$cf_use_symlinks" = no; then
    74147553 if test "$MANPAGE_SYMLINKS" = yes ; then
    74157554-       { echo "$as_me:8584: WARNING: cannot make symlinks" >&5
    7416 +       { echo "$as_me:8930: WARNING: cannot make symlinks" >&5
     7555+       { echo "$as_me:8938: WARNING: cannot make symlinks" >&5
    74177556 echo "$as_me: WARNING: cannot make symlinks" >&2;}
    74187557        MANPAGE_SYMLINKS=no
    … …  
    74217560 
    74227561-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
    7423 +echo "$as_me:8936: result: $MANPAGE_SYMLINKS" >&5
     7562+echo "$as_me:8944: result: $MANPAGE_SYMLINKS" >&5
    74247563 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
    74257564 fi
    74267565 
    74277566-echo "$as_me:8594: checking for manpage tbl" >&5
    7428 +echo "$as_me:8940: checking for manpage tbl" >&5
     7567+echo "$as_me:8948: checking for manpage tbl" >&5
    74297568 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
    74307569 
    74317570 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
    7432 @@ -8602,7 +8948,7 @@
     7571@@ -8602,7 +8956,7 @@
    74337572   MANPAGE_TBL=no
    74347573 fi;
    74357574 
    74367575-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
    7437 +echo "$as_me:8951: result: $MANPAGE_TBL" >&5
     7576+echo "$as_me:8959: result: $MANPAGE_TBL" >&5
    74387577 echo "${ECHO_T}$MANPAGE_TBL" >&6
    74397578 
    74407579   if test "$prefix" = "NONE" ; then
    7441 @@ -8718,7 +9064,7 @@
     7580@@ -8718,7 +9072,7 @@
    74427581                s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
    74437582 CF_EOF
    … …  
    74487587                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    74497588                cf_name=`echo $cf_name|sed "$program_transform_name"`
    7450 @@ -8913,7 +9259,7 @@
     7589@@ -8913,7 +9267,7 @@
    74517590 ###############################################################################
    74527591 
    74537592 ### Note that some functions (such as const) are normally disabled anyway.
    74547593-echo "$as_me:8916: checking if you want to build with function extensions" >&5
    7455 +echo "$as_me:9262: checking if you want to build with function extensions" >&5
     7594+echo "$as_me:9270: checking if you want to build with function extensions" >&5
    74567595 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
    74577596 
    74587597 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
    7459 @@ -8923,7 +9269,7 @@
     7598@@ -8923,7 +9277,7 @@
    74607599 else
    74617600   with_ext_funcs=yes
    74627601 fi;
    74637602-echo "$as_me:8926: result: $with_ext_funcs" >&5
    7464 +echo "$as_me:9272: result: $with_ext_funcs" >&5
     7603+echo "$as_me:9280: result: $with_ext_funcs" >&5
    74657604 echo "${ECHO_T}$with_ext_funcs" >&6
    74667605 if test "$with_ext_funcs" = yes ; then
    74677606        NCURSES_EXT_FUNCS=1
    7468 @@ -8955,12 +9301,38 @@
     7607@@ -8955,12 +9309,38 @@
    74697608 #define NCURSES_EXT_FUNCS 1
    74707609 EOF
    … …  
    74767615+fi
    74777616+
    7478 +echo "$as_me:9310: checking if you want to build with experimental SCREEN extensions" >&5
     7617+echo "$as_me:9318: checking if you want to build with experimental SCREEN extensions" >&5
    74797618+echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6
    74807619+
    … …  
    74867625+  with_sp_funcs=no
    74877626+fi;
    7488 +echo "$as_me:9320: result: $with_sp_funcs" >&5
     7627+echo "$as_me:9328: result: $with_sp_funcs" >&5
    74897628+echo "${ECHO_T}$with_sp_funcs" >&6
    74907629+if test "$with_sp_funcs" = yes ; then
    … …  
    75027641 ###   use option --enable-const to turn on use of const beyond that in XSI.
    75037642-echo "$as_me:8963: checking for extended use of const keyword" >&5
    7504 +echo "$as_me:9335: checking for extended use of const keyword" >&5
     7643+echo "$as_me:9343: checking for extended use of const keyword" >&5
    75057644 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
    75067645 
    75077646 # Check whether --enable-const or --disable-const was given.
    7508 @@ -8970,7 +9342,7 @@
     7647@@ -8970,7 +9350,7 @@
    75097648 else
    75107649   with_ext_const=no
    75117650 fi;
    75127651-echo "$as_me:8973: result: $with_ext_const" >&5
    7513 +echo "$as_me:9345: result: $with_ext_const" >&5
     7652+echo "$as_me:9353: result: $with_ext_const" >&5
    75147653 echo "${ECHO_T}$with_ext_const" >&6
    75157654 NCURSES_CONST='/*nothing*/'
    75167655 if test "$with_ext_const" = yes ; then
    7517 @@ -8978,7 +9350,7 @@
     7656@@ -8978,7 +9358,7 @@
    75187657 fi
    75197658 
    75207659 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
    75217660-echo "$as_me:8981: checking if you want to use extended colors" >&5
    7522 +echo "$as_me:9353: checking if you want to use extended colors" >&5
     7661+echo "$as_me:9361: checking if you want to use extended colors" >&5
    75237662 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
    75247663 
    75257664 # Check whether --enable-ext-colors or --disable-ext-colors was given.
    7526 @@ -8988,12 +9360,12 @@
     7665@@ -8988,12 +9368,12 @@
    75277666 else
    75287667   with_ext_colors=no
    75297668 fi;
    75307669-echo "$as_me:8991: result: $with_ext_colors" >&5
    7531 +echo "$as_me:9363: result: $with_ext_colors" >&5
     7670+echo "$as_me:9371: result: $with_ext_colors" >&5
    75327671 echo "${ECHO_T}$with_ext_colors" >&6
    75337672 NCURSES_EXT_COLORS=0
    … …  
    75357674        if test "$with_widec" != yes ; then
    75367675-               { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
    7537 +               { { echo "$as_me:9368: error: This option applies only to wide-character library" >&5
     7676+               { { echo "$as_me:9376: error: This option applies only to wide-character library" >&5
    75387677 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    75397678    { (exit 1); exit 1; }; }
    75407679        else
    7541 @@ -9004,7 +9376,7 @@
     7680@@ -9004,7 +9384,7 @@
    75427681        5.*)
    75437682                cf_cv_rel_version=6.0
    75447683                cf_cv_abi_version=6
    75457684-               { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7546 +               { echo "$as_me:9379: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     7685+               { echo "$as_me:9387: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    75477686 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    75487687                ;;
    75497688        esac
    7550 @@ -9019,7 +9391,7 @@
     7689@@ -9019,7 +9399,7 @@
    75517690 fi
    75527691 
    75537692 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
    75547693-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
    7555 +echo "$as_me:9394: checking if you want to use extended mouse encoding" >&5
     7694+echo "$as_me:9402: checking if you want to use extended mouse encoding" >&5
    75567695 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
    75577696 
    75587697 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
    7559 @@ -9029,7 +9401,7 @@
     7698@@ -9029,7 +9409,7 @@
    75607699 else
    75617700   with_ext_mouse=no
    75627701 fi;
    75637702-echo "$as_me:9032: result: $with_ext_mouse" >&5
    7564 +echo "$as_me:9404: result: $with_ext_mouse" >&5
     7703+echo "$as_me:9412: result: $with_ext_mouse" >&5
    75657704 echo "${ECHO_T}$with_ext_mouse" >&6
    75667705 NCURSES_MOUSE_VERSION=1
    75677706 if test "$with_ext_mouse" = yes ; then
    7568 @@ -9040,7 +9412,7 @@
     7707@@ -9040,7 +9420,7 @@
    75697708        5.*)
    75707709                cf_cv_rel_version=6.0
    75717710                cf_cv_abi_version=6
    75727711-               { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7573 +               { echo "$as_me:9415: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     7712+               { echo "$as_me:9423: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    75747713 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    75757714                ;;
    75767715        esac
    7577 @@ -9048,7 +9420,7 @@
     7716@@ -9048,7 +9428,7 @@
    75787717 
    75797718 fi
    75807719 
    75817720-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
    7582 +echo "$as_me:9423: checking if you want \$NCURSES_NO_PADDING code" >&5
     7721+echo "$as_me:9431: checking if you want \$NCURSES_NO_PADDING code" >&5
    75837722 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
    75847723 
    75857724 # Check whether --enable-no-padding or --disable-no-padding was given.
    7586 @@ -9058,19 +9430,19 @@
     7725@@ -9058,19 +9438,19 @@
    75877726 else
    75887727   with_no_padding=$with_ext_funcs
    75897728 fi;
    75907729-echo "$as_me:9061: result: $with_no_padding" >&5
    7591 +echo "$as_me:9433: result: $with_no_padding" >&5
     7730+echo "$as_me:9441: result: $with_no_padding" >&5
    75927731 echo "${ECHO_T}$with_no_padding" >&6
    75937732 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
    … …  
    75967735 
    75977736-echo "$as_me:9067: checking for ANSI C header files" >&5
    7598 +echo "$as_me:9439: checking for ANSI C header files" >&5
     7737+echo "$as_me:9447: checking for ANSI C header files" >&5
    75997738 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    76007739 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    76037742   cat >conftest.$ac_ext <<_ACEOF
    76047743-#line 9073 "configure"
    7605 +#line 9445 "configure"
     7744+#line 9453 "configure"
    76067745 #include "confdefs.h"
    76077746 #include <stdlib.h>
    76087747 #include <stdarg.h>
    7609 @@ -9078,13 +9450,13 @@
     7748@@ -9078,13 +9458,13 @@
    76107749 #include <float.h>
    76117750 
    76127751 _ACEOF
    76137752-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
    7614 +if { (eval echo "$as_me:9453: \"$ac_cpp conftest.$ac_ext\"") >&5
     7753+if { (eval echo "$as_me:9461: \"$ac_cpp conftest.$ac_ext\"") >&5
    76157754   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    76167755   ac_status=$?
    … …  
    76197758   cat conftest.err >&5
    76207759-  echo "$as_me:9087: \$? = $ac_status" >&5
    7621 +  echo "$as_me:9459: \$? = $ac_status" >&5
     7760+  echo "$as_me:9467: \$? = $ac_status" >&5
    76227761   (exit $ac_status); } >/dev/null; then
    76237762   if test -s conftest.err; then
    76247763     ac_cpp_err=$ac_c_preproc_warn_flag
    7625 @@ -9106,7 +9478,7 @@
     7764@@ -9106,7 +9486,7 @@
    76267765 if test $ac_cv_header_stdc = yes; then
    76277766   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    76287767   cat >conftest.$ac_ext <<_ACEOF
    76297768-#line 9109 "configure"
    7630 +#line 9481 "configure"
     7769+#line 9489 "configure"
    76317770 #include "confdefs.h"
    76327771 #include <string.h>
    76337772 
    7634 @@ -9124,7 +9496,7 @@
     7773@@ -9124,7 +9504,7 @@
    76357774 if test $ac_cv_header_stdc = yes; then
    76367775   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    76377776   cat >conftest.$ac_ext <<_ACEOF
    76387777-#line 9127 "configure"
    7639 +#line 9499 "configure"
     7778+#line 9507 "configure"
    76407779 #include "confdefs.h"
    76417780 #include <stdlib.h>
    76427781 
    7643 @@ -9145,7 +9517,7 @@
     7782@@ -9145,7 +9525,7 @@
    76447783   :
    76457784 else
    76467785   cat >conftest.$ac_ext <<_ACEOF
    76477786-#line 9148 "configure"
    7648 +#line 9520 "configure"
     7787+#line 9528 "configure"
    76497788 #include "confdefs.h"
    76507789 #include <ctype.h>
    76517790 #if ((' ' & 0x0FF) == 0x020)
    7652 @@ -9171,15 +9543,15 @@
     7791@@ -9171,15 +9551,15 @@
    76537792 }
    76547793 _ACEOF
    76557794 rm -f conftest$ac_exeext
    76567795-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
    7657 +if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
     7796+if { (eval echo "$as_me:9554: \"$ac_link\"") >&5
    76587797   (eval $ac_link) 2>&5
    76597798   ac_status=$?
    76607799-  echo "$as_me:9177: \$? = $ac_status" >&5
    7661 +  echo "$as_me:9549: \$? = $ac_status" >&5
     7800+  echo "$as_me:9557: \$? = $ac_status" >&5
    76627801   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    76637802-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
    7664 +  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
     7803+  { (eval echo "$as_me:9559: \"$ac_try\"") >&5
    76657804   (eval $ac_try) 2>&5
    76667805   ac_status=$?
    76677806-  echo "$as_me:9182: \$? = $ac_status" >&5
    7668 +  echo "$as_me:9554: \$? = $ac_status" >&5
     7807+  echo "$as_me:9562: \$? = $ac_status" >&5
    76697808   (exit $ac_status); }; }; then
    76707809   :
    76717810 else
    7672 @@ -9192,7 +9564,7 @@
     7811@@ -9192,7 +9572,7 @@
    76737812 fi
    76747813 fi
    76757814 fi
    76767815-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
    7677 +echo "$as_me:9567: result: $ac_cv_header_stdc" >&5
     7816+echo "$as_me:9575: result: $ac_cv_header_stdc" >&5
    76787817 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    76797818 if test $ac_cv_header_stdc = yes; then
    76807819 
    7681 @@ -9208,28 +9580,28 @@
     7820@@ -9208,28 +9588,28 @@
    76827821                   inttypes.h stdint.h unistd.h
    76837822 do
    76847823 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    76857824-echo "$as_me:9211: checking for $ac_header" >&5
    7686 +echo "$as_me:9583: checking for $ac_header" >&5
     7825+echo "$as_me:9591: checking for $ac_header" >&5
    76877826 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    76887827 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    76917830   cat >conftest.$ac_ext <<_ACEOF
    76927831-#line 9217 "configure"
    7693 +#line 9589 "configure"
     7832+#line 9597 "configure"
    76947833 #include "confdefs.h"
    76957834 $ac_includes_default
    … …  
    76987837 rm -f conftest.$ac_objext
    76997838-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
    7700 +if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5
     7839+if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
    77017840   (eval $ac_compile) 2>&5
    77027841   ac_status=$?
    77037842-  echo "$as_me:9226: \$? = $ac_status" >&5
    7704 +  echo "$as_me:9598: \$? = $ac_status" >&5
     7843+  echo "$as_me:9606: \$? = $ac_status" >&5
    77057844   (exit $ac_status); } &&
    77067845          { ac_try='test -s conftest.$ac_objext'
    77077846-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
    7708 +  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
     7847+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
    77097848   (eval $ac_try) 2>&5
    77107849   ac_status=$?
    77117850-  echo "$as_me:9232: \$? = $ac_status" >&5
    7712 +  echo "$as_me:9604: \$? = $ac_status" >&5
     7851+  echo "$as_me:9612: \$? = $ac_status" >&5
    77137852   (exit $ac_status); }; }; then
    77147853   eval "$as_ac_Header=yes"
    77157854 else
    7716 @@ -9239,7 +9611,7 @@
     7855@@ -9239,7 +9619,7 @@
    77177856 fi
    77187857 rm -f conftest.$ac_objext conftest.$ac_ext
    77197858 fi
    77207859-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7721 +echo "$as_me:9614: result: `eval echo '${'$as_ac_Header'}'`" >&5
     7860+echo "$as_me:9622: result: `eval echo '${'$as_ac_Header'}'`" >&5
    77227861 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    77237862 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    77247863   cat >>confdefs.h <<EOF
    7725 @@ -9249,13 +9621,13 @@
     7864@@ -9249,13 +9629,13 @@
    77267865 fi
    77277866 done
    77287867 
    77297868-echo "$as_me:9252: checking for signed char" >&5
    7730 +echo "$as_me:9624: checking for signed char" >&5
     7869+echo "$as_me:9632: checking for signed char" >&5
    77317870 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
    77327871 if test "${ac_cv_type_signed_char+set}" = set; then
    … …  
    77357874   cat >conftest.$ac_ext <<_ACEOF
    77367875-#line 9258 "configure"
    7737 +#line 9630 "configure"
     7876+#line 9638 "configure"
    77387877 #include "confdefs.h"
    77397878 $ac_includes_default
    77407879 int
    7741 @@ -9270,16 +9642,16 @@
     7880@@ -9270,16 +9650,16 @@
    77427881 }
    77437882 _ACEOF
    77447883 rm -f conftest.$ac_objext
    77457884-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
    7746 +if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5
     7885+if { (eval echo "$as_me:9653: \"$ac_compile\"") >&5
    77477886   (eval $ac_compile) 2>&5
    77487887   ac_status=$?
    77497888-  echo "$as_me:9276: \$? = $ac_status" >&5
    7750 +  echo "$as_me:9648: \$? = $ac_status" >&5
     7889+  echo "$as_me:9656: \$? = $ac_status" >&5
    77517890   (exit $ac_status); } &&
    77527891          { ac_try='test -s conftest.$ac_objext'
    77537892-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
    7754 +  { (eval echo "$as_me:9651: \"$ac_try\"") >&5
     7893+  { (eval echo "$as_me:9659: \"$ac_try\"") >&5
    77557894   (eval $ac_try) 2>&5
    77567895   ac_status=$?
    77577896-  echo "$as_me:9282: \$? = $ac_status" >&5
    7758 +  echo "$as_me:9654: \$? = $ac_status" >&5
     7897+  echo "$as_me:9662: \$? = $ac_status" >&5
    77597898   (exit $ac_status); }; }; then
    77607899   ac_cv_type_signed_char=yes
    77617900 else
    7762 @@ -9289,10 +9661,10 @@
     7901@@ -9289,10 +9669,10 @@
    77637902 fi
    77647903 rm -f conftest.$ac_objext conftest.$ac_ext
    77657904 fi
    77667905-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
    7767 +echo "$as_me:9664: result: $ac_cv_type_signed_char" >&5
     7906+echo "$as_me:9672: result: $ac_cv_type_signed_char" >&5
    77687907 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
    77697908 
    77707909-echo "$as_me:9295: checking size of signed char" >&5
    7771 +echo "$as_me:9667: checking size of signed char" >&5
     7910+echo "$as_me:9675: checking size of signed char" >&5
    77727911 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
    77737912 if test "${ac_cv_sizeof_signed_char+set}" = set; then
    77747913   echo $ECHO_N "(cached) $ECHO_C" >&6
    7775 @@ -9301,7 +9673,7 @@
     7914@@ -9301,7 +9681,7 @@
    77767915   if test "$cross_compiling" = yes; then
    77777916   # Depending upon the size, compute the lo and hi bounds.
    77787917 cat >conftest.$ac_ext <<_ACEOF
    77797918-#line 9304 "configure"
    7780 +#line 9676 "configure"
     7919+#line 9684 "configure"
    77817920 #include "confdefs.h"
    77827921 $ac_includes_default
    77837922 int
    7784 @@ -9313,21 +9685,21 @@
     7923@@ -9313,21 +9693,21 @@
    77857924 }
    77867925 _ACEOF
    77877926 rm -f conftest.$ac_objext
    77887927-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
    7789 +if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5
     7928+if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
    77907929   (eval $ac_compile) 2>&5
    77917930   ac_status=$?
    77927931-  echo "$as_me:9319: \$? = $ac_status" >&5
    7793 +  echo "$as_me:9691: \$? = $ac_status" >&5
     7932+  echo "$as_me:9699: \$? = $ac_status" >&5
    77947933   (exit $ac_status); } &&
    77957934          { ac_try='test -s conftest.$ac_objext'
    77967935-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
    7797 +  { (eval echo "$as_me:9694: \"$ac_try\"") >&5
     7936+  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
    77987937   (eval $ac_try) 2>&5
    77997938   ac_status=$?
    78007939-  echo "$as_me:9325: \$? = $ac_status" >&5
    7801 +  echo "$as_me:9697: \$? = $ac_status" >&5
     7940+  echo "$as_me:9705: \$? = $ac_status" >&5
    78027941   (exit $ac_status); }; }; then
    78037942   ac_lo=0 ac_mid=0
    … …  
    78057944     cat >conftest.$ac_ext <<_ACEOF
    78067945-#line 9330 "configure"
    7807 +#line 9702 "configure"
     7946+#line 9710 "configure"
    78087947 #include "confdefs.h"
    78097948 $ac_includes_default
    78107949 int
    7811 @@ -9339,16 +9711,16 @@
     7950@@ -9339,16 +9719,16 @@
    78127951 }
    78137952 _ACEOF
    78147953 rm -f conftest.$ac_objext
    78157954-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
    7816 +if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5
     7955+if { (eval echo "$as_me:9722: \"$ac_compile\"") >&5
    78177956   (eval $ac_compile) 2>&5
    78187957   ac_status=$?
    78197958-  echo "$as_me:9345: \$? = $ac_status" >&5
    7820 +  echo "$as_me:9717: \$? = $ac_status" >&5
     7959+  echo "$as_me:9725: \$? = $ac_status" >&5
    78217960   (exit $ac_status); } &&
    78227961          { ac_try='test -s conftest.$ac_objext'
    78237962-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
    7824 +  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
     7963+  { (eval echo "$as_me:9728: \"$ac_try\"") >&5
    78257964   (eval $ac_try) 2>&5
    78267965   ac_status=$?
    78277966-  echo "$as_me:9351: \$? = $ac_status" >&5
    7828 +  echo "$as_me:9723: \$? = $ac_status" >&5
     7967+  echo "$as_me:9731: \$? = $ac_status" >&5
    78297968   (exit $ac_status); }; }; then
    78307969   ac_hi=$ac_mid; break
    78317970 else
    7832 @@ -9364,7 +9736,7 @@
     7971@@ -9364,7 +9744,7 @@
    78337972 ac_hi=-1 ac_mid=-1
    78347973   while :; do
    78357974     cat >conftest.$ac_ext <<_ACEOF
    78367975-#line 9367 "configure"
    7837 +#line 9739 "configure"
     7976+#line 9747 "configure"
    78387977 #include "confdefs.h"
    78397978 $ac_includes_default
    78407979 int
    7841 @@ -9376,16 +9748,16 @@
     7980@@ -9376,16 +9756,16 @@
    78427981 }
    78437982 _ACEOF
    78447983 rm -f conftest.$ac_objext
    78457984-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
    7846 +if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5
     7985+if { (eval echo "$as_me:9759: \"$ac_compile\"") >&5
    78477986   (eval $ac_compile) 2>&5
    78487987   ac_status=$?
    78497988-  echo "$as_me:9382: \$? = $ac_status" >&5
    7850 +  echo "$as_me:9754: \$? = $ac_status" >&5
     7989+  echo "$as_me:9762: \$? = $ac_status" >&5
    78517990   (exit $ac_status); } &&
    78527991          { ac_try='test -s conftest.$ac_objext'
    78537992-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
    7854 +  { (eval echo "$as_me:9757: \"$ac_try\"") >&5
     7993+  { (eval echo "$as_me:9765: \"$ac_try\"") >&5
    78557994   (eval $ac_try) 2>&5
    78567995   ac_status=$?
    78577996-  echo "$as_me:9388: \$? = $ac_status" >&5
    7858 +  echo "$as_me:9760: \$? = $ac_status" >&5
     7997+  echo "$as_me:9768: \$? = $ac_status" >&5
    78597998   (exit $ac_status); }; }; then
    78607999   ac_lo=$ac_mid; break
    78618000 else
    7862 @@ -9401,7 +9773,7 @@
     8001@@ -9401,7 +9781,7 @@
    78638002 while test "x$ac_lo" != "x$ac_hi"; do
    78648003   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    78658004   cat >conftest.$ac_ext <<_ACEOF
    78668005-#line 9404 "configure"
    7867 +#line 9776 "configure"
     8006+#line 9784 "configure"
    78688007 #include "confdefs.h"
    78698008 $ac_includes_default
    78708009 int
    7871 @@ -9413,16 +9785,16 @@
     8010@@ -9413,16 +9793,16 @@
    78728011 }
    78738012 _ACEOF
    78748013 rm -f conftest.$ac_objext
    78758014-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
    7876 +if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5
     8015+if { (eval echo "$as_me:9796: \"$ac_compile\"") >&5
    78778016   (eval $ac_compile) 2>&5
    78788017   ac_status=$?
    78798018-  echo "$as_me:9419: \$? = $ac_status" >&5
    7880 +  echo "$as_me:9791: \$? = $ac_status" >&5
     8019+  echo "$as_me:9799: \$? = $ac_status" >&5
    78818020   (exit $ac_status); } &&
    78828021          { ac_try='test -s conftest.$ac_objext'
    78838022-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
    7884 +  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
     8023+  { (eval echo "$as_me:9802: \"$ac_try\"") >&5
    78858024   (eval $ac_try) 2>&5
    78868025   ac_status=$?
    78878026-  echo "$as_me:9425: \$? = $ac_status" >&5
    7888 +  echo "$as_me:9797: \$? = $ac_status" >&5
     8027+  echo "$as_me:9805: \$? = $ac_status" >&5
    78898028   (exit $ac_status); }; }; then
    78908029   ac_hi=$ac_mid
    78918030 else
    7892 @@ -9435,12 +9807,12 @@
     8031@@ -9435,12 +9815,12 @@
    78938032 ac_cv_sizeof_signed_char=$ac_lo
    78948033 else
    78958034   if test "$cross_compiling" = yes; then
    78968035-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
    7897 +  { { echo "$as_me:9810: error: cannot run test program while cross compiling" >&5
     8036+  { { echo "$as_me:9818: error: cannot run test program while cross compiling" >&5
    78988037 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    78998038    { (exit 1); exit 1; }; }
    … …  
    79018040   cat >conftest.$ac_ext <<_ACEOF
    79028041-#line 9443 "configure"
    7903 +#line 9815 "configure"
     8042+#line 9823 "configure"
    79048043 #include "confdefs.h"
    79058044 $ac_includes_default
    79068045 int
    7907 @@ -9456,15 +9828,15 @@
     8046@@ -9456,15 +9836,15 @@
    79088047 }
    79098048 _ACEOF
    79108049 rm -f conftest$ac_exeext
    79118050-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
    7912 +if { (eval echo "$as_me:9831: \"$ac_link\"") >&5
     8051+if { (eval echo "$as_me:9839: \"$ac_link\"") >&5
    79138052   (eval $ac_link) 2>&5
    79148053   ac_status=$?
    79158054-  echo "$as_me:9462: \$? = $ac_status" >&5
    7916 +  echo "$as_me:9834: \$? = $ac_status" >&5
     8055+  echo "$as_me:9842: \$? = $ac_status" >&5
    79178056   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    79188057-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
    7919 +  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
     8058+  { (eval echo "$as_me:9844: \"$ac_try\"") >&5
    79208059   (eval $ac_try) 2>&5
    79218060   ac_status=$?
    79228061-  echo "$as_me:9467: \$? = $ac_status" >&5
    7923 +  echo "$as_me:9839: \$? = $ac_status" >&5
     8062+  echo "$as_me:9847: \$? = $ac_status" >&5
    79248063   (exit $ac_status); }; }; then
    79258064   ac_cv_sizeof_signed_char=`cat conftest.val`
    79268065 else
    7927 @@ -9480,7 +9852,7 @@
     8066@@ -9480,7 +9860,7 @@
    79288067   ac_cv_sizeof_signed_char=0
    79298068 fi
    79308069 fi
    79318070-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
    7932 +echo "$as_me:9855: result: $ac_cv_sizeof_signed_char" >&5
     8071+echo "$as_me:9863: result: $ac_cv_sizeof_signed_char" >&5
    79338072 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
    79348073 cat >>confdefs.h <<EOF
    79358074 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
    7936 @@ -9491,7 +9863,7 @@
     8075@@ -9491,7 +9871,7 @@
    79378076 else
    79388077        NCURSES_SBOOL="char"
    79398078 fi
    79408079-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
    7941 +echo "$as_me:9866: checking if you want to use signed Boolean array in term.h" >&5
     8080+echo "$as_me:9874: checking if you want to use signed Boolean array in term.h" >&5
    79428081 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
    79438082 
    79448083 # Check whether --enable-signed-char or --disable-signed-char was given.
    7945 @@ -9501,12 +9873,12 @@
     8084@@ -9501,12 +9881,12 @@
    79468085 else
    79478086   with_signed_char=no
    79488087 fi;
    79498088-echo "$as_me:9504: result: $with_signed_char" >&5
    7950 +echo "$as_me:9876: result: $with_signed_char" >&5
     8089+echo "$as_me:9884: result: $with_signed_char" >&5
    79518090 echo "${ECHO_T}$with_signed_char" >&6
    79528091 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
    … …  
    79548093 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
    79558094-echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
    7956 +echo "$as_me:9881: checking if you want SIGWINCH handler" >&5
     8095+echo "$as_me:9889: checking if you want SIGWINCH handler" >&5
    79578096 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
    79588097 
    79598098 # Check whether --enable-sigwinch or --disable-sigwinch was given.
    7960 @@ -9516,14 +9888,14 @@
     8099@@ -9516,14 +9896,14 @@
    79618100 else
    79628101   with_sigwinch=$with_ext_funcs
    79638102 fi;
    79648103-echo "$as_me:9519: result: $with_sigwinch" >&5
    7965 +echo "$as_me:9891: result: $with_sigwinch" >&5
     8104+echo "$as_me:9899: result: $with_sigwinch" >&5
    79668105 echo "${ECHO_T}$with_sigwinch" >&6
    79678106 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
    … …  
    79718110 ###   use option --enable-tcap-names to allow user to define new capabilities
    79728111-echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
    7973 +echo "$as_me:9898: checking if you want user-definable terminal capabilities like termcap" >&5
     8112+echo "$as_me:9906: checking if you want user-definable terminal capabilities like termcap" >&5
    79748113 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
    79758114 
    79768115 # Check whether --enable-tcap-names or --disable-tcap-names was given.
    7977 @@ -9533,7 +9905,7 @@
     8116@@ -9533,7 +9913,7 @@
    79788117 else
    79798118   with_tcap_names=$with_ext_funcs
    79808119 fi;
    79818120-echo "$as_me:9536: result: $with_tcap_names" >&5
    7982 +echo "$as_me:9908: result: $with_tcap_names" >&5
     8121+echo "$as_me:9916: result: $with_tcap_names" >&5
    79838122 echo "${ECHO_T}$with_tcap_names" >&6
    79848123 NCURSES_XNAMES=0
    79858124 test "$with_tcap_names" = yes && NCURSES_XNAMES=1
    7986 @@ -9541,7 +9913,7 @@
     8125@@ -9541,7 +9921,7 @@
    79878126 ###############################################################################
    79888127 # These options are relatively safe to experiment with.
    79898128 
    79908129-echo "$as_me:9544: checking if you want all development code" >&5
    7991 +echo "$as_me:9916: checking if you want all development code" >&5
     8130+echo "$as_me:9924: checking if you want all development code" >&5
    79928131 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
    79938132 
    79948133 # Check whether --with-develop or --without-develop was given.
    7995 @@ -9551,11 +9923,11 @@
     8134@@ -9551,11 +9931,11 @@
    79968135 else
    79978136   with_develop=no
    79988137 fi;
    79998138-echo "$as_me:9554: result: $with_develop" >&5
    8000 +echo "$as_me:9926: result: $with_develop" >&5
     8139+echo "$as_me:9934: result: $with_develop" >&5
    80018140 echo "${ECHO_T}$with_develop" >&6
    80028141 
    80038142 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
    80048143-echo "$as_me:9558: checking if you want hard-tabs code" >&5
    8005 +echo "$as_me:9930: checking if you want hard-tabs code" >&5
     8144+echo "$as_me:9938: checking if you want hard-tabs code" >&5
    80068145 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
    80078146 
    80088147 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
    8009 @@ -9565,14 +9937,14 @@
     8148@@ -9565,14 +9945,14 @@
    80108149 else
    80118150   enable_hard_tabs=$with_develop
    80128151 fi;
    80138152-echo "$as_me:9568: result: $enable_hard_tabs" >&5
    8014 +echo "$as_me:9940: result: $enable_hard_tabs" >&5
     8153+echo "$as_me:9948: result: $enable_hard_tabs" >&5
    80158154 echo "${ECHO_T}$enable_hard_tabs" >&6
    80168155 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
    … …  
    80208159 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
    80218160-echo "$as_me:9575: checking if you want limited support for xmc" >&5
    8022 +echo "$as_me:9947: checking if you want limited support for xmc" >&5
     8161+echo "$as_me:9955: checking if you want limited support for xmc" >&5
    80238162 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
    80248163 
    80258164 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
    8026 @@ -9582,7 +9954,7 @@
     8165@@ -9582,7 +9962,7 @@
    80278166 else
    80288167   enable_xmc_glitch=$with_develop
    80298168 fi;
    80308169-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
    8031 +echo "$as_me:9957: result: $enable_xmc_glitch" >&5
     8170+echo "$as_me:9965: result: $enable_xmc_glitch" >&5
    80328171 echo "${ECHO_T}$enable_xmc_glitch" >&6
    80338172 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
    80348173 #define USE_XMC_SUPPORT 1
    8035 @@ -9591,7 +9963,7 @@
     8174@@ -9591,7 +9971,7 @@
    80368175 ###############################################################################
    80378176 # These are just experimental, probably should not be in a package:
    80388177 
    80398178-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
    8040 +echo "$as_me:9966: checking if you do not want to assume colors are white-on-black" >&5
     8179+echo "$as_me:9974: checking if you do not want to assume colors are white-on-black" >&5
    80418180 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
    80428181 
    80438182 # Check whether --enable-assumed-color or --disable-assumed-color was given.
    8044 @@ -9601,14 +9973,14 @@
     8183@@ -9601,14 +9981,14 @@
    80458184 else
    80468185   with_assumed_color=yes
    80478186 fi;
    80488187-echo "$as_me:9604: result: $with_assumed_color" >&5
    8049 +echo "$as_me:9976: result: $with_assumed_color" >&5
     8188+echo "$as_me:9984: result: $with_assumed_color" >&5
    80508189 echo "${ECHO_T}$with_assumed_color" >&6
    80518190 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
    … …  
    80558194 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
    80568195-echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
    8057 +echo "$as_me:9983: checking if you want hashmap scrolling-optimization code" >&5
     8196+echo "$as_me:9991: checking if you want hashmap scrolling-optimization code" >&5
    80588197 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
    80598198 
    80608199 # Check whether --enable-hashmap or --disable-hashmap was given.
    8061 @@ -9618,14 +9990,14 @@
     8200@@ -9618,14 +9998,14 @@
    80628201 else
    80638202   with_hashmap=yes
    80648203 fi;
    80658204-echo "$as_me:9621: result: $with_hashmap" >&5
    8066 +echo "$as_me:9993: result: $with_hashmap" >&5
     8205+echo "$as_me:10001: result: $with_hashmap" >&5
    80678206 echo "${ECHO_T}$with_hashmap" >&6
    80688207 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
    … …  
    80728211 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
    80738212-echo "$as_me:9628: checking if you want colorfgbg code" >&5
    8074 +echo "$as_me:10000: checking if you want colorfgbg code" >&5
     8213+echo "$as_me:10008: checking if you want colorfgbg code" >&5
    80758214 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
    80768215 
    80778216 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
    8078 @@ -9635,7 +10007,7 @@
     8217@@ -9635,7 +10015,7 @@
    80798218 else
    80808219   with_colorfgbg=no
    80818220 fi;
    80828221-echo "$as_me:9638: result: $with_colorfgbg" >&5
    8083 +echo "$as_me:10010: result: $with_colorfgbg" >&5
     8222+echo "$as_me:10018: result: $with_colorfgbg" >&5
    80848223 echo "${ECHO_T}$with_colorfgbg" >&6
    80858224 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
    80868225 #define USE_COLORFGBG 1
    8087 @@ -9644,7 +10016,7 @@
     8226@@ -9644,7 +10024,7 @@
    80888227 # This is still experimental (20080329), but should ultimately be moved to
    80898228 # the script-block --with-normal, etc.
    80908229 
    80918230-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
    8092 +echo "$as_me:10019: checking if you want to link with the pthread library" >&5
     8231+echo "$as_me:10027: checking if you want to link with the pthread library" >&5
    80938232 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
    80948233 
    80958234 # Check whether --with-pthread or --without-pthread was given.
    8096 @@ -9654,27 +10026,27 @@
     8235@@ -9654,27 +10034,27 @@
    80978236 else
    80988237   with_pthread=no
    80998238 fi;
    81008239-echo "$as_me:9657: result: $with_pthread" >&5
    8101 +echo "$as_me:10029: result: $with_pthread" >&5
     8240+echo "$as_me:10037: result: $with_pthread" >&5
    81028241 echo "${ECHO_T}$with_pthread" >&6
    81038242 
    81048243 if test "$with_pthread" != no ; then
    81058244-    echo "$as_me:9661: checking for pthread.h" >&5
    8106 +    echo "$as_me:10033: checking for pthread.h" >&5
     8245+    echo "$as_me:10041: checking for pthread.h" >&5
    81078246 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
    81088247 if test "${ac_cv_header_pthread_h+set}" = set; then
    … …  
    81118250   cat >conftest.$ac_ext <<_ACEOF
    81128251-#line 9667 "configure"
    8113 +#line 10039 "configure"
     8252+#line 10047 "configure"
    81148253 #include "confdefs.h"
    81158254 #include <pthread.h>
    81168255 _ACEOF
    81178256-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
    8118 +if { (eval echo "$as_me:10043: \"$ac_cpp conftest.$ac_ext\"") >&5
     8257+if { (eval echo "$as_me:10051: \"$ac_cpp conftest.$ac_ext\"") >&5
    81198258   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    81208259   ac_status=$?
    … …  
    81238262   cat conftest.err >&5
    81248263-  echo "$as_me:9677: \$? = $ac_status" >&5
    8125 +  echo "$as_me:10049: \$? = $ac_status" >&5
     8264+  echo "$as_me:10057: \$? = $ac_status" >&5
    81268265   (exit $ac_status); } >/dev/null; then
    81278266   if test -s conftest.err; then
    81288267     ac_cpp_err=$ac_c_preproc_warn_flag
    8129 @@ -9693,7 +10065,7 @@
     8268@@ -9693,7 +10073,7 @@
    81308269 fi
    81318270 rm -f conftest.err conftest.$ac_ext
    81328271 fi
    81338272-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
    8134 +echo "$as_me:10068: result: $ac_cv_header_pthread_h" >&5
     8273+echo "$as_me:10076: result: $ac_cv_header_pthread_h" >&5
    81358274 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
    81368275 if test $ac_cv_header_pthread_h = yes; then
    81378276 
    8138 @@ -9701,12 +10073,12 @@
     8277@@ -9701,12 +10081,12 @@
    81398278 #define HAVE_PTHREADS_H 1
    81408279 EOF
    81418280 
    81428281-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
    8143 +        echo "$as_me:10076: checking if we can link with the pthread library" >&5
     8282+        echo "$as_me:10084: checking if we can link with the pthread library" >&5
    81448283 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
    81458284         cf_save_LIBS="$LIBS"
    … …  
    81478286         cat >conftest.$ac_ext <<_ACEOF
    81488287-#line 9709 "configure"
    8149 +#line 10081 "configure"
     8288+#line 10089 "configure"
    81508289 #include "confdefs.h"
    81518290 
    81528291 #include <pthread.h>
    8153 @@ -9722,16 +10094,16 @@
     8292@@ -9722,16 +10102,16 @@
    81548293 }
    81558294 _ACEOF
    81568295 rm -f conftest.$ac_objext conftest$ac_exeext
    81578296-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
    8158 +if { (eval echo "$as_me:10097: \"$ac_link\"") >&5
     8297+if { (eval echo "$as_me:10105: \"$ac_link\"") >&5
    81598298   (eval $ac_link) 2>&5
    81608299   ac_status=$?
    81618300-  echo "$as_me:9728: \$? = $ac_status" >&5
    8162 +  echo "$as_me:10100: \$? = $ac_status" >&5
     8301+  echo "$as_me:10108: \$? = $ac_status" >&5
    81638302   (exit $ac_status); } &&
    81648303          { ac_try='test -s conftest$ac_exeext'
    81658304-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
    8166 +  { (eval echo "$as_me:10103: \"$ac_try\"") >&5
     8305+  { (eval echo "$as_me:10111: \"$ac_try\"") >&5
    81678306   (eval $ac_try) 2>&5
    81688307   ac_status=$?
    81698308-  echo "$as_me:9734: \$? = $ac_status" >&5
    8170 +  echo "$as_me:10106: \$? = $ac_status" >&5
     8309+  echo "$as_me:10114: \$? = $ac_status" >&5
    81718310   (exit $ac_status); }; }; then
    81728311   with_pthread=yes
    81738312 else
    8174 @@ -9741,7 +10113,7 @@
     8313@@ -9741,7 +10121,7 @@
    81758314 fi
    81768315 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    81778316         LIBS="$cf_save_LIBS"
    81788317-        echo "$as_me:9744: result: $with_pthread" >&5
    8179 +        echo "$as_me:10116: result: $with_pthread" >&5
     8318+        echo "$as_me:10124: result: $with_pthread" >&5
    81808319 echo "${ECHO_T}$with_pthread" >&6
    81818320 
    81828321         if test "$with_pthread" = yes ; then
    8183 @@ -9751,7 +10123,7 @@
     8322@@ -9751,7 +10131,7 @@
    81848323 EOF
    81858324 
    81868325         else
    81878326-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
    8188 +            { { echo "$as_me:10126: error: Cannot link with pthread library" >&5
     8327+            { { echo "$as_me:10134: error: Cannot link with pthread library" >&5
    81898328 echo "$as_me: error: Cannot link with pthread library" >&2;}
    81908329    { (exit 1); exit 1; }; }
    81918330         fi
    8192 @@ -9760,7 +10132,7 @@
     8331@@ -9760,7 +10140,7 @@
    81938332 
    81948333 fi
    81958334 
    81968335-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
    8197 +echo "$as_me:10135: checking if you want to use weak-symbols for pthreads" >&5
     8336+echo "$as_me:10143: checking if you want to use weak-symbols for pthreads" >&5
    81988337 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
    81998338 
    82008339 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
    8201 @@ -9770,18 +10142,18 @@
     8340@@ -9770,18 +10150,18 @@
    82028341 else
    82038342   use_weak_symbols=no
    82048343 fi;
    82058344-echo "$as_me:9773: result: $use_weak_symbols" >&5
    8206 +echo "$as_me:10145: result: $use_weak_symbols" >&5
     8345+echo "$as_me:10153: result: $use_weak_symbols" >&5
    82078346 echo "${ECHO_T}$use_weak_symbols" >&6
    82088347 if test "$use_weak_symbols" = yes ; then
    82098348 
    82108349-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
    8211 +echo "$as_me:10149: checking if $CC supports weak symbols" >&5
     8350+echo "$as_me:10157: checking if $CC supports weak symbols" >&5
    82128351 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
    82138352 if test "${cf_cv_weak_symbols+set}" = set; then
    … …  
    82178356 cat >conftest.$ac_ext <<_ACEOF
    82188357-#line 9784 "configure"
    8219 +#line 10156 "configure"
     8358+#line 10164 "configure"
    82208359 #include "confdefs.h"
    82218360 
    82228361 #include <stdio.h>
    8223 @@ -9807,16 +10179,16 @@
     8362@@ -9807,16 +10187,16 @@
    82248363 }
    82258364 _ACEOF
    82268365 rm -f conftest.$ac_objext
    82278366-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
    8228 +if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5
     8367+if { (eval echo "$as_me:10190: \"$ac_compile\"") >&5
    82298368   (eval $ac_compile) 2>&5
    82308369   ac_status=$?
    82318370-  echo "$as_me:9813: \$? = $ac_status" >&5
    8232 +  echo "$as_me:10185: \$? = $ac_status" >&5
     8371+  echo "$as_me:10193: \$? = $ac_status" >&5
    82338372   (exit $ac_status); } &&
    82348373          { ac_try='test -s conftest.$ac_objext'
    82358374-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
    8236 +  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
     8375+  { (eval echo "$as_me:10196: \"$ac_try\"") >&5
    82378376   (eval $ac_try) 2>&5
    82388377   ac_status=$?
    82398378-  echo "$as_me:9819: \$? = $ac_status" >&5
    8240 +  echo "$as_me:10191: \$? = $ac_status" >&5
     8379+  echo "$as_me:10199: \$? = $ac_status" >&5
    82418380   (exit $ac_status); }; }; then
    82428381   cf_cv_weak_symbols=yes
    82438382 else
    8244 @@ -9827,7 +10199,7 @@
     8383@@ -9827,7 +10207,7 @@
    82458384 rm -f conftest.$ac_objext conftest.$ac_ext
    82468385 
    82478386 fi
    82488387-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
    8249 +echo "$as_me:10202: result: $cf_cv_weak_symbols" >&5
     8388+echo "$as_me:10210: result: $cf_cv_weak_symbols" >&5
    82508389 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
    82518390 
    82528391 else
    8253 @@ -9857,7 +10229,7 @@
     8392@@ -9857,7 +10237,7 @@
    82548393 # opaque outside of that, so there is no --enable-opaque option.  We can use
    82558394 # this option without --with-pthreads, but this will be always set for
    82568395 # pthreads.
    82578396-echo "$as_me:9860: checking if you want experimental reentrant code" >&5
    8258 +echo "$as_me:10232: checking if you want experimental reentrant code" >&5
     8397+echo "$as_me:10240: checking if you want experimental reentrant code" >&5
    82598398 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
    82608399 
    82618400 # Check whether --enable-reentrant or --disable-reentrant was given.
    8262 @@ -9867,7 +10239,7 @@
     8401@@ -9867,21 +10247,21 @@
    82638402 else
    82648403   with_reentrant=no
    82658404 fi;
    82668405-echo "$as_me:9870: result: $with_reentrant" >&5
    8267 +echo "$as_me:10242: result: $with_reentrant" >&5
     8406+echo "$as_me:10250: result: $with_reentrant" >&5
    82688407 echo "${ECHO_T}$with_reentrant" >&6
    82698408 if test "$with_reentrant" = yes ; then
    82708409        cf_cv_enable_reentrant=1
    8271 @@ -9891,7 +10263,7 @@
     8410        cf_cv_enable_opaque="NCURSES_INTERNALS"
     8411        NCURSES_OPAQUE=1
     8412        NCURSES_SIZE_T=int
     8413-    if test $cf_cv_weak_symbols = yes ; then
     8414+       if test $cf_cv_weak_symbols = yes ; then
     8415 
     8416 # remove pthread library from $LIBS
     8417 LIBS=`echo "$LIBS" | sed -e 's/-lpthread[      ]//g' -e 's/-lpthread$//'`
     8418 
     8419-    else
     8420-        LIB_SUFFIX="t${LIB_SUFFIX}"
     8421-    fi
     8422+       else
     8423+               LIB_SUFFIX="t${LIB_SUFFIX}"
     8424+       fi
     8425        cat >>confdefs.h <<\EOF
     8426 #define USE_REENTRANT 1
     8427 EOF
     8428@@ -9891,7 +10271,7 @@
    82728429        5.*)
    82738430                cf_cv_rel_version=6.0
    82748431                cf_cv_abi_version=6
    82758432-               { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    8276 +               { echo "$as_me:10266: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
     8433+               { echo "$as_me:10274: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    82778434 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    82788435                ;;
    82798436        esac
    8280 @@ -9904,7 +10276,7 @@
     8437@@ -9904,7 +10284,29 @@
    82818438        NCURSES_SIZE_T=short
    82828439 fi
    82838440 
    82848441-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
    8285 +echo "$as_me:10279: checking if you want experimental safe-sprintf code" >&5
     8442+### Allow using a different wrap-prefix
     8443+if test "$cf_cv_enable_reentrant" != 0 ; then
     8444+       echo "$as_me:10289: checking for prefix used to wrap public variables" >&5
     8445+echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
     8446+
     8447+# Check whether --with-wrap-prefix or --without-wrap-prefix was given.
     8448+if test "${with_wrap_prefix+set}" = set; then
     8449+  withval="$with_wrap_prefix"
     8450+  NCURSES_WRAP_PREFIX=$withval
     8451+else
     8452+  NCURSES_WRAP_PREFIX=_nc_
     8453+fi;
     8454+       echo "$as_me:10299: result: $NCURSES_WRAP_PREFIX" >&5
     8455+echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
     8456+else
     8457+       NCURSES_WRAP_PREFIX=_nc_
     8458+fi
     8459+
     8460+cat >>confdefs.h <<EOF
     8461+#define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
     8462+EOF
     8463+
     8464+echo "$as_me:10309: checking if you want experimental safe-sprintf code" >&5
    82868465 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
    82878466 
    82888467 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
    8289 @@ -9914,7 +10286,7 @@
     8468@@ -9914,7 +10316,7 @@
    82908469 else
    82918470   with_safe_sprintf=no
    82928471 fi;
    82938472-echo "$as_me:9917: result: $with_safe_sprintf" >&5
    8294 +echo "$as_me:10289: result: $with_safe_sprintf" >&5
     8473+echo "$as_me:10319: result: $with_safe_sprintf" >&5
    82958474 echo "${ECHO_T}$with_safe_sprintf" >&6
    82968475 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
    82978476 #define USE_SAFE_SPRINTF 1
    8298 @@ -9923,7 +10295,7 @@
     8477@@ -9923,7 +10325,7 @@
    82998478 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
    83008479 # when hashmap is used scroll hints are useless
    83018480 if test "$with_hashmap" = no ; then
    83028481-echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
    8303 +echo "$as_me:10298: checking if you want to experiment without scrolling-hints code" >&5
     8482+echo "$as_me:10328: checking if you want to experiment without scrolling-hints code" >&5
    83048483 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
    83058484 
    83068485 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
    8307 @@ -9933,7 +10305,7 @@
     8486@@ -9933,7 +10335,7 @@
    83088487 else
    83098488   with_scroll_hints=yes
    83108489 fi;
    83118490-echo "$as_me:9936: result: $with_scroll_hints" >&5
    8312 +echo "$as_me:10308: result: $with_scroll_hints" >&5
     8491+echo "$as_me:10338: result: $with_scroll_hints" >&5
    83138492 echo "${ECHO_T}$with_scroll_hints" >&6
    83148493 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
    83158494 #define USE_SCROLL_HINTS 1
    8316 @@ -9941,7 +10313,7 @@
     8495@@ -9941,7 +10343,7 @@
    83178496 
    83188497 fi
    83198498 
    83208499-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
    8321 +echo "$as_me:10316: checking if you want experimental wgetch-events code" >&5
     8500+echo "$as_me:10346: checking if you want experimental wgetch-events code" >&5
    83228501 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
    83238502 
    83248503 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
    8325 @@ -9951,7 +10323,7 @@
     8504@@ -9951,7 +10353,7 @@
    83268505 else
    83278506   with_wgetch_events=no
    83288507 fi;
    83298508-echo "$as_me:9954: result: $with_wgetch_events" >&5
    8330 +echo "$as_me:10326: result: $with_wgetch_events" >&5
     8509+echo "$as_me:10356: result: $with_wgetch_events" >&5
    83318510 echo "${ECHO_T}$with_wgetch_events" >&6
    83328511 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
    83338512 #define NCURSES_WGETCH_EVENTS 1
    8334 @@ -9960,7 +10332,7 @@
     8513@@ -9960,7 +10362,7 @@
    83358514 ###############################################################################
    83368515 
    83378516 ###    use option --disable-echo to suppress full display compiling commands
    83388517-echo "$as_me:9963: checking if you want to display full commands during build" >&5
    8339 +echo "$as_me:10335: checking if you want to display full commands during build" >&5
     8518+echo "$as_me:10365: checking if you want to display full commands during build" >&5
    83408519 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
    83418520 
    83428521 # Check whether --enable-echo or --disable-echo was given.
    8343 @@ -9977,11 +10349,11 @@
     8522@@ -9977,11 +10379,11 @@
    83448523        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
    83458524        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
    83468525 fi
    83478526-echo "$as_me:9980: result: $with_echo" >&5
    8348 +echo "$as_me:10352: result: $with_echo" >&5
     8527+echo "$as_me:10382: result: $with_echo" >&5
    83498528 echo "${ECHO_T}$with_echo" >&6
    83508529 
    83518530 ###    use option --enable-warnings to turn on all gcc warnings
    83528531-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
    8353 +echo "$as_me:10356: checking if you want to see compiler warnings" >&5
     8532+echo "$as_me:10386: checking if you want to see compiler warnings" >&5
    83548533 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
    83558534 
    83568535 # Check whether --enable-warnings or --disable-warnings was given.
    8357 @@ -9989,7 +10361,7 @@
     8536@@ -9989,7 +10391,7 @@
    83588537   enableval="$enable_warnings"
    83598538   with_warnings=$enableval
    83608539 fi;
    83618540-echo "$as_me:9992: result: $with_warnings" >&5
    8362 +echo "$as_me:10364: result: $with_warnings" >&5
     8541+echo "$as_me:10394: result: $with_warnings" >&5
    83638542 echo "${ECHO_T}$with_warnings" >&6
    83648543 
    83658544 if test "x$with_warnings" = "xyes"; then
    8366 @@ -10000,12 +10372,12 @@
     8545@@ -10000,12 +10402,12 @@
    83678546 if test "$GCC" = yes ; then
    83688547        case $host_os in
    83698548        linux*|gnu*)
    83708549-               echo "$as_me:10003: checking if this is really Intel C compiler" >&5
    8371 +               echo "$as_me:10375: checking if this is really Intel C compiler" >&5
     8550+               echo "$as_me:10405: checking if this is really Intel C compiler" >&5
    83728551 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
    83738552                cf_save_CFLAGS="$CFLAGS"
    … …  
    83758554                cat >conftest.$ac_ext <<_ACEOF
    83768555-#line 10008 "configure"
    8377 +#line 10380 "configure"
     8556+#line 10410 "configure"
    83788557 #include "confdefs.h"
    83798558 
    83808559 int
    8381 @@ -10022,16 +10394,16 @@
     8560@@ -10022,16 +10424,16 @@
    83828561 }
    83838562 _ACEOF
    83848563 rm -f conftest.$ac_objext
    83858564-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
    8386 +if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5
     8565+if { (eval echo "$as_me:10427: \"$ac_compile\"") >&5
    83878566   (eval $ac_compile) 2>&5
    83888567   ac_status=$?
    83898568-  echo "$as_me:10028: \$? = $ac_status" >&5
    8390 +  echo "$as_me:10400: \$? = $ac_status" >&5
     8569+  echo "$as_me:10430: \$? = $ac_status" >&5
    83918570   (exit $ac_status); } &&
    83928571          { ac_try='test -s conftest.$ac_objext'
    83938572-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
    8394 +  { (eval echo "$as_me:10403: \"$ac_try\"") >&5
     8573+  { (eval echo "$as_me:10433: \"$ac_try\"") >&5
    83958574   (eval $ac_try) 2>&5
    83968575   ac_status=$?
    83978576-  echo "$as_me:10034: \$? = $ac_status" >&5
    8398 +  echo "$as_me:10406: \$? = $ac_status" >&5
     8577+  echo "$as_me:10436: \$? = $ac_status" >&5
    83998578   (exit $ac_status); }; }; then
    84008579   INTEL_COMPILER=yes
    84018580 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8402 @@ -10042,14 +10414,14 @@
     8581@@ -10042,14 +10444,14 @@
    84038582 fi
    84048583 rm -f conftest.$ac_objext conftest.$ac_ext
    84058584                CFLAGS="$cf_save_CFLAGS"
    84068585-               echo "$as_me:10045: result: $INTEL_COMPILER" >&5
    8407 +               echo "$as_me:10417: result: $INTEL_COMPILER" >&5
     8586+               echo "$as_me:10447: result: $INTEL_COMPILER" >&5
    84088587 echo "${ECHO_T}$INTEL_COMPILER" >&6
    84098588                ;;
    … …  
    84138592 cat > conftest.$ac_ext <<EOF
    84148593-#line 10052 "${as_me-configure}"
    8415 +#line 10424 "${as_me-configure}"
     8594+#line 10454 "${as_me-configure}"
    84168595 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    84178596 EOF
    84188597 
    8419 @@ -10067,7 +10439,7 @@
     8598@@ -10057,7 +10459,6 @@
     8599 then
     8600 # The "-wdXXX" options suppress warnings:
     8601 # remark #1419: external declaration in primary source file
     8602-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     8603 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     8604 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
     8605 # remark #193: zero used for undefined preprocessing identifier
     8606@@ -10065,31 +10466,30 @@
     8607 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
     8608 # remark #869: parameter "tw" was never referenced
    84208609 # remark #981: operands are evaluated in unspecified order
    8421  # warning #269: invalid format string conversion
     8610-# warning #269: invalid format string conversion
     8611+# warning #279: controlling expression is constant
    84228612 
    84238613-       { echo "$as_me:10070: checking for $CC warning options..." >&5
    8424 +       { echo "$as_me:10442: checking for $CC warning options..." >&5
     8614+       { echo "$as_me:10471: checking for $CC warning options..." >&5
    84258615 echo "$as_me: checking for $CC warning options..." >&6;}
    84268616        cf_save_CFLAGS="$CFLAGS"
    84278617        EXTRA_CFLAGS="-Wall"
    8428 @@ -10084,12 +10456,12 @@
     8618        for cf_opt in \
     8619                wd1419 \
     8620-               wd1682 \
     8621                wd1683 \
     8622                wd1684 \
     8623                wd193 \
     8624-               wd279 \
     8625                wd593 \
     8626+               wd279 \
     8627                wd810 \
     8628                wd869 \
    84298629                wd981
    84308630        do
    84318631                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    84328632-               if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
    8433 +               if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5
     8633+               if { (eval echo "$as_me:10487: \"$ac_compile\"") >&5
    84348634   (eval $ac_compile) 2>&5
    84358635   ac_status=$?
    84368636-  echo "$as_me:10090: \$? = $ac_status" >&5
    8437 +  echo "$as_me:10462: \$? = $ac_status" >&5
     8637+  echo "$as_me:10490: \$? = $ac_status" >&5
    84388638   (exit $ac_status); }; then
    84398639-                       test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
    8440 +                       test -n "$verbose" && echo "$as_me:10464: result: ... -$cf_opt" >&5
     8640+                       test -n "$verbose" && echo "$as_me:10492: result: ... -$cf_opt" >&5
    84418641 echo "${ECHO_T}... -$cf_opt" >&6
    84428642                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
    84438643                fi
    8444 @@ -10098,7 +10470,7 @@
     8644@@ -10098,7 +10498,7 @@
    84458645 
    84468646 elif test "$GCC" = yes
    84478647 then
    84488648-       { echo "$as_me:10101: checking for $CC warning options..." >&5
    8449 +       { echo "$as_me:10473: checking for $CC warning options..." >&5
     8649+       { echo "$as_me:10501: checking for $CC warning options..." >&5
    84508650 echo "$as_me: checking for $CC warning options..." >&6;}
    84518651        cf_save_CFLAGS="$CFLAGS"
    84528652        EXTRA_CFLAGS="-W -Wall"
    8453 @@ -10118,12 +10490,12 @@
     8653@@ -10118,12 +10518,12 @@
    84548654                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
    84558655        do
    84568656                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    84578657-               if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
    8458 +               if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5
     8658+               if { (eval echo "$as_me:10521: \"$ac_compile\"") >&5
    84598659   (eval $ac_compile) 2>&5
    84608660   ac_status=$?
    84618661-  echo "$as_me:10124: \$? = $ac_status" >&5
    8462 +  echo "$as_me:10496: \$? = $ac_status" >&5
     8662+  echo "$as_me:10524: \$? = $ac_status" >&5
    84638663   (exit $ac_status); }; then
    84648664-                       test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
    8465 +                       test -n "$verbose" && echo "$as_me:10498: result: ... -$cf_opt" >&5
     8665+                       test -n "$verbose" && echo "$as_me:10526: result: ... -$cf_opt" >&5
    84668666 echo "${ECHO_T}... -$cf_opt" >&6
    84678667                        case $cf_opt in #(vi
    84688668                        Wcast-qual) #(vi
    8469 @@ -10134,7 +10506,7 @@
     8669@@ -10134,7 +10534,7 @@
    84708670                                [34].*)
    84718671                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
    84728672 
    84738673-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    8474 +echo "${as_me-configure}:10509: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
     8674+echo "${as_me-configure}:10537: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    84758675 
    84768676                                        continue;;
    84778677                                esac
    8478 @@ -10154,12 +10526,12 @@
     8678@@ -10154,12 +10554,12 @@
    84798679 if test "$GCC" = yes ; then
    84808680        case $host_os in
    84818681        linux*|gnu*)
    84828682-               echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
    8483 +               echo "$as_me:10529: checking if this is really Intel C++ compiler" >&5
     8683+               echo "$as_me:10557: checking if this is really Intel C++ compiler" >&5
    84848684 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
    84858685                cf_save_CFLAGS="$CXXFLAGS"
    … …  
    84878687                cat >conftest.$ac_ext <<_ACEOF
    84888688-#line 10162 "configure"
    8489 +#line 10534 "configure"
     8689+#line 10562 "configure"
    84908690 #include "confdefs.h"
    84918691 
    84928692 int
    8493 @@ -10176,16 +10548,16 @@
     8693@@ -10176,16 +10576,16 @@
    84948694 }
    84958695 _ACEOF
    84968696 rm -f conftest.$ac_objext
    84978697-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
    8498 +if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
     8698+if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
    84998699   (eval $ac_compile) 2>&5
    85008700   ac_status=$?
    85018701-  echo "$as_me:10182: \$? = $ac_status" >&5
    8502 +  echo "$as_me:10554: \$? = $ac_status" >&5
     8702+  echo "$as_me:10582: \$? = $ac_status" >&5
    85038703   (exit $ac_status); } &&
    85048704          { ac_try='test -s conftest.$ac_objext'
    85058705-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
    8506 +  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
     8706+  { (eval echo "$as_me:10585: \"$ac_try\"") >&5
    85078707   (eval $ac_try) 2>&5
    85088708   ac_status=$?
    85098709-  echo "$as_me:10188: \$? = $ac_status" >&5
    8510 +  echo "$as_me:10560: \$? = $ac_status" >&5
     8710+  echo "$as_me:10588: \$? = $ac_status" >&5
    85118711   (exit $ac_status); }; }; then
    85128712   INTEL_CPLUSPLUS=yes
    85138713 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8514 @@ -10196,7 +10568,7 @@
     8714@@ -10196,7 +10596,7 @@
    85158715 fi
    85168716 rm -f conftest.$ac_objext conftest.$ac_ext
    85178717                CXXFLAGS="$cf_save_CFLAGS"
    85188718-               echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
    8519 +               echo "$as_me:10571: result: $INTEL_CPLUSPLUS" >&5
     8719+               echo "$as_me:10599: result: $INTEL_CPLUSPLUS" >&5
    85208720 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
    85218721                ;;
    85228722        esac
    8523 @@ -10210,7 +10582,7 @@
     8723@@ -10210,7 +10610,7 @@
    85248724 ac_main_return=return
    85258725 
    85268726 cat > conftest.$ac_ext <<EOF
    85278727-#line 10213 "configure"
    8528 +#line 10585 "configure"
     8728+#line 10613 "configure"
    85298729 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    85308730 EOF
    85318731 
    8532 @@ -10228,7 +10600,7 @@
     8732@@ -10228,7 +10628,7 @@
    85338733 # remark #981: operands are evaluated in unspecified order
    85348734 # warning #269: invalid format string conversion
    85358735 
    85368736-       { echo "$as_me:10231: checking for $CC warning options..." >&5
    8537 +       { echo "$as_me:10603: checking for $CC warning options..." >&5
     8737+       { echo "$as_me:10631: checking for $CC warning options..." >&5
    85388738 echo "$as_me: checking for $CC warning options..." >&6;}
    85398739        cf_save_CXXFLAGS="$CXXFLAGS"
    85408740        EXTRA_CXXFLAGS="-Wall"
    8541 @@ -10245,12 +10617,12 @@
     8741@@ -10245,12 +10645,12 @@
    85428742                wd981
    85438743        do
    85448744                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
    85458745-               if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
    8546 +               if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5
     8746+               if { (eval echo "$as_me:10648: \"$ac_compile\"") >&5
    85478747   (eval $ac_compile) 2>&5
    85488748   ac_status=$?
    85498749-  echo "$as_me:10251: \$? = $ac_status" >&5
    8550 +  echo "$as_me:10623: \$? = $ac_status" >&5
     8750+  echo "$as_me:10651: \$? = $ac_status" >&5
    85518751   (exit $ac_status); }; then
    85528752-                       test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
    8553 +                       test -n "$verbose" && echo "$as_me:10625: result: ... -$cf_opt" >&5
     8753+                       test -n "$verbose" && echo "$as_me:10653: result: ... -$cf_opt" >&5
    85548754 echo "${ECHO_T}... -$cf_opt" >&6
    85558755                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    85568756                fi
    8557 @@ -10259,7 +10631,7 @@
     8757@@ -10259,7 +10659,7 @@
    85588758 
    85598759 elif test "$GXX" = yes
    85608760 then
    85618761-       { echo "$as_me:10262: checking for $CXX warning options..." >&5
    8562 +       { echo "$as_me:10634: checking for $CXX warning options..." >&5
     8762+       { echo "$as_me:10662: checking for $CXX warning options..." >&5
    85638763 echo "$as_me: checking for $CXX warning options..." >&6;}
    85648764        cf_save_CXXFLAGS="$CXXFLAGS"
    85658765        EXTRA_CXXFLAGS="-W -Wall"
    8566 @@ -10288,16 +10660,16 @@
     8766@@ -10288,16 +10688,16 @@
    85678767                Wundef $cf_gxx_extra_warnings Wno-unused
    85688768        do
    85698769                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
    85708770-               if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
    8571 +               if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
     8771+               if { (eval echo "$as_me:10691: \"$ac_compile\"") >&5
    85728772   (eval $ac_compile) 2>&5
    85738773   ac_status=$?
    85748774-  echo "$as_me:10294: \$? = $ac_status" >&5
    8575 +  echo "$as_me:10666: \$? = $ac_status" >&5
     8775+  echo "$as_me:10694: \$? = $ac_status" >&5
    85768776   (exit $ac_status); }; then
    85778777-                       test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
    8578 +                       test -n "$verbose" && echo "$as_me:10668: result: ... -$cf_opt" >&5
     8778+                       test -n "$verbose" && echo "$as_me:10696: result: ... -$cf_opt" >&5
    85798779 echo "${ECHO_T}... -$cf_opt" >&6
    85808780                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    85818781                else
    85828782-                       test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
    8583 +                       test -n "$verbose" && echo "$as_me:10672: result: ... no -$cf_opt" >&5
     8783+                       test -n "$verbose" && echo "$as_me:10700: result: ... no -$cf_opt" >&5
    85848784 echo "${ECHO_T}... no -$cf_opt" >&6
    85858785                fi
    85868786        done
    8587 @@ -10333,10 +10705,10 @@
     8787@@ -10333,10 +10733,10 @@
    85888788 EOF
    85898789 if test "$GCC" = yes
    85908790 then
    85918791-       { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
    8592 +       { echo "$as_me:10708: checking for $CC __attribute__ directives..." >&5
     8792+       { echo "$as_me:10736: checking for $CC __attribute__ directives..." >&5
    85938793 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
    85948794 cat > conftest.$ac_ext <<EOF
    85958795-#line 10339 "${as_me-configure}"
    8596 +#line 10711 "${as_me-configure}"
     8796+#line 10739 "${as_me-configure}"
    85978797 #include "confdefs.h"
    85988798 #include "conftest.h"
    85998799 #include "conftest.i"
    8600 @@ -10374,12 +10746,12 @@
     8800@@ -10374,12 +10774,12 @@
    86018801 EOF
    86028802                        ;;
    86038803                esac
    86048804-               if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
    8605 +               if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
     8805+               if { (eval echo "$as_me:10777: \"$ac_compile\"") >&5
    86068806   (eval $ac_compile) 2>&5
    86078807   ac_status=$?
    86088808-  echo "$as_me:10380: \$? = $ac_status" >&5
    8609 +  echo "$as_me:10752: \$? = $ac_status" >&5
     8809+  echo "$as_me:10780: \$? = $ac_status" >&5
    86108810   (exit $ac_status); }; then
    86118811-                       test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
    8612 +                       test -n "$verbose" && echo "$as_me:10754: result: ... $cf_attribute" >&5
     8812+                       test -n "$verbose" && echo "$as_me:10782: result: ... $cf_attribute" >&5
    86138813 echo "${ECHO_T}... $cf_attribute" >&6
    86148814                        cat conftest.h >>confdefs.h
    86158815                fi
    8616 @@ -10391,7 +10763,7 @@
     8816@@ -10391,7 +10791,7 @@
    86178817 fi
    86188818 
    86198819 ###    use option --enable-assertions to turn on generation of assertion code
    86208820-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
    8621 +echo "$as_me:10766: checking if you want to enable runtime assertions" >&5
     8821+echo "$as_me:10794: checking if you want to enable runtime assertions" >&5
    86228822 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
    86238823 
    86248824 # Check whether --enable-assertions or --disable-assertions was given.
    8625 @@ -10401,7 +10773,7 @@
     8825@@ -10401,7 +10801,7 @@
    86268826 else
    86278827   with_assertions=no
    86288828 fi;
    86298829-echo "$as_me:10404: result: $with_assertions" >&5
    8630 +echo "$as_me:10776: result: $with_assertions" >&5
     8830+echo "$as_me:10804: result: $with_assertions" >&5
    86318831 echo "${ECHO_T}$with_assertions" >&6
    86328832 if test -n "$GCC"
    86338833 then
    8634 @@ -10419,7 +10791,7 @@
     8834@@ -10419,7 +10819,7 @@
    86358835 
    86368836 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
    86378837 
    86388838-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
    8639 +echo "$as_me:10794: checking if you want to use dmalloc for testing" >&5
     8839+echo "$as_me:10822: checking if you want to use dmalloc for testing" >&5
    86408840 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
    86418841 
    86428842 # Check whether --with-dmalloc or --without-dmalloc was given.
    8643 @@ -10435,7 +10807,7 @@
     8843@@ -10435,7 +10835,7 @@
    86448844 else
    86458845   with_dmalloc=
    86468846 fi;
    86478847-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
    8648 +echo "$as_me:10810: result: ${with_dmalloc:-no}" >&5
     8848+echo "$as_me:10838: result: ${with_dmalloc:-no}" >&5
    86498849 echo "${ECHO_T}${with_dmalloc:-no}" >&6
    86508850 
    86518851 case .$with_cflags in #(vi
    8652 @@ -10505,7 +10877,7 @@
     8852@@ -10505,7 +10905,7 @@
    86538853 
    86548854 if test -n "$cf_new_cppflags" ; then
    … …  
    86598859 
    86608860 if test -n "$cf_new_extra_cppflags" ; then
    8661 @@ -10519,23 +10891,23 @@
     8861@@ -10519,23 +10919,23 @@
    86628862 esac
    86638863 
    86648864 if test "$with_dmalloc" = yes ; then
    86658865-       echo "$as_me:10522: checking for dmalloc.h" >&5
    8666 +       echo "$as_me:10894: checking for dmalloc.h" >&5
     8866+       echo "$as_me:10922: checking for dmalloc.h" >&5
    86678867 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
    86688868 if test "${ac_cv_header_dmalloc_h+set}" = set; then
    … …  
    86718871   cat >conftest.$ac_ext <<_ACEOF
    86728872-#line 10528 "configure"
    8673 +#line 10900 "configure"
     8873+#line 10928 "configure"
    86748874 #include "confdefs.h"
    86758875 #include <dmalloc.h>
    86768876 _ACEOF
    86778877-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
    8678 +if { (eval echo "$as_me:10904: \"$ac_cpp conftest.$ac_ext\"") >&5
     8878+if { (eval echo "$as_me:10932: \"$ac_cpp conftest.$ac_ext\"") >&5
    86798879   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    86808880   ac_status=$?
    … …  
    86838883   cat conftest.err >&5
    86848884-  echo "$as_me:10538: \$? = $ac_status" >&5
    8685 +  echo "$as_me:10910: \$? = $ac_status" >&5
     8885+  echo "$as_me:10938: \$? = $ac_status" >&5
    86868886   (exit $ac_status); } >/dev/null; then
    86878887   if test -s conftest.err; then
    86888888     ac_cpp_err=$ac_c_preproc_warn_flag
    8689 @@ -10554,11 +10926,11 @@
     8889@@ -10554,11 +10954,11 @@
    86908890 fi
    86918891 rm -f conftest.err conftest.$ac_ext
    86928892 fi
    86938893-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
    8694 +echo "$as_me:10929: result: $ac_cv_header_dmalloc_h" >&5
     8894+echo "$as_me:10957: result: $ac_cv_header_dmalloc_h" >&5
    86958895 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
    86968896 if test $ac_cv_header_dmalloc_h = yes; then
    86978897 
    86988898-echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
    8699 +echo "$as_me:10933: checking for dmalloc_debug in -ldmalloc" >&5
     8899+echo "$as_me:10961: checking for dmalloc_debug in -ldmalloc" >&5
    87008900 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
    87018901 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
    87028902   echo $ECHO_N "(cached) $ECHO_C" >&6
    8703 @@ -10566,7 +10938,7 @@
     8903@@ -10566,7 +10966,7 @@
    87048904   ac_check_lib_save_LIBS=$LIBS
    87058905 LIBS="-ldmalloc  $LIBS"
    87068906 cat >conftest.$ac_ext <<_ACEOF
    87078907-#line 10569 "configure"
    8708 +#line 10941 "configure"
     8908+#line 10969 "configure"
    87098909 #include "confdefs.h"
    87108910 
    87118911 /* Override any gcc2 internal prototype to avoid an error.  */
    8712 @@ -10585,16 +10957,16 @@
     8912@@ -10585,16 +10985,16 @@
    87138913 }
    87148914 _ACEOF
    87158915 rm -f conftest.$ac_objext conftest$ac_exeext
    87168916-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
    8717 +if { (eval echo "$as_me:10960: \"$ac_link\"") >&5
     8917+if { (eval echo "$as_me:10988: \"$ac_link\"") >&5
    87188918   (eval $ac_link) 2>&5
    87198919   ac_status=$?
    87208920-  echo "$as_me:10591: \$? = $ac_status" >&5
    8721 +  echo "$as_me:10963: \$? = $ac_status" >&5
     8921+  echo "$as_me:10991: \$? = $ac_status" >&5
    87228922   (exit $ac_status); } &&
    87238923          { ac_try='test -s conftest$ac_exeext'
    87248924-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
    8725 +  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
     8925+  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
    87268926   (eval $ac_try) 2>&5
    87278927   ac_status=$?
    87288928-  echo "$as_me:10597: \$? = $ac_status" >&5
    8729 +  echo "$as_me:10969: \$? = $ac_status" >&5
     8929+  echo "$as_me:10997: \$? = $ac_status" >&5
    87308930   (exit $ac_status); }; }; then
    87318931   ac_cv_lib_dmalloc_dmalloc_debug=yes
    87328932 else
    8733 @@ -10605,7 +10977,7 @@
     8933@@ -10605,7 +11005,7 @@
    87348934 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    87358935 LIBS=$ac_check_lib_save_LIBS
    87368936 fi
    87378937-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    8738 +echo "$as_me:10980: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
     8938+echo "$as_me:11008: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    87398939 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
    87408940 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    87418941   cat >>confdefs.h <<EOF
    8742 @@ -10620,7 +10992,7 @@
     8942@@ -10620,7 +11020,7 @@
    87438943 
    87448944 fi
    87458945 
    87468946-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
    8747 +echo "$as_me:10995: checking if you want to use dbmalloc for testing" >&5
     8947+echo "$as_me:11023: checking if you want to use dbmalloc for testing" >&5
    87488948 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
    87498949 
    87508950 # Check whether --with-dbmalloc or --without-dbmalloc was given.
    8751 @@ -10636,7 +11008,7 @@
     8951@@ -10636,7 +11036,7 @@
    87528952 else
    87538953   with_dbmalloc=
    87548954 fi;
    87558955-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
    8756 +echo "$as_me:11011: result: ${with_dbmalloc:-no}" >&5
     8956+echo "$as_me:11039: result: ${with_dbmalloc:-no}" >&5
    87578957 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
    87588958 
    87598959 case .$with_cflags in #(vi
    8760 @@ -10706,7 +11078,7 @@
     8960@@ -10706,7 +11106,7 @@
    87618961 
    87628962 if test -n "$cf_new_cppflags" ; then
    … …  
    87678967 
    87688968 if test -n "$cf_new_extra_cppflags" ; then
    8769 @@ -10720,23 +11092,23 @@
     8969@@ -10720,23 +11120,23 @@
    87708970 esac
    87718971 
    87728972 if test "$with_dbmalloc" = yes ; then
    87738973-       echo "$as_me:10723: checking for dbmalloc.h" >&5
    8774 +       echo "$as_me:11095: checking for dbmalloc.h" >&5
     8974+       echo "$as_me:11123: checking for dbmalloc.h" >&5
    87758975 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
    87768976 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
    … …  
    87798979   cat >conftest.$ac_ext <<_ACEOF
    87808980-#line 10729 "configure"
    8781 +#line 11101 "configure"
     8981+#line 11129 "configure"
    87828982 #include "confdefs.h"
    87838983 #include <dbmalloc.h>
    87848984 _ACEOF
    87858985-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
    8786 +if { (eval echo "$as_me:11105: \"$ac_cpp conftest.$ac_ext\"") >&5
     8986+if { (eval echo "$as_me:11133: \"$ac_cpp conftest.$ac_ext\"") >&5
    87878987   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    87888988   ac_status=$?
    … …  
    87918991   cat conftest.err >&5
    87928992-  echo "$as_me:10739: \$? = $ac_status" >&5
    8793 +  echo "$as_me:11111: \$? = $ac_status" >&5
     8993+  echo "$as_me:11139: \$? = $ac_status" >&5
    87948994   (exit $ac_status); } >/dev/null; then
    87958995   if test -s conftest.err; then
    87968996     ac_cpp_err=$ac_c_preproc_warn_flag
    8797 @@ -10755,11 +11127,11 @@
     8997@@ -10755,11 +11155,11 @@
    87988998 fi
    87998999 rm -f conftest.err conftest.$ac_ext
    88009000 fi
    88019001-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
    8802 +echo "$as_me:11130: result: $ac_cv_header_dbmalloc_h" >&5
     9002+echo "$as_me:11158: result: $ac_cv_header_dbmalloc_h" >&5
    88039003 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
    88049004 if test $ac_cv_header_dbmalloc_h = yes; then
    88059005 
    88069006-echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
    8807 +echo "$as_me:11134: checking for debug_malloc in -ldbmalloc" >&5
     9007+echo "$as_me:11162: checking for debug_malloc in -ldbmalloc" >&5
    88089008 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
    88099009 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
    88109010   echo $ECHO_N "(cached) $ECHO_C" >&6
    8811 @@ -10767,7 +11139,7 @@
     9011@@ -10767,7 +11167,7 @@
    88129012   ac_check_lib_save_LIBS=$LIBS
    88139013 LIBS="-ldbmalloc  $LIBS"
    88149014 cat >conftest.$ac_ext <<_ACEOF
    88159015-#line 10770 "configure"
    8816 +#line 11142 "configure"
     9016+#line 11170 "configure"
    88179017 #include "confdefs.h"
    88189018 
    88199019 /* Override any gcc2 internal prototype to avoid an error.  */
    8820 @@ -10786,16 +11158,16 @@
     9020@@ -10786,16 +11186,16 @@
    88219021 }
    88229022 _ACEOF
    88239023 rm -f conftest.$ac_objext conftest$ac_exeext
    88249024-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
    8825 +if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
     9025+if { (eval echo "$as_me:11189: \"$ac_link\"") >&5
    88269026   (eval $ac_link) 2>&5
    88279027   ac_status=$?
    88289028-  echo "$as_me:10792: \$? = $ac_status" >&5
    8829 +  echo "$as_me:11164: \$? = $ac_status" >&5
     9029+  echo "$as_me:11192: \$? = $ac_status" >&5
    88309030   (exit $ac_status); } &&
    88319031          { ac_try='test -s conftest$ac_exeext'
    88329032-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
    8833 +  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
     9033+  { (eval echo "$as_me:11195: \"$ac_try\"") >&5
    88349034   (eval $ac_try) 2>&5
    88359035   ac_status=$?
    88369036-  echo "$as_me:10798: \$? = $ac_status" >&5
    8837 +  echo "$as_me:11170: \$? = $ac_status" >&5
     9037+  echo "$as_me:11198: \$? = $ac_status" >&5
    88389038   (exit $ac_status); }; }; then
    88399039   ac_cv_lib_dbmalloc_debug_malloc=yes
    88409040 else
    8841 @@ -10806,7 +11178,7 @@
     9041@@ -10806,7 +11206,7 @@
    88429042 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    88439043 LIBS=$ac_check_lib_save_LIBS
    88449044 fi
    88459045-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    8846 +echo "$as_me:11181: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
     9046+echo "$as_me:11209: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    88479047 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
    88489048 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    88499049   cat >>confdefs.h <<EOF
    8850 @@ -10821,7 +11193,7 @@
     9050@@ -10821,7 +11221,7 @@
    88519051 
    88529052 fi
    88539053 
    88549054-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
    8855 +echo "$as_me:11196: checking if you want to use valgrind for testing" >&5
     9055+echo "$as_me:11224: checking if you want to use valgrind for testing" >&5
    88569056 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
    88579057 
    88589058 # Check whether --with-valgrind or --without-valgrind was given.
    8859 @@ -10837,7 +11209,7 @@
     9059@@ -10837,7 +11237,7 @@
    88609060 else
    88619061   with_valgrind=
    88629062 fi;
    88639063-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
    8864 +echo "$as_me:11212: result: ${with_valgrind:-no}" >&5
     9064+echo "$as_me:11240: result: ${with_valgrind:-no}" >&5
    88659065 echo "${ECHO_T}${with_valgrind:-no}" >&6
    88669066 
    88679067 case .$with_cflags in #(vi
    8868 @@ -10907,7 +11279,7 @@
     9068@@ -10907,7 +11307,7 @@
    88699069 
    88709070 if test -n "$cf_new_cppflags" ; then
    … …  
    88759075 
    88769076 if test -n "$cf_new_extra_cppflags" ; then
    8877 @@ -10920,7 +11292,7 @@
     9077@@ -10920,7 +11320,7 @@
    88789078        ;;
    88799079 esac
    88809080 
    88819081-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
    8882 +echo "$as_me:11295: checking if you want to perform memory-leak testing" >&5
     9082+echo "$as_me:11323: checking if you want to perform memory-leak testing" >&5
    88839083 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
    88849084 
    88859085 # Check whether --enable-leaks or --disable-leaks was given.
    8886 @@ -10930,7 +11302,7 @@
     9086@@ -10930,7 +11330,7 @@
    88879087 else
    88889088   : ${with_no_leaks:=no}
    88899089 fi;
    88909090-echo "$as_me:10933: result: $with_no_leaks" >&5
    8891 +echo "$as_me:11305: result: $with_no_leaks" >&5
     9091+echo "$as_me:11333: result: $with_no_leaks" >&5
    88929092 echo "${ECHO_T}$with_no_leaks" >&6
    88939093 
    88949094 if test "$with_no_leaks" = yes ; then
    8895 @@ -10975,7 +11347,7 @@
     9095@@ -10975,7 +11375,7 @@
    88969096        ;;
    88979097 esac
    88989098 
    88999099-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
    8900 +echo "$as_me:11350: checking whether to add trace feature to all models" >&5
     9100+echo "$as_me:11378: checking whether to add trace feature to all models" >&5
    89019101 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
    89029102 
    89039103 # Check whether --with-trace or --without-trace was given.
    8904 @@ -10985,7 +11357,7 @@
     9104@@ -10985,7 +11385,7 @@
    89059105 else
    89069106   cf_with_trace=$cf_all_traces
    89079107 fi;
    89089108-echo "$as_me:10988: result: $cf_with_trace" >&5
    8909 +echo "$as_me:11360: result: $cf_with_trace" >&5
     9109+echo "$as_me:11388: result: $cf_with_trace" >&5
    89109110 echo "${ECHO_T}$cf_with_trace" >&6
    89119111 
    89129112 if test "$cf_with_trace" = yes ; then
    8913 @@ -11052,7 +11424,7 @@
     9113@@ -11052,7 +11452,7 @@
    89149114 
    89159115 if test -n "$cf_new_cppflags" ; then
    … …  
    89209120 
    89219121 if test -n "$cf_new_extra_cppflags" ; then
    8922 @@ -11066,13 +11438,17 @@
     9122@@ -11066,13 +11466,17 @@
    89239123 fi
    89249124 
    … …  
    89299129+       ;;
    89309130+*)
    8931 +echo "$as_me:11445: checking for gettimeofday" >&5
     9131+echo "$as_me:11473: checking for gettimeofday" >&5
    89329132 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
    89339133 if test "${ac_cv_func_gettimeofday+set}" = set; then
    … …  
    89369136   cat >conftest.$ac_ext <<_ACEOF
    89379137-#line 11075 "configure"
    8938 +#line 11451 "configure"
     9138+#line 11479 "configure"
    89399139 #include "confdefs.h"
    89409140 /* System header to define __stub macros and hopefully few prototypes,
    89419141     which can conflict with char gettimeofday (); below.  */
    8942 @@ -11103,16 +11479,16 @@
     9142@@ -11103,16 +11507,16 @@
    89439143 }
    89449144 _ACEOF
    89459145 rm -f conftest.$ac_objext conftest$ac_exeext
    89469146-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
    8947 +if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
     9147+if { (eval echo "$as_me:11510: \"$ac_link\"") >&5
    89489148   (eval $ac_link) 2>&5
    89499149   ac_status=$?
    89509150-  echo "$as_me:11109: \$? = $ac_status" >&5
    8951 +  echo "$as_me:11485: \$? = $ac_status" >&5
     9151+  echo "$as_me:11513: \$? = $ac_status" >&5
    89529152   (exit $ac_status); } &&
    89539153          { ac_try='test -s conftest$ac_exeext'
    89549154-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
    8955 +  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
     9155+  { (eval echo "$as_me:11516: \"$ac_try\"") >&5
    89569156   (eval $ac_try) 2>&5
    89579157   ac_status=$?
    89589158-  echo "$as_me:11115: \$? = $ac_status" >&5
    8959 +  echo "$as_me:11491: \$? = $ac_status" >&5
     9159+  echo "$as_me:11519: \$? = $ac_status" >&5
    89609160   (exit $ac_status); }; }; then
    89619161   ac_cv_func_gettimeofday=yes
    89629162 else
    8963 @@ -11122,7 +11498,7 @@
     9163@@ -11122,7 +11526,7 @@
    89649164 fi
    89659165 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    89669166 fi
    89679167-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
    8968 +echo "$as_me:11501: result: $ac_cv_func_gettimeofday" >&5
     9168+echo "$as_me:11529: result: $ac_cv_func_gettimeofday" >&5
    89699169 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
    89709170 if test $ac_cv_func_gettimeofday = yes; then
    89719171   cat >>confdefs.h <<\EOF
    8972 @@ -11131,7 +11507,7 @@
     9172@@ -11131,7 +11535,7 @@
    89739173 
    89749174 else
    89759175 
    89769176-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
    8977 +echo "$as_me:11510: checking for gettimeofday in -lbsd" >&5
     9177+echo "$as_me:11538: checking for gettimeofday in -lbsd" >&5
    89789178 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
    89799179 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    89809180   echo $ECHO_N "(cached) $ECHO_C" >&6
    8981 @@ -11139,7 +11515,7 @@
     9181@@ -11139,7 +11543,7 @@
    89829182   ac_check_lib_save_LIBS=$LIBS
    89839183 LIBS="-lbsd  $LIBS"
    89849184 cat >conftest.$ac_ext <<_ACEOF
    89859185-#line 11142 "configure"
    8986 +#line 11518 "configure"
     9186+#line 11546 "configure"
    89879187 #include "confdefs.h"
    89889188 
    89899189 /* Override any gcc2 internal prototype to avoid an error.  */
    8990 @@ -11158,16 +11534,16 @@
     9190@@ -11158,16 +11562,16 @@
    89919191 }
    89929192 _ACEOF
    89939193 rm -f conftest.$ac_objext conftest$ac_exeext
    89949194-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    8995 +if { (eval echo "$as_me:11537: \"$ac_link\"") >&5
     9195+if { (eval echo "$as_me:11565: \"$ac_link\"") >&5
    89969196   (eval $ac_link) 2>&5
    89979197   ac_status=$?
    89989198-  echo "$as_me:11164: \$? = $ac_status" >&5
    8999 +  echo "$as_me:11540: \$? = $ac_status" >&5
     9199+  echo "$as_me:11568: \$? = $ac_status" >&5
    90009200   (exit $ac_status); } &&
    90019201          { ac_try='test -s conftest$ac_exeext'
    90029202-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    9003 +  { (eval echo "$as_me:11543: \"$ac_try\"") >&5
     9203+  { (eval echo "$as_me:11571: \"$ac_try\"") >&5
    90049204   (eval $ac_try) 2>&5
    90059205   ac_status=$?
    90069206-  echo "$as_me:11170: \$? = $ac_status" >&5
    9007 +  echo "$as_me:11546: \$? = $ac_status" >&5
     9207+  echo "$as_me:11574: \$? = $ac_status" >&5
    90089208   (exit $ac_status); }; }; then
    90099209   ac_cv_lib_bsd_gettimeofday=yes
    90109210 else
    9011 @@ -11178,7 +11554,7 @@
     9211@@ -11178,7 +11582,7 @@
    90129212 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    90139213 LIBS=$ac_check_lib_save_LIBS
    90149214 fi
    90159215-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
    9016 +echo "$as_me:11557: result: $ac_cv_lib_bsd_gettimeofday" >&5
     9216+echo "$as_me:11585: result: $ac_cv_lib_bsd_gettimeofday" >&5
    90179217 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
    90189218 if test $ac_cv_lib_bsd_gettimeofday = yes; then
    90199219   cat >>confdefs.h <<\EOF
    9020 @@ -11189,15 +11565,17 @@
     9220@@ -11189,15 +11593,17 @@
    90219221 fi
    90229222 
    … …  
    90269226 
    90279227-echo "$as_me:11193: checking if -lm needed for math functions" >&5
    9028 +echo "$as_me:11571: checking if -lm needed for math functions" >&5
     9228+echo "$as_me:11599: checking if -lm needed for math functions" >&5
    90299229 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
    90309230 if test "${cf_cv_need_libm+set}" = set; then
    … …  
    90349234        cat >conftest.$ac_ext <<_ACEOF
    90359235-#line 11200 "configure"
    9036 +#line 11578 "configure"
     9236+#line 11606 "configure"
    90379237 #include "confdefs.h"
    90389238 
    90399239        #include <stdio.h>
    9040 @@ -11212,16 +11590,16 @@
     9240@@ -11212,16 +11618,16 @@
    90419241 }
    90429242 _ACEOF
    90439243 rm -f conftest.$ac_objext conftest$ac_exeext
    90449244-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
    9045 +if { (eval echo "$as_me:11593: \"$ac_link\"") >&5
     9245+if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
    90469246   (eval $ac_link) 2>&5
    90479247   ac_status=$?
    90489248-  echo "$as_me:11218: \$? = $ac_status" >&5
    9049 +  echo "$as_me:11596: \$? = $ac_status" >&5
     9249+  echo "$as_me:11624: \$? = $ac_status" >&5
    90509250   (exit $ac_status); } &&
    90519251          { ac_try='test -s conftest$ac_exeext'
    90529252-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
    9053 +  { (eval echo "$as_me:11599: \"$ac_try\"") >&5
     9253+  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
    90549254   (eval $ac_try) 2>&5
    90559255   ac_status=$?
    90569256-  echo "$as_me:11224: \$? = $ac_status" >&5
    9057 +  echo "$as_me:11602: \$? = $ac_status" >&5
     9257+  echo "$as_me:11630: \$? = $ac_status" >&5
    90589258   (exit $ac_status); }; }; then
    90599259   cf_cv_need_libm=no
    90609260 else
    9061 @@ -11231,7 +11609,7 @@
     9261@@ -11231,7 +11637,7 @@
    90629262 fi
    90639263 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    90649264 fi
    90659265-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
    9066 +echo "$as_me:11612: result: $cf_cv_need_libm" >&5
     9266+echo "$as_me:11640: result: $cf_cv_need_libm" >&5
    90679267 echo "${ECHO_T}$cf_cv_need_libm" >&6
    90689268 if test "$cf_cv_need_libm" = yes
    90699269 then
    9070 @@ -11239,13 +11617,13 @@
     9270@@ -11239,13 +11645,13 @@
    90719271 fi
    90729272 
    90739273 ###    Checks for header files.
    90749274-echo "$as_me:11242: checking for ANSI C header files" >&5
    9075 +echo "$as_me:11620: checking for ANSI C header files" >&5
     9275+echo "$as_me:11648: checking for ANSI C header files" >&5
    90769276 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    90779277 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    90809280   cat >conftest.$ac_ext <<_ACEOF
    90819281-#line 11248 "configure"
    9082 +#line 11626 "configure"
     9282+#line 11654 "configure"
    90839283 #include "confdefs.h"
    90849284 #include <stdlib.h>
    90859285 #include <stdarg.h>
    9086 @@ -11253,13 +11631,13 @@
     9286@@ -11253,13 +11659,13 @@
    90879287 #include <float.h>
    90889288 
    90899289 _ACEOF
    90909290-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
    9091 +if { (eval echo "$as_me:11634: \"$ac_cpp conftest.$ac_ext\"") >&5
     9291+if { (eval echo "$as_me:11662: \"$ac_cpp conftest.$ac_ext\"") >&5
    90929292   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    90939293   ac_status=$?
    … …  
    90969296   cat conftest.err >&5
    90979297-  echo "$as_me:11262: \$? = $ac_status" >&5
    9098 +  echo "$as_me:11640: \$? = $ac_status" >&5
     9298+  echo "$as_me:11668: \$? = $ac_status" >&5
    90999299   (exit $ac_status); } >/dev/null; then
    91009300   if test -s conftest.err; then
    91019301     ac_cpp_err=$ac_c_preproc_warn_flag
    9102 @@ -11281,7 +11659,7 @@
     9302@@ -11281,7 +11687,7 @@
    91039303 if test $ac_cv_header_stdc = yes; then
    91049304   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    91059305   cat >conftest.$ac_ext <<_ACEOF
    91069306-#line 11284 "configure"
    9107 +#line 11662 "configure"
     9307+#line 11690 "configure"
    91089308 #include "confdefs.h"
    91099309 #include <string.h>
    91109310 
    9111 @@ -11299,7 +11677,7 @@
     9311@@ -11299,7 +11705,7 @@
    91129312 if test $ac_cv_header_stdc = yes; then
    91139313   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    91149314   cat >conftest.$ac_ext <<_ACEOF
    91159315-#line 11302 "configure"
    9116 +#line 11680 "configure"
     9316+#line 11708 "configure"
    91179317 #include "confdefs.h"
    91189318 #include <stdlib.h>
    91199319 
    9120 @@ -11320,7 +11698,7 @@
     9320@@ -11320,7 +11726,7 @@
    91219321   :
    91229322 else
    91239323   cat >conftest.$ac_ext <<_ACEOF
    91249324-#line 11323 "configure"
    9125 +#line 11701 "configure"
     9325+#line 11729 "configure"
    91269326 #include "confdefs.h"
    91279327 #include <ctype.h>
    91289328 #if ((' ' & 0x0FF) == 0x020)
    9129 @@ -11346,15 +11724,15 @@
     9329@@ -11346,15 +11752,15 @@
    91309330 }
    91319331 _ACEOF
    91329332 rm -f conftest$ac_exeext
    91339333-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
    9134 +if { (eval echo "$as_me:11727: \"$ac_link\"") >&5
     9334+if { (eval echo "$as_me:11755: \"$ac_link\"") >&5
    91359335   (eval $ac_link) 2>&5
    91369336   ac_status=$?
    91379337-  echo "$as_me:11352: \$? = $ac_status" >&5
    9138 +  echo "$as_me:11730: \$? = $ac_status" >&5
     9338+  echo "$as_me:11758: \$? = $ac_status" >&5
    91399339   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    91409340-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
    9141 +  { (eval echo "$as_me:11732: \"$ac_try\"") >&5
     9341+  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
    91429342   (eval $ac_try) 2>&5
    91439343   ac_status=$?
    91449344-  echo "$as_me:11357: \$? = $ac_status" >&5
    9145 +  echo "$as_me:11735: \$? = $ac_status" >&5
     9345+  echo "$as_me:11763: \$? = $ac_status" >&5
    91469346   (exit $ac_status); }; }; then
    91479347   :
    91489348 else
    9149 @@ -11367,7 +11745,7 @@
     9349@@ -11367,7 +11773,7 @@
    91509350 fi
    91519351 fi
    91529352 fi
    91539353-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
    9154 +echo "$as_me:11748: result: $ac_cv_header_stdc" >&5
     9354+echo "$as_me:11776: result: $ac_cv_header_stdc" >&5
    91559355 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    91569356 if test $ac_cv_header_stdc = yes; then
    91579357 
    9158 @@ -11380,13 +11758,13 @@
     9358@@ -11380,13 +11786,13 @@
    91599359 ac_header_dirent=no
    91609360 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    91619361   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
    91629362-echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
    9163 +echo "$as_me:11761: checking for $ac_hdr that defines DIR" >&5
     9363+echo "$as_me:11789: checking for $ac_hdr that defines DIR" >&5
    91649364 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
    91659365 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    91689368   cat >conftest.$ac_ext <<_ACEOF
    91699369-#line 11389 "configure"
    9170 +#line 11767 "configure"
     9370+#line 11795 "configure"
    91719371 #include "confdefs.h"
    91729372 #include <sys/types.h>
    91739373 #include <$ac_hdr>
    9174 @@ -11401,16 +11779,16 @@
     9374@@ -11401,16 +11807,16 @@
    91759375 }
    91769376 _ACEOF
    91779377 rm -f conftest.$ac_objext
    91789378-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
    9179 +if { (eval echo "$as_me:11782: \"$ac_compile\"") >&5
     9379+if { (eval echo "$as_me:11810: \"$ac_compile\"") >&5
    91809380   (eval $ac_compile) 2>&5
    91819381   ac_status=$?
    91829382-  echo "$as_me:11407: \$? = $ac_status" >&5
    9183 +  echo "$as_me:11785: \$? = $ac_status" >&5
     9383+  echo "$as_me:11813: \$? = $ac_status" >&5
    91849384   (exit $ac_status); } &&
    91859385          { ac_try='test -s conftest.$ac_objext'
    91869386-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
    9187 +  { (eval echo "$as_me:11788: \"$ac_try\"") >&5
     9387+  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
    91889388   (eval $ac_try) 2>&5
    91899389   ac_status=$?
    91909390-  echo "$as_me:11413: \$? = $ac_status" >&5
    9191 +  echo "$as_me:11791: \$? = $ac_status" >&5
     9391+  echo "$as_me:11819: \$? = $ac_status" >&5
    91929392   (exit $ac_status); }; }; then
    91939393   eval "$as_ac_Header=yes"
    91949394 else
    9195 @@ -11420,7 +11798,7 @@
     9395@@ -11420,7 +11826,7 @@
    91969396 fi
    91979397 rm -f conftest.$ac_objext conftest.$ac_ext
    91989398 fi
    91999399-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
    9200 +echo "$as_me:11801: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9400+echo "$as_me:11829: result: `eval echo '${'$as_ac_Header'}'`" >&5
    92019401 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    92029402 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    92039403   cat >>confdefs.h <<EOF
    9204 @@ -11433,7 +11811,7 @@
     9404@@ -11433,7 +11839,7 @@
    92059405 done
    92069406 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
    92079407 if test $ac_header_dirent = dirent.h; then
    92089408-  echo "$as_me:11436: checking for opendir in -ldir" >&5
    9209 +  echo "$as_me:11814: checking for opendir in -ldir" >&5
     9409+  echo "$as_me:11842: checking for opendir in -ldir" >&5
    92109410 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
    92119411 if test "${ac_cv_lib_dir_opendir+set}" = set; then
    92129412   echo $ECHO_N "(cached) $ECHO_C" >&6
    9213 @@ -11441,7 +11819,7 @@
     9413@@ -11441,7 +11847,7 @@
    92149414   ac_check_lib_save_LIBS=$LIBS
    92159415 LIBS="-ldir  $LIBS"
    92169416 cat >conftest.$ac_ext <<_ACEOF
    92179417-#line 11444 "configure"
    9218 +#line 11822 "configure"
     9418+#line 11850 "configure"
    92199419 #include "confdefs.h"
    92209420 
    92219421 /* Override any gcc2 internal prototype to avoid an error.  */
    9222 @@ -11460,16 +11838,16 @@
     9422@@ -11460,16 +11866,16 @@
    92239423 }
    92249424 _ACEOF
    92259425 rm -f conftest.$ac_objext conftest$ac_exeext
    92269426-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
    9227 +if { (eval echo "$as_me:11841: \"$ac_link\"") >&5
     9427+if { (eval echo "$as_me:11869: \"$ac_link\"") >&5
    92289428   (eval $ac_link) 2>&5
    92299429   ac_status=$?
    92309430-  echo "$as_me:11466: \$? = $ac_status" >&5
    9231 +  echo "$as_me:11844: \$? = $ac_status" >&5
     9431+  echo "$as_me:11872: \$? = $ac_status" >&5
    92329432   (exit $ac_status); } &&
    92339433          { ac_try='test -s conftest$ac_exeext'
    92349434-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
    9235 +  { (eval echo "$as_me:11847: \"$ac_try\"") >&5
     9435+  { (eval echo "$as_me:11875: \"$ac_try\"") >&5
    92369436   (eval $ac_try) 2>&5
    92379437   ac_status=$?
    92389438-  echo "$as_me:11472: \$? = $ac_status" >&5
    9239 +  echo "$as_me:11850: \$? = $ac_status" >&5
     9439+  echo "$as_me:11878: \$? = $ac_status" >&5
    92409440   (exit $ac_status); }; }; then
    92419441   ac_cv_lib_dir_opendir=yes
    92429442 else
    9243 @@ -11480,14 +11858,14 @@
     9443@@ -11480,14 +11886,14 @@
    92449444 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    92459445 LIBS=$ac_check_lib_save_LIBS
    92469446 fi
    92479447-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
    9248 +echo "$as_me:11861: result: $ac_cv_lib_dir_opendir" >&5
     9448+echo "$as_me:11889: result: $ac_cv_lib_dir_opendir" >&5
    92499449 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
    92509450 if test $ac_cv_lib_dir_opendir = yes; then
    … …  
    92549454 else
    92559455-  echo "$as_me:11490: checking for opendir in -lx" >&5
    9256 +  echo "$as_me:11868: checking for opendir in -lx" >&5
     9456+  echo "$as_me:11896: checking for opendir in -lx" >&5
    92579457 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
    92589458 if test "${ac_cv_lib_x_opendir+set}" = set; then
    92599459   echo $ECHO_N "(cached) $ECHO_C" >&6
    9260 @@ -11495,7 +11873,7 @@
     9460@@ -11495,7 +11901,7 @@
    92619461   ac_check_lib_save_LIBS=$LIBS
    92629462 LIBS="-lx  $LIBS"
    92639463 cat >conftest.$ac_ext <<_ACEOF
    92649464-#line 11498 "configure"
    9265 +#line 11876 "configure"
     9465+#line 11904 "configure"
    92669466 #include "confdefs.h"
    92679467 
    92689468 /* Override any gcc2 internal prototype to avoid an error.  */
    9269 @@ -11514,16 +11892,16 @@
     9469@@ -11514,16 +11920,16 @@
    92709470 }
    92719471 _ACEOF
    92729472 rm -f conftest.$ac_objext conftest$ac_exeext
    92739473-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
    9274 +if { (eval echo "$as_me:11895: \"$ac_link\"") >&5
     9474+if { (eval echo "$as_me:11923: \"$ac_link\"") >&5
    92759475   (eval $ac_link) 2>&5
    92769476   ac_status=$?
    92779477-  echo "$as_me:11520: \$? = $ac_status" >&5
    9278 +  echo "$as_me:11898: \$? = $ac_status" >&5
     9478+  echo "$as_me:11926: \$? = $ac_status" >&5
    92799479   (exit $ac_status); } &&
    92809480          { ac_try='test -s conftest$ac_exeext'
    92819481-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
    9282 +  { (eval echo "$as_me:11901: \"$ac_try\"") >&5
     9482+  { (eval echo "$as_me:11929: \"$ac_try\"") >&5
    92839483   (eval $ac_try) 2>&5
    92849484   ac_status=$?
    92859485-  echo "$as_me:11526: \$? = $ac_status" >&5
    9286 +  echo "$as_me:11904: \$? = $ac_status" >&5
     9486+  echo "$as_me:11932: \$? = $ac_status" >&5
    92879487   (exit $ac_status); }; }; then
    92889488   ac_cv_lib_x_opendir=yes
    92899489 else
    9290 @@ -11534,7 +11912,7 @@
     9490@@ -11534,7 +11940,7 @@
    92919491 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    92929492 LIBS=$ac_check_lib_save_LIBS
    92939493 fi
    92949494-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
    9295 +echo "$as_me:11915: result: $ac_cv_lib_x_opendir" >&5
     9495+echo "$as_me:11943: result: $ac_cv_lib_x_opendir" >&5
    92969496 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
    92979497 if test $ac_cv_lib_x_opendir = yes; then
    92989498   LIBS="$LIBS -lx"
    9299 @@ -11542,13 +11920,13 @@
     9499@@ -11542,13 +11948,13 @@
    93009500 
    93019501 fi
    93029502 
    93039503-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
    9304 +echo "$as_me:11923: checking whether time.h and sys/time.h may both be included" >&5
     9504+echo "$as_me:11951: checking whether time.h and sys/time.h may both be included" >&5
    93059505 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
    93069506 if test "${ac_cv_header_time+set}" = set; then
    … …  
    93099509   cat >conftest.$ac_ext <<_ACEOF
    93109510-#line 11551 "configure"
    9311 +#line 11929 "configure"
     9511+#line 11957 "configure"
    93129512 #include "confdefs.h"
    93139513 #include <sys/types.h>
    93149514 #include <sys/time.h>
    9315 @@ -11564,16 +11942,16 @@
     9515@@ -11564,16 +11970,16 @@
    93169516 }
    93179517 _ACEOF
    93189518 rm -f conftest.$ac_objext
    93199519-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
    9320 +if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5
     9520+if { (eval echo "$as_me:11973: \"$ac_compile\"") >&5
    93219521   (eval $ac_compile) 2>&5
    93229522   ac_status=$?
    93239523-  echo "$as_me:11570: \$? = $ac_status" >&5
    9324 +  echo "$as_me:11948: \$? = $ac_status" >&5
     9524+  echo "$as_me:11976: \$? = $ac_status" >&5
    93259525   (exit $ac_status); } &&
    93269526          { ac_try='test -s conftest.$ac_objext'
    93279527-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
    9328 +  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
     9528+  { (eval echo "$as_me:11979: \"$ac_try\"") >&5
    93299529   (eval $ac_try) 2>&5
    93309530   ac_status=$?
    93319531-  echo "$as_me:11576: \$? = $ac_status" >&5
    9332 +  echo "$as_me:11954: \$? = $ac_status" >&5
     9532+  echo "$as_me:11982: \$? = $ac_status" >&5
    93339533   (exit $ac_status); }; }; then
    93349534   ac_cv_header_time=yes
    93359535 else
    9336 @@ -11583,7 +11961,7 @@
     9536@@ -11583,7 +11989,7 @@
    93379537 fi
    93389538 rm -f conftest.$ac_objext conftest.$ac_ext
    93399539 fi
    93409540-echo "$as_me:11586: result: $ac_cv_header_time" >&5
    9341 +echo "$as_me:11964: result: $ac_cv_header_time" >&5
     9541+echo "$as_me:11992: result: $ac_cv_header_time" >&5
    93429542 echo "${ECHO_T}$ac_cv_header_time" >&6
    93439543 if test $ac_cv_header_time = yes; then
    93449544 
    9345 @@ -11593,14 +11971,14 @@
     9545@@ -11593,14 +11999,14 @@
    93469546 
    93479547 fi
    93489548 
    93499549-echo "$as_me:11596: checking for regular-expression headers" >&5
    9350 +echo "$as_me:11974: checking for regular-expression headers" >&5
     9550+echo "$as_me:12002: checking for regular-expression headers" >&5
    93519551 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
    93529552 if test "${cf_cv_regex+set}" = set; then
    … …  
    93569556 cat >conftest.$ac_ext <<_ACEOF
    93579557-#line 11603 "configure"
    9358 +#line 11981 "configure"
     9558+#line 12009 "configure"
    93599559 #include "confdefs.h"
    93609560 #include <sys/types.h>
    93619561 #include <regex.h>
    9362 @@ -11618,16 +11996,16 @@
     9562@@ -11618,16 +12024,16 @@
    93639563 }
    93649564 _ACEOF
    93659565 rm -f conftest.$ac_objext conftest$ac_exeext
    93669566-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
    9367 +if { (eval echo "$as_me:11999: \"$ac_link\"") >&5
     9567+if { (eval echo "$as_me:12027: \"$ac_link\"") >&5
    93689568   (eval $ac_link) 2>&5
    93699569   ac_status=$?
    93709570-  echo "$as_me:11624: \$? = $ac_status" >&5
    9371 +  echo "$as_me:12002: \$? = $ac_status" >&5
     9571+  echo "$as_me:12030: \$? = $ac_status" >&5
    93729572   (exit $ac_status); } &&
    93739573          { ac_try='test -s conftest$ac_exeext'
    93749574-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
    9375 +  { (eval echo "$as_me:12005: \"$ac_try\"") >&5
     9575+  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
    93769576   (eval $ac_try) 2>&5
    93779577   ac_status=$?
    93789578-  echo "$as_me:11630: \$? = $ac_status" >&5
    9379 +  echo "$as_me:12008: \$? = $ac_status" >&5
     9579+  echo "$as_me:12036: \$? = $ac_status" >&5
    93809580   (exit $ac_status); }; }; then
    93819581   cf_cv_regex="regex.h"
    93829582 else
    9383 @@ -11635,7 +12013,7 @@
     9583@@ -11635,7 +12041,7 @@
    93849584 cat conftest.$ac_ext >&5
    93859585 
    93869586        cat >conftest.$ac_ext <<_ACEOF
    93879587-#line 11638 "configure"
    9388 +#line 12016 "configure"
     9588+#line 12044 "configure"
    93899589 #include "confdefs.h"
    93909590 #include <regexp.h>
    93919591 int
    9392 @@ -11650,16 +12028,16 @@
     9592@@ -11650,16 +12056,16 @@
    93939593 }
    93949594 _ACEOF
    93959595 rm -f conftest.$ac_objext conftest$ac_exeext
    93969596-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
    9397 +if { (eval echo "$as_me:12031: \"$ac_link\"") >&5
     9597+if { (eval echo "$as_me:12059: \"$ac_link\"") >&5
    93989598   (eval $ac_link) 2>&5
    93999599   ac_status=$?
    94009600-  echo "$as_me:11656: \$? = $ac_status" >&5
    9401 +  echo "$as_me:12034: \$? = $ac_status" >&5
     9601+  echo "$as_me:12062: \$? = $ac_status" >&5
    94029602   (exit $ac_status); } &&
    94039603          { ac_try='test -s conftest$ac_exeext'
    94049604-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
    9405 +  { (eval echo "$as_me:12037: \"$ac_try\"") >&5
     9605+  { (eval echo "$as_me:12065: \"$ac_try\"") >&5
    94069606   (eval $ac_try) 2>&5
    94079607   ac_status=$?
    94089608-  echo "$as_me:11662: \$? = $ac_status" >&5
    9409 +  echo "$as_me:12040: \$? = $ac_status" >&5
     9609+  echo "$as_me:12068: \$? = $ac_status" >&5
    94109610   (exit $ac_status); }; }; then
    94119611   cf_cv_regex="regexp.h"
    94129612 else
    9413 @@ -11669,7 +12047,7 @@
     9613@@ -11669,7 +12075,7 @@
    94149614                cf_save_LIBS="$LIBS"
    94159615                LIBS="-lgen $LIBS"
    94169616                cat >conftest.$ac_ext <<_ACEOF
    94179617-#line 11672 "configure"
    9418 +#line 12050 "configure"
     9618+#line 12078 "configure"
    94199619 #include "confdefs.h"
    94209620 #include <regexpr.h>
    94219621 int
    9422 @@ -11684,16 +12062,16 @@
     9622@@ -11684,16 +12090,16 @@
    94239623 }
    94249624 _ACEOF
    94259625 rm -f conftest.$ac_objext conftest$ac_exeext
    94269626-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
    9427 +if { (eval echo "$as_me:12065: \"$ac_link\"") >&5
     9627+if { (eval echo "$as_me:12093: \"$ac_link\"") >&5
    94289628   (eval $ac_link) 2>&5
    94299629   ac_status=$?
    94309630-  echo "$as_me:11690: \$? = $ac_status" >&5
    9431 +  echo "$as_me:12068: \$? = $ac_status" >&5
     9631+  echo "$as_me:12096: \$? = $ac_status" >&5
    94329632   (exit $ac_status); } &&
    94339633          { ac_try='test -s conftest$ac_exeext'
    94349634-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
    9435 +  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
     9635+  { (eval echo "$as_me:12099: \"$ac_try\"") >&5
    94369636   (eval $ac_try) 2>&5
    94379637   ac_status=$?
    94389638-  echo "$as_me:11696: \$? = $ac_status" >&5
    9439 +  echo "$as_me:12074: \$? = $ac_status" >&5
     9639+  echo "$as_me:12102: \$? = $ac_status" >&5
    94409640   (exit $ac_status); }; }; then
    94419641   cf_cv_regex="regexpr.h"
    94429642 else
    9443 @@ -11709,7 +12087,7 @@
     9643@@ -11709,7 +12115,7 @@
    94449644 
    94459645 fi
    94469646 
    94479647-echo "$as_me:11712: result: $cf_cv_regex" >&5
    9448 +echo "$as_me:12090: result: $cf_cv_regex" >&5
     9648+echo "$as_me:12118: result: $cf_cv_regex" >&5
    94499649 echo "${ECHO_T}$cf_cv_regex" >&6
    94509650 case $cf_cv_regex in
    94519651        regex.h)   cat >>confdefs.h <<\EOF
    9452 @@ -11745,23 +12123,23 @@
     9652@@ -11745,23 +12151,23 @@
    94539653 
    94549654 do
    94559655 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    94569656-echo "$as_me:11748: checking for $ac_header" >&5
    9457 +echo "$as_me:12126: checking for $ac_header" >&5
     9657+echo "$as_me:12154: checking for $ac_header" >&5
    94589658 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    94599659 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    94629662   cat >conftest.$ac_ext <<_ACEOF
    94639663-#line 11754 "configure"
    9464 +#line 12132 "configure"
     9664+#line 12160 "configure"
    94659665 #include "confdefs.h"
    94669666 #include <$ac_header>
    94679667 _ACEOF
    94689668-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
    9469 +if { (eval echo "$as_me:12136: \"$ac_cpp conftest.$ac_ext\"") >&5
     9669+if { (eval echo "$as_me:12164: \"$ac_cpp conftest.$ac_ext\"") >&5
    94709670   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    94719671   ac_status=$?
    … …  
    94749674   cat conftest.err >&5
    94759675-  echo "$as_me:11764: \$? = $ac_status" >&5
    9476 +  echo "$as_me:12142: \$? = $ac_status" >&5
     9676+  echo "$as_me:12170: \$? = $ac_status" >&5
    94779677   (exit $ac_status); } >/dev/null; then
    94789678   if test -s conftest.err; then
    94799679     ac_cpp_err=$ac_c_preproc_warn_flag
    9480 @@ -11780,7 +12158,7 @@
     9680@@ -11780,7 +12186,7 @@
    94819681 fi
    94829682 rm -f conftest.err conftest.$ac_ext
    94839683 fi
    94849684-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
    9485 +echo "$as_me:12161: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9685+echo "$as_me:12189: result: `eval echo '${'$as_ac_Header'}'`" >&5
    94869686 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    94879687 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    94889688   cat >>confdefs.h <<EOF
    9489 @@ -11794,7 +12172,7 @@
     9689@@ -11794,7 +12200,7 @@
    94909690 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
    94919691 if test "$ISC" = yes ; then
    94929692 
    94939693-echo "$as_me:11797: checking for main in -lcposix" >&5
    9494 +echo "$as_me:12175: checking for main in -lcposix" >&5
     9694+echo "$as_me:12203: checking for main in -lcposix" >&5
    94959695 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
    94969696 if test "${ac_cv_lib_cposix_main+set}" = set; then
    94979697   echo $ECHO_N "(cached) $ECHO_C" >&6
    9498 @@ -11802,7 +12180,7 @@
     9698@@ -11802,7 +12208,7 @@
    94999699   ac_check_lib_save_LIBS=$LIBS
    95009700 LIBS="-lcposix  $LIBS"
    95019701 cat >conftest.$ac_ext <<_ACEOF
    95029702-#line 11805 "configure"
    9503 +#line 12183 "configure"
     9703+#line 12211 "configure"
    95049704 #include "confdefs.h"
    95059705 
    95069706 int
    9507 @@ -11814,16 +12192,16 @@
     9707@@ -11814,16 +12220,16 @@
    95089708 }
    95099709 _ACEOF
    95109710 rm -f conftest.$ac_objext conftest$ac_exeext
    95119711-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
    9512 +if { (eval echo "$as_me:12195: \"$ac_link\"") >&5
     9712+if { (eval echo "$as_me:12223: \"$ac_link\"") >&5
    95139713   (eval $ac_link) 2>&5
    95149714   ac_status=$?
    95159715-  echo "$as_me:11820: \$? = $ac_status" >&5
    9516 +  echo "$as_me:12198: \$? = $ac_status" >&5
     9716+  echo "$as_me:12226: \$? = $ac_status" >&5
    95179717   (exit $ac_status); } &&
    95189718          { ac_try='test -s conftest$ac_exeext'
    95199719-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
    9520 +  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
     9720+  { (eval echo "$as_me:12229: \"$ac_try\"") >&5
    95219721   (eval $ac_try) 2>&5
    95229722   ac_status=$?
    95239723-  echo "$as_me:11826: \$? = $ac_status" >&5
    9524 +  echo "$as_me:12204: \$? = $ac_status" >&5
     9724+  echo "$as_me:12232: \$? = $ac_status" >&5
    95259725   (exit $ac_status); }; }; then
    95269726   ac_cv_lib_cposix_main=yes
    95279727 else
    9528 @@ -11834,7 +12212,7 @@
     9728@@ -11834,7 +12240,7 @@
    95299729 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    95309730 LIBS=$ac_check_lib_save_LIBS
    95319731 fi
    95329732-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
    9533 +echo "$as_me:12215: result: $ac_cv_lib_cposix_main" >&5
     9733+echo "$as_me:12243: result: $ac_cv_lib_cposix_main" >&5
    95349734 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
    95359735 if test $ac_cv_lib_cposix_main = yes; then
    95369736   cat >>confdefs.h <<EOF
    9537 @@ -11845,7 +12223,7 @@
     9737@@ -11845,7 +12251,7 @@
    95389738 
    95399739 fi
    95409740 
    95419741-       echo "$as_me:11848: checking for bzero in -linet" >&5
    9542 +       echo "$as_me:12226: checking for bzero in -linet" >&5
     9742+       echo "$as_me:12254: checking for bzero in -linet" >&5
    95439743 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
    95449744 if test "${ac_cv_lib_inet_bzero+set}" = set; then
    95459745   echo $ECHO_N "(cached) $ECHO_C" >&6
    9546 @@ -11853,7 +12231,7 @@
     9746@@ -11853,7 +12259,7 @@
    95479747   ac_check_lib_save_LIBS=$LIBS
    95489748 LIBS="-linet  $LIBS"
    95499749 cat >conftest.$ac_ext <<_ACEOF
    95509750-#line 11856 "configure"
    9551 +#line 12234 "configure"
     9751+#line 12262 "configure"
    95529752 #include "confdefs.h"
    95539753 
    95549754 /* Override any gcc2 internal prototype to avoid an error.  */
    9555 @@ -11872,16 +12250,16 @@
     9755@@ -11872,16 +12278,16 @@
    95569756 }
    95579757 _ACEOF
    95589758 rm -f conftest.$ac_objext conftest$ac_exeext
    95599759-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
    9560 +if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
     9760+if { (eval echo "$as_me:12281: \"$ac_link\"") >&5
    95619761   (eval $ac_link) 2>&5
    95629762   ac_status=$?
    95639763-  echo "$as_me:11878: \$? = $ac_status" >&5
    9564 +  echo "$as_me:12256: \$? = $ac_status" >&5
     9764+  echo "$as_me:12284: \$? = $ac_status" >&5
    95659765   (exit $ac_status); } &&
    95669766          { ac_try='test -s conftest$ac_exeext'
    95679767-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
    9568 +  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
     9768+  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
    95699769   (eval $ac_try) 2>&5
    95709770   ac_status=$?
    95719771-  echo "$as_me:11884: \$? = $ac_status" >&5
    9572 +  echo "$as_me:12262: \$? = $ac_status" >&5
     9772+  echo "$as_me:12290: \$? = $ac_status" >&5
    95739773   (exit $ac_status); }; }; then
    95749774   ac_cv_lib_inet_bzero=yes
    95759775 else
    9576 @@ -11892,21 +12270,21 @@
     9776@@ -11892,21 +12298,21 @@
    95779777 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    95789778 LIBS=$ac_check_lib_save_LIBS
    95799779 fi
    95809780-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
    9581 +echo "$as_me:12273: result: $ac_cv_lib_inet_bzero" >&5
     9781+echo "$as_me:12301: result: $ac_cv_lib_inet_bzero" >&5
    95829782 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
    95839783 if test $ac_cv_lib_inet_bzero = yes; then
    … …  
    95879787 
    95889788-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
    9589 +echo "$as_me:12280: checking if sys/time.h works with sys/select.h" >&5
     9789+echo "$as_me:12308: checking if sys/time.h works with sys/select.h" >&5
    95909790 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
    95919791 if test "${cf_cv_sys_time_select+set}" = set; then
    … …  
    95959795 cat >conftest.$ac_ext <<_ACEOF
    95969796-#line 11909 "configure"
    9597 +#line 12287 "configure"
     9797+#line 12315 "configure"
    95989798 #include "confdefs.h"
    95999799 
    96009800 #include <sys/types.h>
    9601 @@ -11926,16 +12304,16 @@
     9801@@ -11926,16 +12332,16 @@
    96029802 }
    96039803 _ACEOF
    96049804 rm -f conftest.$ac_objext
    96059805-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
    9606 +if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5
     9806+if { (eval echo "$as_me:12335: \"$ac_compile\"") >&5
    96079807   (eval $ac_compile) 2>&5
    96089808   ac_status=$?
    96099809-  echo "$as_me:11932: \$? = $ac_status" >&5
    9610 +  echo "$as_me:12310: \$? = $ac_status" >&5
     9810+  echo "$as_me:12338: \$? = $ac_status" >&5
    96119811   (exit $ac_status); } &&
    96129812          { ac_try='test -s conftest.$ac_objext'
    96139813-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
    9614 +  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
     9814+  { (eval echo "$as_me:12341: \"$ac_try\"") >&5
    96159815   (eval $ac_try) 2>&5
    96169816   ac_status=$?
    96179817-  echo "$as_me:11938: \$? = $ac_status" >&5
    9618 +  echo "$as_me:12316: \$? = $ac_status" >&5
     9818+  echo "$as_me:12344: \$? = $ac_status" >&5
    96199819   (exit $ac_status); }; }; then
    96209820   cf_cv_sys_time_select=yes
    96219821 else
    9622 @@ -11947,7 +12325,7 @@
     9822@@ -11947,7 +12353,7 @@
    96239823 
    96249824 fi
    96259825 
    96269826-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
    9627 +echo "$as_me:12328: result: $cf_cv_sys_time_select" >&5
     9827+echo "$as_me:12356: result: $cf_cv_sys_time_select" >&5
    96289828 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
    96299829 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
    96309830 #define HAVE_SYS_TIME_SELECT 1
    9631 @@ -11961,7 +12339,7 @@
     9831@@ -11961,7 +12367,7 @@
    96329832 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    96339833 ac_main_return=return
    96349834 
    96359835-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
    9636 +echo "$as_me:12342: checking for $CC option to accept ANSI C" >&5
     9836+echo "$as_me:12370: checking for $CC option to accept ANSI C" >&5
    96379837 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
    96389838 if test "${ac_cv_prog_cc_stdc+set}" = set; then
    96399839   echo $ECHO_N "(cached) $ECHO_C" >&6
    9640 @@ -11969,7 +12347,7 @@
     9840@@ -11969,7 +12375,7 @@
    96419841   ac_cv_prog_cc_stdc=no
    96429842 ac_save_CC=$CC
    96439843 cat >conftest.$ac_ext <<_ACEOF
    96449844-#line 11972 "configure"
    9645 +#line 12350 "configure"
     9845+#line 12378 "configure"
    96469846 #include "confdefs.h"
    96479847 #include <stdarg.h>
    96489848 #include <stdio.h>
    9649 @@ -12018,16 +12396,16 @@
     9849@@ -12018,16 +12424,16 @@
    96509850 do
    96519851   CC="$ac_save_CC $ac_arg"
    96529852   rm -f conftest.$ac_objext
    96539853-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
    9654 +if { (eval echo "$as_me:12399: \"$ac_compile\"") >&5
     9854+if { (eval echo "$as_me:12427: \"$ac_compile\"") >&5
    96559855   (eval $ac_compile) 2>&5
    96569856   ac_status=$?
    96579857-  echo "$as_me:12024: \$? = $ac_status" >&5
    9658 +  echo "$as_me:12402: \$? = $ac_status" >&5
     9858+  echo "$as_me:12430: \$? = $ac_status" >&5
    96599859   (exit $ac_status); } &&
    96609860          { ac_try='test -s conftest.$ac_objext'
    96619861-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
    9662 +  { (eval echo "$as_me:12405: \"$ac_try\"") >&5
     9862+  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
    96639863   (eval $ac_try) 2>&5
    96649864   ac_status=$?
    96659865-  echo "$as_me:12030: \$? = $ac_status" >&5
    9666 +  echo "$as_me:12408: \$? = $ac_status" >&5
     9866+  echo "$as_me:12436: \$? = $ac_status" >&5
    96679867   (exit $ac_status); }; }; then
    96689868   ac_cv_prog_cc_stdc=$ac_arg
    96699869 break
    9670 @@ -12044,21 +12422,21 @@
     9870@@ -12044,21 +12450,21 @@
    96719871 
    96729872 case "x$ac_cv_prog_cc_stdc" in
    96739873   x|xno)
    96749874-    echo "$as_me:12047: result: none needed" >&5
    9675 +    echo "$as_me:12425: result: none needed" >&5
     9875+    echo "$as_me:12453: result: none needed" >&5
    96769876 echo "${ECHO_T}none needed" >&6 ;;
    96779877   *)
    96789878-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
    9679 +    echo "$as_me:12428: result: $ac_cv_prog_cc_stdc" >&5
     9879+    echo "$as_me:12456: result: $ac_cv_prog_cc_stdc" >&5
    96809880 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    96819881     CC="$CC $ac_cv_prog_cc_stdc" ;;
    … …  
    96839883 
    96849884-echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
    9685 +echo "$as_me:12433: checking for an ANSI C-conforming const" >&5
     9885+echo "$as_me:12461: checking for an ANSI C-conforming const" >&5
    96869886 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
    96879887 if test "${ac_cv_c_const+set}" = set; then
    … …  
    96909890   cat >conftest.$ac_ext <<_ACEOF
    96919891-#line 12061 "configure"
    9692 +#line 12439 "configure"
     9892+#line 12467 "configure"
    96939893 #include "confdefs.h"
    96949894 
    96959895 int
    9696 @@ -12116,16 +12494,16 @@
     9896@@ -12116,16 +12522,16 @@
    96979897 }
    96989898 _ACEOF
    96999899 rm -f conftest.$ac_objext
    97009900-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
    9701 +if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5
     9901+if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5
    97029902   (eval $ac_compile) 2>&5
    97039903   ac_status=$?
    97049904-  echo "$as_me:12122: \$? = $ac_status" >&5
    9705 +  echo "$as_me:12500: \$? = $ac_status" >&5
     9905+  echo "$as_me:12528: \$? = $ac_status" >&5
    97069906   (exit $ac_status); } &&
    97079907          { ac_try='test -s conftest.$ac_objext'
    97089908-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
    9709 +  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
     9909+  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
    97109910   (eval $ac_try) 2>&5
    97119911   ac_status=$?
    97129912-  echo "$as_me:12128: \$? = $ac_status" >&5
    9713 +  echo "$as_me:12506: \$? = $ac_status" >&5
     9913+  echo "$as_me:12534: \$? = $ac_status" >&5
    97149914   (exit $ac_status); }; }; then
    97159915   ac_cv_c_const=yes
    97169916 else
    9717 @@ -12135,7 +12513,7 @@
     9917@@ -12135,7 +12541,7 @@
    97189918 fi
    97199919 rm -f conftest.$ac_objext conftest.$ac_ext
    97209920 fi
    97219921-echo "$as_me:12138: result: $ac_cv_c_const" >&5
    9722 +echo "$as_me:12516: result: $ac_cv_c_const" >&5
     9922+echo "$as_me:12544: result: $ac_cv_c_const" >&5
    97239923 echo "${ECHO_T}$ac_cv_c_const" >&6
    97249924 if test $ac_cv_c_const = no; then
    97259925 
    9726 @@ -12145,7 +12523,7 @@
     9926@@ -12145,7 +12551,7 @@
    97279927 
    97289928 fi
    97299929 
    97309930-echo "$as_me:12148: checking for inline" >&5
    9731 +echo "$as_me:12526: checking for inline" >&5
     9931+echo "$as_me:12554: checking for inline" >&5
    97329932 echo $ECHO_N "checking for inline... $ECHO_C" >&6
    97339933 if test "${ac_cv_c_inline+set}" = set; then
    97349934   echo $ECHO_N "(cached) $ECHO_C" >&6
    9735 @@ -12153,7 +12531,7 @@
     9935@@ -12153,7 +12559,7 @@
    97369936   ac_cv_c_inline=no
    97379937 for ac_kw in inline __inline__ __inline; do
    97389938   cat >conftest.$ac_ext <<_ACEOF
    97399939-#line 12156 "configure"
    9740 +#line 12534 "configure"
     9940+#line 12562 "configure"
    97419941 #include "confdefs.h"
    97429942 #ifndef __cplusplus
    97439943 static $ac_kw int static_foo () {return 0; }
    9744 @@ -12162,16 +12540,16 @@
     9944@@ -12162,16 +12568,16 @@
    97459945 
    97469946 _ACEOF
    97479947 rm -f conftest.$ac_objext
    97489948-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
    9749 +if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5
     9949+if { (eval echo "$as_me:12571: \"$ac_compile\"") >&5
    97509950   (eval $ac_compile) 2>&5
    97519951   ac_status=$?
    97529952-  echo "$as_me:12168: \$? = $ac_status" >&5
    9753 +  echo "$as_me:12546: \$? = $ac_status" >&5
     9953+  echo "$as_me:12574: \$? = $ac_status" >&5
    97549954   (exit $ac_status); } &&
    97559955          { ac_try='test -s conftest.$ac_objext'
    97569956-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
    9757 +  { (eval echo "$as_me:12549: \"$ac_try\"") >&5
     9957+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
    97589958   (eval $ac_try) 2>&5
    97599959   ac_status=$?
    97609960-  echo "$as_me:12174: \$? = $ac_status" >&5
    9761 +  echo "$as_me:12552: \$? = $ac_status" >&5
     9961+  echo "$as_me:12580: \$? = $ac_status" >&5
    97629962   (exit $ac_status); }; }; then
    97639963   ac_cv_c_inline=$ac_kw; break
    97649964 else
    9765 @@ -12182,7 +12560,7 @@
     9965@@ -12182,7 +12588,7 @@
    97669966 done
    97679967 
    97689968 fi
    97699969-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
    9770 +echo "$as_me:12563: result: $ac_cv_c_inline" >&5
     9970+echo "$as_me:12591: result: $ac_cv_c_inline" >&5
    97719971 echo "${ECHO_T}$ac_cv_c_inline" >&6
    97729972 case $ac_cv_c_inline in
    97739973   inline | yes) ;;
    9774 @@ -12205,7 +12583,7 @@
     9974@@ -12205,7 +12611,7 @@
    97759975     :
    97769976   elif test "$GCC" = yes
    97779977   then
    97789978-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
    9779 +    echo "$as_me:12586: checking if gcc supports options to tune inlining" >&5
     9979+    echo "$as_me:12614: checking if gcc supports options to tune inlining" >&5
    97809980 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
    97819981 if test "${cf_cv_gcc_inline+set}" = set; then
    97829982   echo $ECHO_N "(cached) $ECHO_C" >&6
    9783 @@ -12214,7 +12592,7 @@
     9983@@ -12214,7 +12620,7 @@
    97849984       cf_save_CFLAGS=$CFLAGS
    97859985       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
    97869986       cat >conftest.$ac_ext <<_ACEOF
    97879987-#line 12217 "configure"
    9788 +#line 12595 "configure"
     9988+#line 12623 "configure"
    97899989 #include "confdefs.h"
    97909990 inline int foo(void) { return 1; }
    97919991 int
    9792 @@ -12226,16 +12604,16 @@
     9992@@ -12226,16 +12632,16 @@
    97939993 }
    97949994 _ACEOF
    97959995 rm -f conftest.$ac_objext
    97969996-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
    9797 +if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
     9997+if { (eval echo "$as_me:12635: \"$ac_compile\"") >&5
    97989998   (eval $ac_compile) 2>&5
    97999999   ac_status=$?
    980010000-  echo "$as_me:12232: \$? = $ac_status" >&5
    9801 +  echo "$as_me:12610: \$? = $ac_status" >&5
     10001+  echo "$as_me:12638: \$? = $ac_status" >&5
    980210002   (exit $ac_status); } &&
    980310003          { ac_try='test -s conftest.$ac_objext'
    980410004-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
    9805 +  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
     10005+  { (eval echo "$as_me:12641: \"$ac_try\"") >&5
    980610006   (eval $ac_try) 2>&5
    980710007   ac_status=$?
    980810008-  echo "$as_me:12238: \$? = $ac_status" >&5
    9809 +  echo "$as_me:12616: \$? = $ac_status" >&5
     10009+  echo "$as_me:12644: \$? = $ac_status" >&5
    981010010   (exit $ac_status); }; }; then
    981110011   cf_cv_gcc_inline=yes
    981210012 else
    9813 @@ -12247,7 +12625,7 @@
     10013@@ -12247,7 +12653,7 @@
    981410014       CFLAGS=$cf_save_CFLAGS
    981510015 
    981610016 fi
    981710017-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
    9818 +echo "$as_me:12628: result: $cf_cv_gcc_inline" >&5
     10018+echo "$as_me:12656: result: $cf_cv_gcc_inline" >&5
    981910019 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
    982010020     if test "$cf_cv_gcc_inline" = yes ; then
    982110021 
    9822 @@ -12311,7 +12689,7 @@
     10022@@ -12311,7 +12717,7 @@
    982310023 
    982410024 if test -n "$cf_new_cppflags" ; then
    … …  
    982910029 
    983010030 if test -n "$cf_new_extra_cppflags" ; then
    9831 @@ -12323,7 +12701,7 @@
     10031@@ -12323,7 +12729,7 @@
    983210032   fi
    983310033 fi
    983410034 
    983510035-echo "$as_me:12326: checking for signal global datatype" >&5
    9836 +echo "$as_me:12704: checking for signal global datatype" >&5
     10036+echo "$as_me:12732: checking for signal global datatype" >&5
    983710037 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
    983810038 if test "${cf_cv_sig_atomic_t+set}" = set; then
    983910039   echo $ECHO_N "(cached) $ECHO_C" >&6
    9840 @@ -12335,7 +12713,7 @@
     10040@@ -12335,7 +12741,7 @@
    984110041                "int"
    984210042        do
    984310043        cat >conftest.$ac_ext <<_ACEOF
    984410044-#line 12338 "configure"
    9845 +#line 12716 "configure"
     10045+#line 12744 "configure"
    984610046 #include "confdefs.h"
    984710047 
    984810048 #include <sys/types.h>
    9849 @@ -12358,16 +12736,16 @@
     10049@@ -12358,16 +12764,16 @@
    985010050 }
    985110051 _ACEOF
    985210052 rm -f conftest.$ac_objext
    985310053-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
    9854 +if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5
     10054+if { (eval echo "$as_me:12767: \"$ac_compile\"") >&5
    985510055   (eval $ac_compile) 2>&5
    985610056   ac_status=$?
    985710057-  echo "$as_me:12364: \$? = $ac_status" >&5
    9858 +  echo "$as_me:12742: \$? = $ac_status" >&5
     10058+  echo "$as_me:12770: \$? = $ac_status" >&5
    985910059   (exit $ac_status); } &&
    986010060          { ac_try='test -s conftest.$ac_objext'
    986110061-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
    9862 +  { (eval echo "$as_me:12745: \"$ac_try\"") >&5
     10062+  { (eval echo "$as_me:12773: \"$ac_try\"") >&5
    986310063   (eval $ac_try) 2>&5
    986410064   ac_status=$?
    986510065-  echo "$as_me:12370: \$? = $ac_status" >&5
    9866 +  echo "$as_me:12748: \$? = $ac_status" >&5
     10066+  echo "$as_me:12776: \$? = $ac_status" >&5
    986710067   (exit $ac_status); }; }; then
    986810068   cf_cv_sig_atomic_t=$cf_type
    986910069 else
    9870 @@ -12381,7 +12759,7 @@
     10070@@ -12381,7 +12787,7 @@
    987110071 
    987210072 fi
    987310073 
    987410074-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
    9875 +echo "$as_me:12762: result: $cf_cv_sig_atomic_t" >&5
     10075+echo "$as_me:12790: result: $cf_cv_sig_atomic_t" >&5
    987610076 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
    987710077 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
    987810078 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
    9879 @@ -12389,7 +12767,7 @@
     10079@@ -12389,7 +12795,7 @@
    988010080 
    988110081 if test $NCURSES_CHTYPE = auto ; then
    988210082 
    988310083-echo "$as_me:12392: checking for type of chtype" >&5
    9884 +echo "$as_me:12770: checking for type of chtype" >&5
     10084+echo "$as_me:12798: checking for type of chtype" >&5
    988510085 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    988610086 if test "${cf_cv_typeof_chtype+set}" = set; then
    988710087   echo $ECHO_N "(cached) $ECHO_C" >&6
    9888 @@ -12399,7 +12777,7 @@
     10088@@ -12399,7 +12805,7 @@
    988910089   cf_cv_typeof_chtype=long
    989010090 else
    989110091   cat >conftest.$ac_ext <<_ACEOF
    989210092-#line 12402 "configure"
    9893 +#line 12780 "configure"
     10093+#line 12808 "configure"
    989410094 #include "confdefs.h"
    989510095 
    989610096 #define WANT_BITS 31
    9897 @@ -12434,15 +12812,15 @@
     10097@@ -12434,15 +12840,15 @@
    989810098 
    989910099 _ACEOF
    990010100 rm -f conftest$ac_exeext
    990110101-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
    9902 +if { (eval echo "$as_me:12815: \"$ac_link\"") >&5
     10102+if { (eval echo "$as_me:12843: \"$ac_link\"") >&5
    990310103   (eval $ac_link) 2>&5
    990410104   ac_status=$?
    990510105-  echo "$as_me:12440: \$? = $ac_status" >&5
    9906 +  echo "$as_me:12818: \$? = $ac_status" >&5
     10106+  echo "$as_me:12846: \$? = $ac_status" >&5
    990710107   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    990810108-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
    9909 +  { (eval echo "$as_me:12820: \"$ac_try\"") >&5
     10109+  { (eval echo "$as_me:12848: \"$ac_try\"") >&5
    991010110   (eval $ac_try) 2>&5
    991110111   ac_status=$?
    991210112-  echo "$as_me:12445: \$? = $ac_status" >&5
    9913 +  echo "$as_me:12823: \$? = $ac_status" >&5
     10113+  echo "$as_me:12851: \$? = $ac_status" >&5
    991410114   (exit $ac_status); }; }; then
    991510115   cf_cv_typeof_chtype=`cat cf_test.out`
    991610116 else
    9917 @@ -12457,7 +12835,7 @@
     10117@@ -12457,7 +12863,7 @@
    991810118 
    991910119 fi
    992010120 
    992110121-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
    9922 +echo "$as_me:12838: result: $cf_cv_typeof_chtype" >&5
     10122+echo "$as_me:12866: result: $cf_cv_typeof_chtype" >&5
    992310123 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
    992410124 
    992510125 cat >>confdefs.h <<EOF
    9926 @@ -12469,14 +12847,14 @@
     10126@@ -12469,14 +12875,14 @@
    992710127 fi
    992810128 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
    992910129 
    993010130-echo "$as_me:12472: checking if unsigned literals are legal" >&5
    9931 +echo "$as_me:12850: checking if unsigned literals are legal" >&5
     10131+echo "$as_me:12878: checking if unsigned literals are legal" >&5
    993210132 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
    993310133 if test "${cf_cv_unsigned_literals+set}" = set; then
    … …  
    993710137        cat >conftest.$ac_ext <<_ACEOF
    993810138-#line 12479 "configure"
    9939 +#line 12857 "configure"
     10139+#line 12885 "configure"
    994010140 #include "confdefs.h"
    994110141 
    994210142 int
    9943 @@ -12488,16 +12866,16 @@
     10143@@ -12488,16 +12894,16 @@
    994410144 }
    994510145 _ACEOF
    994610146 rm -f conftest.$ac_objext
    994710147-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
    9948 +if { (eval echo "$as_me:12869: \"$ac_compile\"") >&5
     10148+if { (eval echo "$as_me:12897: \"$ac_compile\"") >&5
    994910149   (eval $ac_compile) 2>&5
    995010150   ac_status=$?
    995110151-  echo "$as_me:12494: \$? = $ac_status" >&5
    9952 +  echo "$as_me:12872: \$? = $ac_status" >&5
     10152+  echo "$as_me:12900: \$? = $ac_status" >&5
    995310153   (exit $ac_status); } &&
    995410154          { ac_try='test -s conftest.$ac_objext'
    995510155-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
    9956 +  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
     10156+  { (eval echo "$as_me:12903: \"$ac_try\"") >&5
    995710157   (eval $ac_try) 2>&5
    995810158   ac_status=$?
    995910159-  echo "$as_me:12500: \$? = $ac_status" >&5
    9960 +  echo "$as_me:12878: \$? = $ac_status" >&5
     10160+  echo "$as_me:12906: \$? = $ac_status" >&5
    996110161   (exit $ac_status); }; }; then
    996210162   cf_cv_unsigned_literals=yes
    996310163 else
    9964 @@ -12509,7 +12887,7 @@
     10164@@ -12509,7 +12915,7 @@
    996510165 
    996610166 fi
    996710167 
    996810168-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
    9969 +echo "$as_me:12890: result: $cf_cv_unsigned_literals" >&5
     10169+echo "$as_me:12918: result: $cf_cv_unsigned_literals" >&5
    997010170 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
    997110171 
    997210172 cf_cv_1UL="1"
    9973 @@ -12525,14 +12903,14 @@
     10173@@ -12525,14 +12931,14 @@
    997410174 
    997510175 ###    Checks for external-data
    997610176 
    997710177-echo "$as_me:12528: checking if external errno is declared" >&5
    9978 +echo "$as_me:12906: checking if external errno is declared" >&5
     10178+echo "$as_me:12934: checking if external errno is declared" >&5
    997910179 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
    998010180 if test "${cf_cv_dcl_errno+set}" = set; then
    … …  
    998410184     cat >conftest.$ac_ext <<_ACEOF
    998510185-#line 12535 "configure"
    9986 +#line 12913 "configure"
     10186+#line 12941 "configure"
    998710187 #include "confdefs.h"
    998810188 
    998910189 #ifdef HAVE_STDLIB_H
    9990 @@ -12550,16 +12928,16 @@
     10190@@ -12550,16 +12956,16 @@
    999110191 }
    999210192 _ACEOF
    999310193 rm -f conftest.$ac_objext
    999410194-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
    9995 +if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5
     10195+if { (eval echo "$as_me:12959: \"$ac_compile\"") >&5
    999610196   (eval $ac_compile) 2>&5
    999710197   ac_status=$?
    999810198-  echo "$as_me:12556: \$? = $ac_status" >&5
    9999 +  echo "$as_me:12934: \$? = $ac_status" >&5
     10199+  echo "$as_me:12962: \$? = $ac_status" >&5
    1000010200   (exit $ac_status); } &&
    1000110201          { ac_try='test -s conftest.$ac_objext'
    1000210202-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
    10003 +  { (eval echo "$as_me:12937: \"$ac_try\"") >&5
     10203+  { (eval echo "$as_me:12965: \"$ac_try\"") >&5
    1000410204   (eval $ac_try) 2>&5
    1000510205   ac_status=$?
    1000610206-  echo "$as_me:12562: \$? = $ac_status" >&5
    10007 +  echo "$as_me:12940: \$? = $ac_status" >&5
     10207+  echo "$as_me:12968: \$? = $ac_status" >&5
    1000810208   (exit $ac_status); }; }; then
    1000910209   cf_cv_dcl_errno=yes
    1001010210 else
    10011 @@ -12570,7 +12948,7 @@
     10211@@ -12570,7 +12976,7 @@
    1001210212 rm -f conftest.$ac_objext conftest.$ac_ext
    1001310213 
    1001410214 fi
    1001510215-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
    10016 +echo "$as_me:12951: result: $cf_cv_dcl_errno" >&5
     10216+echo "$as_me:12979: result: $cf_cv_dcl_errno" >&5
    1001710217 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
    1001810218 
    1001910219 if test "$cf_cv_dcl_errno" = no ; then
    10020 @@ -12585,14 +12963,14 @@
     10220@@ -12585,14 +12991,14 @@
    1002110221 
    1002210222 # It's possible (for near-UNIX clones) that the data doesn't exist
    1002310223 
    1002410224-echo "$as_me:12588: checking if external errno exists" >&5
    10025 +echo "$as_me:12966: checking if external errno exists" >&5
     10225+echo "$as_me:12994: checking if external errno exists" >&5
    1002610226 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
    1002710227 if test "${cf_cv_have_errno+set}" = set; then
    … …  
    1003110231     cat >conftest.$ac_ext <<_ACEOF
    1003210232-#line 12595 "configure"
    10033 +#line 12973 "configure"
     10233+#line 13001 "configure"
    1003410234 #include "confdefs.h"
    1003510235 
    1003610236 #undef errno
    10037 @@ -12607,16 +12985,16 @@
     10237@@ -12607,16 +13013,16 @@
    1003810238 }
    1003910239 _ACEOF
    1004010240 rm -f conftest.$ac_objext conftest$ac_exeext
    1004110241-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
    10042 +if { (eval echo "$as_me:12988: \"$ac_link\"") >&5
     10242+if { (eval echo "$as_me:13016: \"$ac_link\"") >&5
    1004310243   (eval $ac_link) 2>&5
    1004410244   ac_status=$?
    1004510245-  echo "$as_me:12613: \$? = $ac_status" >&5
    10046 +  echo "$as_me:12991: \$? = $ac_status" >&5
     10246+  echo "$as_me:13019: \$? = $ac_status" >&5
    1004710247   (exit $ac_status); } &&
    1004810248          { ac_try='test -s conftest$ac_exeext'
    1004910249-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
    10050 +  { (eval echo "$as_me:12994: \"$ac_try\"") >&5
     10250+  { (eval echo "$as_me:13022: \"$ac_try\"") >&5
    1005110251   (eval $ac_try) 2>&5
    1005210252   ac_status=$?
    1005310253-  echo "$as_me:12619: \$? = $ac_status" >&5
    10054 +  echo "$as_me:12997: \$? = $ac_status" >&5
     10254+  echo "$as_me:13025: \$? = $ac_status" >&5
    1005510255   (exit $ac_status); }; }; then
    1005610256   cf_cv_have_errno=yes
    1005710257 else
    10058 @@ -12627,7 +13005,7 @@
     10258@@ -12627,7 +13033,7 @@
    1005910259 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1006010260 
    1006110261 fi
    1006210262-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
    10063 +echo "$as_me:13008: result: $cf_cv_have_errno" >&5
     10263+echo "$as_me:13036: result: $cf_cv_have_errno" >&5
    1006410264 echo "${ECHO_T}$cf_cv_have_errno" >&6
    1006510265 
    1006610266 if test "$cf_cv_have_errno" = yes ; then
    10067 @@ -12640,7 +13018,7 @@
     10267@@ -12640,7 +13046,7 @@
    1006810268 
    1006910269 fi
    1007010270 
    1007110271-echo "$as_me:12643: checking if data-only library module links" >&5
    10072 +echo "$as_me:13021: checking if data-only library module links" >&5
     10272+echo "$as_me:13049: checking if data-only library module links" >&5
    1007310273 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
    1007410274 if test "${cf_cv_link_dataonly+set}" = set; then
    1007510275   echo $ECHO_N "(cached) $ECHO_C" >&6
    10076 @@ -12648,20 +13026,20 @@
     10276@@ -12648,20 +13054,20 @@
    1007710277 
    1007810278        rm -f conftest.a
    1007910279        cat >conftest.$ac_ext <<EOF
    1008010280-#line 12651 "configure"
    10081 +#line 13029 "configure"
     10281+#line 13057 "configure"
    1008210282 int    testdata[3] = { 123, 456, 789 };
    1008310283 EOF
    1008410284-       if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
    10085 +       if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
     10285+       if { (eval echo "$as_me:13060: \"$ac_compile\"") >&5
    1008610286   (eval $ac_compile) 2>&5
    1008710287   ac_status=$?
    1008810288-  echo "$as_me:12657: \$? = $ac_status" >&5
    10089 +  echo "$as_me:13035: \$? = $ac_status" >&5
     10289+  echo "$as_me:13063: \$? = $ac_status" >&5
    1009010290   (exit $ac_status); } ; then
    1009110291                mv conftest.o data.o && \
    … …  
    1009610296        cat >conftest.$ac_ext <<EOF
    1009710297-#line 12664 "configure"
    10098 +#line 13042 "configure"
     10298+#line 13070 "configure"
    1009910299 int    testfunc()
    1010010300 {
    1010110301 #if defined(NeXT)
    10102 @@ -12674,13 +13052,13 @@
     10302@@ -12674,13 +13080,13 @@
    1010310303 #endif
    1010410304 }
    1010510305 EOF
    1010610306-       if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
    10107 +       if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
     10307+       if { (eval echo "$as_me:13083: \"$ac_compile\"") >&5
    1010810308   (eval $ac_compile) 2>&5
    1010910309   ac_status=$?
    1011010310-  echo "$as_me:12680: \$? = $ac_status" >&5
    10111 +  echo "$as_me:13058: \$? = $ac_status" >&5
     10311+  echo "$as_me:13086: \$? = $ac_status" >&5
    1011210312   (exit $ac_status); }; then
    1011310313                mv conftest.o func.o && \
    … …  
    1011710317        rm -f conftest.$ac_ext func.o
    1011810318        ( eval $RANLIB conftest.a ) 2>&5 >/dev/null
    10119 @@ -12690,7 +13068,7 @@
     10319@@ -12690,7 +13096,7 @@
    1012010320   cf_cv_link_dataonly=unknown
    1012110321 else
    1012210322   cat >conftest.$ac_ext <<_ACEOF
    1012310323-#line 12693 "configure"
    10124 +#line 13071 "configure"
     10324+#line 13099 "configure"
    1012510325 #include "confdefs.h"
    1012610326 
    1012710327        int main()
    10128 @@ -12701,15 +13079,15 @@
     10328@@ -12701,15 +13107,15 @@
    1012910329 
    1013010330 _ACEOF
    1013110331 rm -f conftest$ac_exeext
    1013210332-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
    10133 +if { (eval echo "$as_me:13082: \"$ac_link\"") >&5
     10333+if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
    1013410334   (eval $ac_link) 2>&5
    1013510335   ac_status=$?
    1013610336-  echo "$as_me:12707: \$? = $ac_status" >&5
    10137 +  echo "$as_me:13085: \$? = $ac_status" >&5
     10337+  echo "$as_me:13113: \$? = $ac_status" >&5
    1013810338   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1013910339-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
    10140 +  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
     10340+  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
    1014110341   (eval $ac_try) 2>&5
    1014210342   ac_status=$?
    1014310343-  echo "$as_me:12712: \$? = $ac_status" >&5
    10144 +  echo "$as_me:13090: \$? = $ac_status" >&5
     10344+  echo "$as_me:13118: \$? = $ac_status" >&5
    1014510345   (exit $ac_status); }; }; then
    1014610346   cf_cv_link_dataonly=yes
    1014710347 else
    10148 @@ -12724,7 +13102,7 @@
     10348@@ -12724,7 +13130,7 @@
    1014910349 
    1015010350 fi
    1015110351 
    1015210352-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
    10153 +echo "$as_me:13105: result: $cf_cv_link_dataonly" >&5
     10353+echo "$as_me:13133: result: $cf_cv_link_dataonly" >&5
    1015410354 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
    1015510355 
    1015610356 if test "$cf_cv_link_dataonly" = no ; then
    10157 @@ -12759,13 +13137,13 @@
     10357@@ -12759,13 +13165,13 @@
    1015810358 
    1015910359 do
    1016010360 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    1016110361-echo "$as_me:12762: checking for $ac_func" >&5
    10162 +echo "$as_me:13140: checking for $ac_func" >&5
     10362+echo "$as_me:13168: checking for $ac_func" >&5
    1016310363 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    1016410364 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    1016710367   cat >conftest.$ac_ext <<_ACEOF
    1016810368-#line 12768 "configure"
    10169 +#line 13146 "configure"
     10369+#line 13174 "configure"
    1017010370 #include "confdefs.h"
    1017110371 /* System header to define __stub macros and hopefully few prototypes,
    1017210372     which can conflict with char $ac_func (); below.  */
    10173 @@ -12796,16 +13174,16 @@
     10373@@ -12796,16 +13202,16 @@
    1017410374 }
    1017510375 _ACEOF
    1017610376 rm -f conftest.$ac_objext conftest$ac_exeext
    1017710377-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
    10178 +if { (eval echo "$as_me:13177: \"$ac_link\"") >&5
     10378+if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
    1017910379   (eval $ac_link) 2>&5
    1018010380   ac_status=$?
    1018110381-  echo "$as_me:12802: \$? = $ac_status" >&5
    10182 +  echo "$as_me:13180: \$? = $ac_status" >&5
     10382+  echo "$as_me:13208: \$? = $ac_status" >&5
    1018310383   (exit $ac_status); } &&
    1018410384          { ac_try='test -s conftest$ac_exeext'
    1018510385-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
    10186 +  { (eval echo "$as_me:13183: \"$ac_try\"") >&5
     10386+  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
    1018710387   (eval $ac_try) 2>&5
    1018810388   ac_status=$?
    1018910389-  echo "$as_me:12808: \$? = $ac_status" >&5
    10190 +  echo "$as_me:13186: \$? = $ac_status" >&5
     10390+  echo "$as_me:13214: \$? = $ac_status" >&5
    1019110391   (exit $ac_status); }; }; then
    1019210392   eval "$as_ac_var=yes"
    1019310393 else
    10194 @@ -12815,7 +13193,7 @@
     10394@@ -12815,7 +13221,7 @@
    1019510395 fi
    1019610396 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1019710397 fi
    1019810398-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
    10199 +echo "$as_me:13196: result: `eval echo '${'$as_ac_var'}'`" >&5
     10399+echo "$as_me:13224: result: `eval echo '${'$as_ac_var'}'`" >&5
    1020010400 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    1020110401 if test `eval echo '${'$as_ac_var'}'` = yes; then
    1020210402   cat >>confdefs.h <<EOF
    10203 @@ -12827,14 +13205,14 @@
     10403@@ -12827,14 +13233,14 @@
    1020410404 
    1020510405 if test "$with_getcap" = "yes" ; then
    1020610406 
    1020710407-echo "$as_me:12830: checking for terminal-capability database functions" >&5
    10208 +echo "$as_me:13208: checking for terminal-capability database functions" >&5
     10408+echo "$as_me:13236: checking for terminal-capability database functions" >&5
    1020910409 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
    1021010410 if test "${cf_cv_cgetent+set}" = set; then
    … …  
    1021410414 cat >conftest.$ac_ext <<_ACEOF
    1021510415-#line 12837 "configure"
    10216 +#line 13215 "configure"
     10416+#line 13243 "configure"
    1021710417 #include "confdefs.h"
    1021810418 
    1021910419 #include <stdlib.h>
    10220 @@ -12854,16 +13232,16 @@
     10420@@ -12854,16 +13260,16 @@
    1022110421 }
    1022210422 _ACEOF
    1022310423 rm -f conftest.$ac_objext conftest$ac_exeext
    1022410424-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
    10225 +if { (eval echo "$as_me:13235: \"$ac_link\"") >&5
     10425+if { (eval echo "$as_me:13263: \"$ac_link\"") >&5
    1022610426   (eval $ac_link) 2>&5
    1022710427   ac_status=$?
    1022810428-  echo "$as_me:12860: \$? = $ac_status" >&5
    10229 +  echo "$as_me:13238: \$? = $ac_status" >&5
     10429+  echo "$as_me:13266: \$? = $ac_status" >&5
    1023010430   (exit $ac_status); } &&
    1023110431          { ac_try='test -s conftest$ac_exeext'
    1023210432-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
    10233 +  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
     10433+  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
    1023410434   (eval $ac_try) 2>&5
    1023510435   ac_status=$?
    1023610436-  echo "$as_me:12866: \$? = $ac_status" >&5
    10237 +  echo "$as_me:13244: \$? = $ac_status" >&5
     10437+  echo "$as_me:13272: \$? = $ac_status" >&5
    1023810438   (exit $ac_status); }; }; then
    1023910439   cf_cv_cgetent=yes
    1024010440 else
    10241 @@ -12875,7 +13253,7 @@
     10441@@ -12875,7 +13281,7 @@
    1024210442 
    1024310443 fi
    1024410444 
    1024510445-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
    10246 +echo "$as_me:13256: result: $cf_cv_cgetent" >&5
     10446+echo "$as_me:13284: result: $cf_cv_cgetent" >&5
    1024710447 echo "${ECHO_T}$cf_cv_cgetent" >&6
    1024810448 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
    1024910449 #define HAVE_BSD_CGETENT 1
    10250 @@ -12883,14 +13261,14 @@
     10450@@ -12883,14 +13289,14 @@
    1025110451 
    1025210452 fi
    1025310453 
    1025410454-echo "$as_me:12886: checking for isascii" >&5
    10255 +echo "$as_me:13264: checking for isascii" >&5
     10455+echo "$as_me:13292: checking for isascii" >&5
    1025610456 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
    1025710457 if test "${cf_cv_have_isascii+set}" = set; then
    … …  
    1026110461        cat >conftest.$ac_ext <<_ACEOF
    1026210462-#line 12893 "configure"
    10263 +#line 13271 "configure"
     10463+#line 13299 "configure"
    1026410464 #include "confdefs.h"
    1026510465 #include <ctype.h>
    1026610466 int
    10267 @@ -12902,16 +13280,16 @@
     10467@@ -12902,16 +13308,16 @@
    1026810468 }
    1026910469 _ACEOF
    1027010470 rm -f conftest.$ac_objext conftest$ac_exeext
    1027110471-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
    10272 +if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
     10472+if { (eval echo "$as_me:13311: \"$ac_link\"") >&5
    1027310473   (eval $ac_link) 2>&5
    1027410474   ac_status=$?
    1027510475-  echo "$as_me:12908: \$? = $ac_status" >&5
    10276 +  echo "$as_me:13286: \$? = $ac_status" >&5
     10476+  echo "$as_me:13314: \$? = $ac_status" >&5
    1027710477   (exit $ac_status); } &&
    1027810478          { ac_try='test -s conftest$ac_exeext'
    1027910479-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
    10280 +  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
     10480+  { (eval echo "$as_me:13317: \"$ac_try\"") >&5
    1028110481   (eval $ac_try) 2>&5
    1028210482   ac_status=$?
    1028310483-  echo "$as_me:12914: \$? = $ac_status" >&5
    10284 +  echo "$as_me:13292: \$? = $ac_status" >&5
     10484+  echo "$as_me:13320: \$? = $ac_status" >&5
    1028510485   (exit $ac_status); }; }; then
    1028610486   cf_cv_have_isascii=yes
    1028710487 else
    10288 @@ -12922,17 +13300,17 @@
     10488@@ -12922,17 +13328,17 @@
    1028910489 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1029010490 
    1029110491 fi
    1029210492-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
    10293 +echo "$as_me:13303: result: $cf_cv_have_isascii" >&5
     10493+echo "$as_me:13331: result: $cf_cv_have_isascii" >&5
    1029410494 echo "${ECHO_T}$cf_cv_have_isascii" >&6
    1029510495 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
    … …  
    1029910499 if test "$ac_cv_func_sigaction" = yes; then
    1030010500-echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
    10301 +echo "$as_me:13310: checking whether sigaction needs _POSIX_SOURCE" >&5
     10501+echo "$as_me:13338: checking whether sigaction needs _POSIX_SOURCE" >&5
    1030210502 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
    1030310503 cat >conftest.$ac_ext <<_ACEOF
    1030410504-#line 12935 "configure"
    10305 +#line 13313 "configure"
     10505+#line 13341 "configure"
    1030610506 #include "confdefs.h"
    1030710507 
    1030810508 #include <sys/types.h>
    10309 @@ -12946,16 +13324,16 @@
     10509@@ -12946,16 +13352,16 @@
    1031010510 }
    1031110511 _ACEOF
    1031210512 rm -f conftest.$ac_objext
    1031310513-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
    10314 +if { (eval echo "$as_me:13327: \"$ac_compile\"") >&5
     10514+if { (eval echo "$as_me:13355: \"$ac_compile\"") >&5
    1031510515   (eval $ac_compile) 2>&5
    1031610516   ac_status=$?
    1031710517-  echo "$as_me:12952: \$? = $ac_status" >&5
    10318 +  echo "$as_me:13330: \$? = $ac_status" >&5
     10518+  echo "$as_me:13358: \$? = $ac_status" >&5
    1031910519   (exit $ac_status); } &&
    1032010520          { ac_try='test -s conftest.$ac_objext'
    1032110521-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
    10322 +  { (eval echo "$as_me:13333: \"$ac_try\"") >&5
     10522+  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
    1032310523   (eval $ac_try) 2>&5
    1032410524   ac_status=$?
    1032510525-  echo "$as_me:12958: \$? = $ac_status" >&5
    10326 +  echo "$as_me:13336: \$? = $ac_status" >&5
     10526+  echo "$as_me:13364: \$? = $ac_status" >&5
    1032710527   (exit $ac_status); }; }; then
    1032810528   sigact_bad=no
    1032910529 else
    10330 @@ -12963,7 +13341,7 @@
     10530@@ -12963,7 +13369,7 @@
    1033110531 cat conftest.$ac_ext >&5
    1033210532 
    1033310533 cat >conftest.$ac_ext <<_ACEOF
    1033410534-#line 12966 "configure"
    10335 +#line 13344 "configure"
     10535+#line 13372 "configure"
    1033610536 #include "confdefs.h"
    1033710537 
    1033810538 #define _POSIX_SOURCE
    10339 @@ -12978,16 +13356,16 @@
     10539@@ -12978,16 +13384,16 @@
    1034010540 }
    1034110541 _ACEOF
    1034210542 rm -f conftest.$ac_objext
    1034310543-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
    10344 +if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
     10544+if { (eval echo "$as_me:13387: \"$ac_compile\"") >&5
    1034510545   (eval $ac_compile) 2>&5
    1034610546   ac_status=$?
    1034710547-  echo "$as_me:12984: \$? = $ac_status" >&5
    10348 +  echo "$as_me:13362: \$? = $ac_status" >&5
     10548+  echo "$as_me:13390: \$? = $ac_status" >&5
    1034910549   (exit $ac_status); } &&
    1035010550          { ac_try='test -s conftest.$ac_objext'
    1035110551-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
    10352 +  { (eval echo "$as_me:13365: \"$ac_try\"") >&5
     10552+  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
    1035310553   (eval $ac_try) 2>&5
    1035410554   ac_status=$?
    1035510555-  echo "$as_me:12990: \$? = $ac_status" >&5
    10356 +  echo "$as_me:13368: \$? = $ac_status" >&5
     10556+  echo "$as_me:13396: \$? = $ac_status" >&5
    1035710557   (exit $ac_status); }; }; then
    1035810558   sigact_bad=yes
    1035910559         cat >>confdefs.h <<\EOF
    10360 @@ -13002,11 +13380,11 @@
     10560@@ -13002,11 +13408,11 @@
    1036110561 rm -f conftest.$ac_objext conftest.$ac_ext
    1036210562 fi
    1036310563 rm -f conftest.$ac_objext conftest.$ac_ext
    1036410564-echo "$as_me:13005: result: $sigact_bad" >&5
    10365 +echo "$as_me:13383: result: $sigact_bad" >&5
     10565+echo "$as_me:13411: result: $sigact_bad" >&5
    1036610566 echo "${ECHO_T}$sigact_bad" >&6
    1036710567 fi
    1036810568 
    1036910569-echo "$as_me:13009: checking if nanosleep really works" >&5
    10370 +echo "$as_me:13387: checking if nanosleep really works" >&5
     10570+echo "$as_me:13415: checking if nanosleep really works" >&5
    1037110571 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
    1037210572 if test "${cf_cv_func_nanosleep+set}" = set; then
    1037310573   echo $ECHO_N "(cached) $ECHO_C" >&6
    10374 @@ -13016,7 +13394,7 @@
     10574@@ -13016,7 +13422,7 @@
    1037510575   cf_cv_func_nanosleep=unknown
    1037610576 else
    1037710577   cat >conftest.$ac_ext <<_ACEOF
    1037810578-#line 13019 "configure"
    10379 +#line 13397 "configure"
     10579+#line 13425 "configure"
    1038010580 #include "confdefs.h"
    1038110581 
    1038210582 #include <stdio.h>
    10383 @@ -13041,15 +13419,15 @@
     10583@@ -13041,15 +13447,15 @@
    1038410584 
    1038510585 _ACEOF
    1038610586 rm -f conftest$ac_exeext
    1038710587-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
    10388 +if { (eval echo "$as_me:13422: \"$ac_link\"") >&5
     10588+if { (eval echo "$as_me:13450: \"$ac_link\"") >&5
    1038910589   (eval $ac_link) 2>&5
    1039010590   ac_status=$?
    1039110591-  echo "$as_me:13047: \$? = $ac_status" >&5
    10392 +  echo "$as_me:13425: \$? = $ac_status" >&5
     10592+  echo "$as_me:13453: \$? = $ac_status" >&5
    1039310593   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1039410594-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
    10395 +  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
     10595+  { (eval echo "$as_me:13455: \"$ac_try\"") >&5
    1039610596   (eval $ac_try) 2>&5
    1039710597   ac_status=$?
    1039810598-  echo "$as_me:13052: \$? = $ac_status" >&5
    10399 +  echo "$as_me:13430: \$? = $ac_status" >&5
     10599+  echo "$as_me:13458: \$? = $ac_status" >&5
    1040010600   (exit $ac_status); }; }; then
    1040110601   cf_cv_func_nanosleep=yes
    1040210602 else
    10403 @@ -13061,7 +13439,7 @@
     10603@@ -13061,7 +13467,7 @@
    1040410604 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1040510605 fi
    1040610606 fi
    1040710607-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
    10408 +echo "$as_me:13442: result: $cf_cv_func_nanosleep" >&5
     10608+echo "$as_me:13470: result: $cf_cv_func_nanosleep" >&5
    1040910609 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
    1041010610 
    1041110611 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
    10412 @@ -13075,23 +13453,23 @@
     10612@@ -13075,23 +13481,23 @@
    1041310613 
    1041410614 do
    1041510615 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1041610616-echo "$as_me:13078: checking for $ac_header" >&5
    10417 +echo "$as_me:13456: checking for $ac_header" >&5
     10617+echo "$as_me:13484: checking for $ac_header" >&5
    1041810618 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1041910619 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1042210622   cat >conftest.$ac_ext <<_ACEOF
    1042310623-#line 13084 "configure"
    10424 +#line 13462 "configure"
     10624+#line 13490 "configure"
    1042510625 #include "confdefs.h"
    1042610626 #include <$ac_header>
    1042710627 _ACEOF
    1042810628-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
    10429 +if { (eval echo "$as_me:13466: \"$ac_cpp conftest.$ac_ext\"") >&5
     10629+if { (eval echo "$as_me:13494: \"$ac_cpp conftest.$ac_ext\"") >&5
    1043010630   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1043110631   ac_status=$?
    … …  
    1043410634   cat conftest.err >&5
    1043510635-  echo "$as_me:13094: \$? = $ac_status" >&5
    10436 +  echo "$as_me:13472: \$? = $ac_status" >&5
     10636+  echo "$as_me:13500: \$? = $ac_status" >&5
    1043710637   (exit $ac_status); } >/dev/null; then
    1043810638   if test -s conftest.err; then
    1043910639     ac_cpp_err=$ac_c_preproc_warn_flag
    10440 @@ -13110,7 +13488,7 @@
     10640@@ -13110,7 +13516,7 @@
    1044110641 fi
    1044210642 rm -f conftest.err conftest.$ac_ext
    1044310643 fi
    1044410644-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10445 +echo "$as_me:13491: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10645+echo "$as_me:13519: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1044610646 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1044710647 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1044810648   cat >>confdefs.h <<EOF
    10449 @@ -13125,23 +13503,23 @@
     10649@@ -13125,23 +13531,23 @@
    1045010650 for ac_header in sys/termio.h
    1045110651 do
    1045210652 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1045310653-echo "$as_me:13128: checking for $ac_header" >&5
    10454 +echo "$as_me:13506: checking for $ac_header" >&5
     10654+echo "$as_me:13534: checking for $ac_header" >&5
    1045510655 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1045610656 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1045910659   cat >conftest.$ac_ext <<_ACEOF
    1046010660-#line 13134 "configure"
    10461 +#line 13512 "configure"
     10661+#line 13540 "configure"
    1046210662 #include "confdefs.h"
    1046310663 #include <$ac_header>
    1046410664 _ACEOF
    1046510665-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
    10466 +if { (eval echo "$as_me:13516: \"$ac_cpp conftest.$ac_ext\"") >&5
     10666+if { (eval echo "$as_me:13544: \"$ac_cpp conftest.$ac_ext\"") >&5
    1046710667   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1046810668   ac_status=$?
    … …  
    1047110671   cat conftest.err >&5
    1047210672-  echo "$as_me:13144: \$? = $ac_status" >&5
    10473 +  echo "$as_me:13522: \$? = $ac_status" >&5
     10673+  echo "$as_me:13550: \$? = $ac_status" >&5
    1047410674   (exit $ac_status); } >/dev/null; then
    1047510675   if test -s conftest.err; then
    1047610676     ac_cpp_err=$ac_c_preproc_warn_flag
    10477 @@ -13160,7 +13538,7 @@
     10677@@ -13160,7 +13566,7 @@
    1047810678 fi
    1047910679 rm -f conftest.err conftest.$ac_ext
    1048010680 fi
    1048110681-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10482 +echo "$as_me:13541: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10682+echo "$as_me:13569: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1048310683 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1048410684 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1048510685   cat >>confdefs.h <<EOF
    10486 @@ -13178,10 +13556,10 @@
     10686@@ -13178,10 +13584,10 @@
    1048710687        *)      termios_bad=maybe ;;
    1048810688        esac
    1048910689        if test "$termios_bad" = maybe ; then
    1049010690-       echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
    10491 +       echo "$as_me:13559: checking whether termios.h needs _POSIX_SOURCE" >&5
     10691+       echo "$as_me:13587: checking whether termios.h needs _POSIX_SOURCE" >&5
    1049210692 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
    1049310693        cat >conftest.$ac_ext <<_ACEOF
    1049410694-#line 13184 "configure"
    10495 +#line 13562 "configure"
     10695+#line 13590 "configure"
    1049610696 #include "confdefs.h"
    1049710697 #include <termios.h>
    1049810698 int
    10499 @@ -13193,16 +13571,16 @@
     10699@@ -13193,16 +13599,16 @@
    1050010700 }
    1050110701 _ACEOF
    1050210702 rm -f conftest.$ac_objext
    1050310703-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
    10504 +if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
     10704+if { (eval echo "$as_me:13602: \"$ac_compile\"") >&5
    1050510705   (eval $ac_compile) 2>&5
    1050610706   ac_status=$?
    1050710707-  echo "$as_me:13199: \$? = $ac_status" >&5
    10508 +  echo "$as_me:13577: \$? = $ac_status" >&5
     10708+  echo "$as_me:13605: \$? = $ac_status" >&5
    1050910709   (exit $ac_status); } &&
    1051010710          { ac_try='test -s conftest.$ac_objext'
    1051110711-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
    10512 +  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
     10712+  { (eval echo "$as_me:13608: \"$ac_try\"") >&5
    1051310713   (eval $ac_try) 2>&5
    1051410714   ac_status=$?
    1051510715-  echo "$as_me:13205: \$? = $ac_status" >&5
    10516 +  echo "$as_me:13583: \$? = $ac_status" >&5
     10716+  echo "$as_me:13611: \$? = $ac_status" >&5
    1051710717   (exit $ac_status); }; }; then
    1051810718   termios_bad=no
    1051910719 else
    10520 @@ -13210,7 +13588,7 @@
     10720@@ -13210,7 +13616,7 @@
    1052110721 cat conftest.$ac_ext >&5
    1052210722 
    1052310723                cat >conftest.$ac_ext <<_ACEOF
    1052410724-#line 13213 "configure"
    10525 +#line 13591 "configure"
     10725+#line 13619 "configure"
    1052610726 #include "confdefs.h"
    1052710727 
    1052810728 #define _POSIX_SOURCE
    10529 @@ -13224,16 +13602,16 @@
     10729@@ -13224,16 +13630,16 @@
    1053010730 }
    1053110731 _ACEOF
    1053210732 rm -f conftest.$ac_objext
    1053310733-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
    10534 +if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5
     10734+if { (eval echo "$as_me:13633: \"$ac_compile\"") >&5
    1053510735   (eval $ac_compile) 2>&5
    1053610736   ac_status=$?
    1053710737-  echo "$as_me:13230: \$? = $ac_status" >&5
    10538 +  echo "$as_me:13608: \$? = $ac_status" >&5
     10738+  echo "$as_me:13636: \$? = $ac_status" >&5
    1053910739   (exit $ac_status); } &&
    1054010740          { ac_try='test -s conftest.$ac_objext'
    1054110741-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
    10542 +  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
     10742+  { (eval echo "$as_me:13639: \"$ac_try\"") >&5
    1054310743   (eval $ac_try) 2>&5
    1054410744   ac_status=$?
    1054510745-  echo "$as_me:13236: \$? = $ac_status" >&5
    10546 +  echo "$as_me:13614: \$? = $ac_status" >&5
     10746+  echo "$as_me:13642: \$? = $ac_status" >&5
    1054710747   (exit $ac_status); }; }; then
    1054810748   termios_bad=unknown
    1054910749 else
    10550 @@ -13248,19 +13626,19 @@
     10750@@ -13248,19 +13654,19 @@
    1055110751 
    1055210752 fi
    1055310753 rm -f conftest.$ac_objext conftest.$ac_ext
    1055410754-       echo "$as_me:13251: result: $termios_bad" >&5
    10555 +       echo "$as_me:13629: result: $termios_bad" >&5
     10755+       echo "$as_me:13657: result: $termios_bad" >&5
    1055610756 echo "${ECHO_T}$termios_bad" >&6
    1055710757        fi
    … …  
    1055910759 
    1056010760-echo "$as_me:13256: checking for tcgetattr" >&5
    10561 +echo "$as_me:13634: checking for tcgetattr" >&5
     10761+echo "$as_me:13662: checking for tcgetattr" >&5
    1056210762 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
    1056310763 if test "${cf_cv_have_tcgetattr+set}" = set; then
    … …  
    1056710767 cat >conftest.$ac_ext <<_ACEOF
    1056810768-#line 13263 "configure"
    10569 +#line 13641 "configure"
     10769+#line 13669 "configure"
    1057010770 #include "confdefs.h"
    1057110771 
    1057210772 #include <sys/types.h>
    10573 @@ -13288,16 +13666,16 @@
     10773@@ -13288,16 +13694,16 @@
    1057410774 }
    1057510775 _ACEOF
    1057610776 rm -f conftest.$ac_objext conftest$ac_exeext
    1057710777-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
    10578 +if { (eval echo "$as_me:13669: \"$ac_link\"") >&5
     10778+if { (eval echo "$as_me:13697: \"$ac_link\"") >&5
    1057910779   (eval $ac_link) 2>&5
    1058010780   ac_status=$?
    1058110781-  echo "$as_me:13294: \$? = $ac_status" >&5
    10582 +  echo "$as_me:13672: \$? = $ac_status" >&5
     10782+  echo "$as_me:13700: \$? = $ac_status" >&5
    1058310783   (exit $ac_status); } &&
    1058410784          { ac_try='test -s conftest$ac_exeext'
    1058510785-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
    10586 +  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
     10786+  { (eval echo "$as_me:13703: \"$ac_try\"") >&5
    1058710787   (eval $ac_try) 2>&5
    1058810788   ac_status=$?
    1058910789-  echo "$as_me:13300: \$? = $ac_status" >&5
    10590 +  echo "$as_me:13678: \$? = $ac_status" >&5
     10790+  echo "$as_me:13706: \$? = $ac_status" >&5
    1059110791   (exit $ac_status); }; }; then
    1059210792   cf_cv_have_tcgetattr=yes
    1059310793 else
    10594 @@ -13307,20 +13685,20 @@
     10794@@ -13307,20 +13713,20 @@
    1059510795 fi
    1059610796 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1059710797 fi
    1059810798-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
    10599 +echo "$as_me:13688: result: $cf_cv_have_tcgetattr" >&5
     10799+echo "$as_me:13716: result: $cf_cv_have_tcgetattr" >&5
    1060010800 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
    1060110801 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
    … …  
    1060410804 
    1060510805-echo "$as_me:13316: checking for vsscanf function or workaround" >&5
    10606 +echo "$as_me:13694: checking for vsscanf function or workaround" >&5
     10806+echo "$as_me:13722: checking for vsscanf function or workaround" >&5
    1060710807 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
    1060810808 if test "${cf_cv_func_vsscanf+set}" = set; then
    … …  
    1061210812 cat >conftest.$ac_ext <<_ACEOF
    1061310813-#line 13323 "configure"
    10614 +#line 13701 "configure"
     10814+#line 13729 "configure"
    1061510815 #include "confdefs.h"
    1061610816 
    1061710817 #include <stdarg.h>
    10618 @@ -13336,16 +13714,16 @@
     10818@@ -13336,16 +13742,16 @@
    1061910819 }
    1062010820 _ACEOF
    1062110821 rm -f conftest.$ac_objext conftest$ac_exeext
    1062210822-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
    10623 +if { (eval echo "$as_me:13717: \"$ac_link\"") >&5
     10823+if { (eval echo "$as_me:13745: \"$ac_link\"") >&5
    1062410824   (eval $ac_link) 2>&5
    1062510825   ac_status=$?
    1062610826-  echo "$as_me:13342: \$? = $ac_status" >&5
    10627 +  echo "$as_me:13720: \$? = $ac_status" >&5
     10827+  echo "$as_me:13748: \$? = $ac_status" >&5
    1062810828   (exit $ac_status); } &&
    1062910829          { ac_try='test -s conftest$ac_exeext'
    1063010830-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
    10631 +  { (eval echo "$as_me:13723: \"$ac_try\"") >&5
     10831+  { (eval echo "$as_me:13751: \"$ac_try\"") >&5
    1063210832   (eval $ac_try) 2>&5
    1063310833   ac_status=$?
    1063410834-  echo "$as_me:13348: \$? = $ac_status" >&5
    10635 +  echo "$as_me:13726: \$? = $ac_status" >&5
     10835+  echo "$as_me:13754: \$? = $ac_status" >&5
    1063610836   (exit $ac_status); }; }; then
    1063710837   cf_cv_func_vsscanf=vsscanf
    1063810838 else
    10639 @@ -13353,7 +13731,7 @@
     10839@@ -13353,7 +13759,7 @@
    1064010840 cat conftest.$ac_ext >&5
    1064110841 
    1064210842 cat >conftest.$ac_ext <<_ACEOF
    1064310843-#line 13356 "configure"
    10644 +#line 13734 "configure"
     10844+#line 13762 "configure"
    1064510845 #include "confdefs.h"
    1064610846 
    1064710847 #include <stdarg.h>
    10648 @@ -13375,16 +13753,16 @@
     10848@@ -13375,16 +13781,16 @@
    1064910849 }
    1065010850 _ACEOF
    1065110851 rm -f conftest.$ac_objext conftest$ac_exeext
    1065210852-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
    10653 +if { (eval echo "$as_me:13756: \"$ac_link\"") >&5
     10853+if { (eval echo "$as_me:13784: \"$ac_link\"") >&5
    1065410854   (eval $ac_link) 2>&5
    1065510855   ac_status=$?
    1065610856-  echo "$as_me:13381: \$? = $ac_status" >&5
    10657 +  echo "$as_me:13759: \$? = $ac_status" >&5
     10857+  echo "$as_me:13787: \$? = $ac_status" >&5
    1065810858   (exit $ac_status); } &&
    1065910859          { ac_try='test -s conftest$ac_exeext'
    1066010860-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
    10661 +  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
     10861+  { (eval echo "$as_me:13790: \"$ac_try\"") >&5
    1066210862   (eval $ac_try) 2>&5
    1066310863   ac_status=$?
    1066410864-  echo "$as_me:13387: \$? = $ac_status" >&5
    10665 +  echo "$as_me:13765: \$? = $ac_status" >&5
     10865+  echo "$as_me:13793: \$? = $ac_status" >&5
    1066610866   (exit $ac_status); }; }; then
    1066710867   cf_cv_func_vsscanf=vfscanf
    1066810868 else
    10669 @@ -13392,7 +13770,7 @@
     10869@@ -13392,7 +13798,7 @@
    1067010870 cat conftest.$ac_ext >&5
    1067110871 
    1067210872 cat >conftest.$ac_ext <<_ACEOF
    1067310873-#line 13395 "configure"
    10674 +#line 13773 "configure"
     10874+#line 13801 "configure"
    1067510875 #include "confdefs.h"
    1067610876 
    1067710877 #include <stdarg.h>
    10678 @@ -13414,16 +13792,16 @@
     10878@@ -13414,16 +13820,16 @@
    1067910879 }
    1068010880 _ACEOF
    1068110881 rm -f conftest.$ac_objext conftest$ac_exeext
    1068210882-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
    10683 +if { (eval echo "$as_me:13795: \"$ac_link\"") >&5
     10883+if { (eval echo "$as_me:13823: \"$ac_link\"") >&5
    1068410884   (eval $ac_link) 2>&5
    1068510885   ac_status=$?
    1068610886-  echo "$as_me:13420: \$? = $ac_status" >&5
    10687 +  echo "$as_me:13798: \$? = $ac_status" >&5
     10887+  echo "$as_me:13826: \$? = $ac_status" >&5
    1068810888   (exit $ac_status); } &&
    1068910889          { ac_try='test -s conftest$ac_exeext'
    1069010890-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
    10691 +  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
     10891+  { (eval echo "$as_me:13829: \"$ac_try\"") >&5
    1069210892   (eval $ac_try) 2>&5
    1069310893   ac_status=$?
    1069410894-  echo "$as_me:13426: \$? = $ac_status" >&5
    10695 +  echo "$as_me:13804: \$? = $ac_status" >&5
     10895+  echo "$as_me:13832: \$? = $ac_status" >&5
    1069610896   (exit $ac_status); }; }; then
    1069710897   cf_cv_func_vsscanf=_doscan
    1069810898 else
    10699 @@ -13438,7 +13816,7 @@
     10899@@ -13438,7 +13844,7 @@
    1070010900 fi
    1070110901 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1070210902 fi
    1070310903-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
    10704 +echo "$as_me:13819: result: $cf_cv_func_vsscanf" >&5
     10904+echo "$as_me:13847: result: $cf_cv_func_vsscanf" >&5
    1070510905 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
    1070610906 
    1070710907 case $cf_cv_func_vsscanf in #(vi
    10708 @@ -13456,7 +13834,7 @@
     10908@@ -13456,7 +13862,7 @@
    1070910909 ;;
    1071010910 esac
    1071110911 
    1071210912-echo "$as_me:13459: checking for working mkstemp" >&5
    10713 +echo "$as_me:13837: checking for working mkstemp" >&5
     10913+echo "$as_me:13865: checking for working mkstemp" >&5
    1071410914 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
    1071510915 if test "${cf_cv_func_mkstemp+set}" = set; then
    1071610916   echo $ECHO_N "(cached) $ECHO_C" >&6
    10717 @@ -13464,13 +13842,13 @@
     10917@@ -13464,13 +13870,13 @@
    1071810918 
    1071910919 rm -f conftest*
    1072010920 if test "$cross_compiling" = yes; then
    1072110921-  echo "$as_me:13467: checking for mkstemp" >&5
    10722 +  echo "$as_me:13845: checking for mkstemp" >&5
     10922+  echo "$as_me:13873: checking for mkstemp" >&5
    1072310923 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
    1072410924 if test "${ac_cv_func_mkstemp+set}" = set; then
    … …  
    1072710927   cat >conftest.$ac_ext <<_ACEOF
    1072810928-#line 13473 "configure"
    10729 +#line 13851 "configure"
     10929+#line 13879 "configure"
    1073010930 #include "confdefs.h"
    1073110931 /* System header to define __stub macros and hopefully few prototypes,
    1073210932     which can conflict with char mkstemp (); below.  */
    10733 @@ -13501,16 +13879,16 @@
     10933@@ -13501,16 +13907,16 @@
    1073410934 }
    1073510935 _ACEOF
    1073610936 rm -f conftest.$ac_objext conftest$ac_exeext
    1073710937-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
    10738 +if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
     10938+if { (eval echo "$as_me:13910: \"$ac_link\"") >&5
    1073910939   (eval $ac_link) 2>&5
    1074010940   ac_status=$?
    1074110941-  echo "$as_me:13507: \$? = $ac_status" >&5
    10742 +  echo "$as_me:13885: \$? = $ac_status" >&5
     10942+  echo "$as_me:13913: \$? = $ac_status" >&5
    1074310943   (exit $ac_status); } &&
    1074410944          { ac_try='test -s conftest$ac_exeext'
    1074510945-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
    10746 +  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
     10946+  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
    1074710947   (eval $ac_try) 2>&5
    1074810948   ac_status=$?
    1074910949-  echo "$as_me:13513: \$? = $ac_status" >&5
    10750 +  echo "$as_me:13891: \$? = $ac_status" >&5
     10950+  echo "$as_me:13919: \$? = $ac_status" >&5
    1075110951   (exit $ac_status); }; }; then
    1075210952   ac_cv_func_mkstemp=yes
    1075310953 else
    10754 @@ -13520,12 +13898,12 @@
     10954@@ -13520,12 +13926,12 @@
    1075510955 fi
    1075610956 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1075710957 fi
    1075810958-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
    10759 +echo "$as_me:13901: result: $ac_cv_func_mkstemp" >&5
     10959+echo "$as_me:13929: result: $ac_cv_func_mkstemp" >&5
    1076010960 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
    1076110961 
    … …  
    1076310963   cat >conftest.$ac_ext <<_ACEOF
    1076410964-#line 13528 "configure"
    10765 +#line 13906 "configure"
     10965+#line 13934 "configure"
    1076610966 #include "confdefs.h"
    1076710967 
    1076810968 #include <sys/types.h>
    10769 @@ -13563,15 +13941,15 @@
     10969@@ -13563,15 +13969,15 @@
    1077010970 
    1077110971 _ACEOF
    1077210972 rm -f conftest$ac_exeext
    1077310973-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
    10774 +if { (eval echo "$as_me:13944: \"$ac_link\"") >&5
     10974+if { (eval echo "$as_me:13972: \"$ac_link\"") >&5
    1077510975   (eval $ac_link) 2>&5
    1077610976   ac_status=$?
    1077710977-  echo "$as_me:13569: \$? = $ac_status" >&5
    10778 +  echo "$as_me:13947: \$? = $ac_status" >&5
     10978+  echo "$as_me:13975: \$? = $ac_status" >&5
    1077910979   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1078010980-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
    10781 +  { (eval echo "$as_me:13949: \"$ac_try\"") >&5
     10981+  { (eval echo "$as_me:13977: \"$ac_try\"") >&5
    1078210982   (eval $ac_try) 2>&5
    1078310983   ac_status=$?
    1078410984-  echo "$as_me:13574: \$? = $ac_status" >&5
    10785 +  echo "$as_me:13952: \$? = $ac_status" >&5
     10985+  echo "$as_me:13980: \$? = $ac_status" >&5
    1078610986   (exit $ac_status); }; }; then
    1078710987   cf_cv_func_mkstemp=yes
    1078810988 
    10789 @@ -13586,7 +13964,7 @@
     10989@@ -13586,7 +13992,7 @@
    1079010990 fi
    1079110991 
    1079210992 fi
    1079310993-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
    10794 +echo "$as_me:13967: result: $cf_cv_func_mkstemp" >&5
     10994+echo "$as_me:13995: result: $cf_cv_func_mkstemp" >&5
    1079510995 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
    1079610996 if test "$cf_cv_func_mkstemp" = yes ; then
    1079710997        cat >>confdefs.h <<\EOF
    10798 @@ -13604,21 +13982,21 @@
     10998@@ -13604,21 +14010,21 @@
    1079910999 fi
    1080011000 
    1080111001 if test "$cross_compiling" = yes ; then
    1080211002-       { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    10803 +       { echo "$as_me:13985: WARNING: cross compiling: assume setvbuf params not reversed" >&5
     11003+       { echo "$as_me:14013: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    1080411004 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
    1080511005 else
    1080611006-       echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
    10807 +       echo "$as_me:13988: checking whether setvbuf arguments are reversed" >&5
     11007+       echo "$as_me:14016: checking whether setvbuf arguments are reversed" >&5
    1080811008 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
    1080911009 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
    … …  
    1081211012   if test "$cross_compiling" = yes; then
    1081311013-  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
    10814 +  { { echo "$as_me:13994: error: cannot run test program while cross compiling" >&5
     11014+  { { echo "$as_me:14022: error: cannot run test program while cross compiling" >&5
    1081511015 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    1081611016    { (exit 1); exit 1; }; }
    … …  
    1081811018   cat >conftest.$ac_ext <<_ACEOF
    1081911019-#line 13621 "configure"
    10820 +#line 13999 "configure"
     11020+#line 14027 "configure"
    1082111021 #include "confdefs.h"
    1082211022 #include <stdio.h>
    1082311023 /* If setvbuf has the reversed format, exit 0. */
    10824 @@ -13635,15 +14013,15 @@
     11024@@ -13635,15 +14041,15 @@
    1082511025 }
    1082611026 _ACEOF
    1082711027 rm -f conftest$ac_exeext
    1082811028-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
    10829 +if { (eval echo "$as_me:14016: \"$ac_link\"") >&5
     11029+if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
    1083011030   (eval $ac_link) 2>&5
    1083111031   ac_status=$?
    1083211032-  echo "$as_me:13641: \$? = $ac_status" >&5
    10833 +  echo "$as_me:14019: \$? = $ac_status" >&5
     11033+  echo "$as_me:14047: \$? = $ac_status" >&5
    1083411034   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1083511035-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
    10836 +  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
     11036+  { (eval echo "$as_me:14049: \"$ac_try\"") >&5
    1083711037   (eval $ac_try) 2>&5
    1083811038   ac_status=$?
    1083911039-  echo "$as_me:13646: \$? = $ac_status" >&5
    10840 +  echo "$as_me:14024: \$? = $ac_status" >&5
     11040+  echo "$as_me:14052: \$? = $ac_status" >&5
    1084111041   (exit $ac_status); }; }; then
    1084211042   ac_cv_func_setvbuf_reversed=yes
    1084311043 else
    10844 @@ -13656,7 +14034,7 @@
     11044@@ -13656,7 +14062,7 @@
    1084511045 fi
    1084611046 rm -f core core.* *.core
    1084711047 fi
    1084811048-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
    10849 +echo "$as_me:14037: result: $ac_cv_func_setvbuf_reversed" >&5
     11049+echo "$as_me:14065: result: $ac_cv_func_setvbuf_reversed" >&5
    1085011050 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
    1085111051 if test $ac_cv_func_setvbuf_reversed = yes; then
    1085211052 
    10853 @@ -13667,13 +14045,13 @@
     11053@@ -13667,13 +14073,13 @@
    1085411054 fi
    1085511055 
    1085611056 fi
    1085711057-echo "$as_me:13670: checking return type of signal handlers" >&5
    10858 +echo "$as_me:14048: checking return type of signal handlers" >&5
     11058+echo "$as_me:14076: checking return type of signal handlers" >&5
    1085911059 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
    1086011060 if test "${ac_cv_type_signal+set}" = set; then
    … …  
    1086311063   cat >conftest.$ac_ext <<_ACEOF
    1086411064-#line 13676 "configure"
    10865 +#line 14054 "configure"
     11065+#line 14082 "configure"
    1086611066 #include "confdefs.h"
    1086711067 #include <sys/types.h>
    1086811068 #include <signal.h>
    10869 @@ -13695,16 +14073,16 @@
     11069@@ -13695,16 +14101,16 @@
    1087011070 }
    1087111071 _ACEOF
    1087211072 rm -f conftest.$ac_objext
    1087311073-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
    10874 +if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5
     11074+if { (eval echo "$as_me:14104: \"$ac_compile\"") >&5
    1087511075   (eval $ac_compile) 2>&5
    1087611076   ac_status=$?
    1087711077-  echo "$as_me:13701: \$? = $ac_status" >&5
    10878 +  echo "$as_me:14079: \$? = $ac_status" >&5
     11078+  echo "$as_me:14107: \$? = $ac_status" >&5
    1087911079   (exit $ac_status); } &&
    1088011080          { ac_try='test -s conftest.$ac_objext'
    1088111081-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
    10882 +  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
     11082+  { (eval echo "$as_me:14110: \"$ac_try\"") >&5
    1088311083   (eval $ac_try) 2>&5
    1088411084   ac_status=$?
    1088511085-  echo "$as_me:13707: \$? = $ac_status" >&5
    10886 +  echo "$as_me:14085: \$? = $ac_status" >&5
     11086+  echo "$as_me:14113: \$? = $ac_status" >&5
    1088711087   (exit $ac_status); }; }; then
    1088811088   ac_cv_type_signal=void
    1088911089 else
    10890 @@ -13714,21 +14092,21 @@
     11090@@ -13714,21 +14120,21 @@
    1089111091 fi
    1089211092 rm -f conftest.$ac_objext conftest.$ac_ext
    1089311093 fi
    1089411094-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
    10895 +echo "$as_me:14095: result: $ac_cv_type_signal" >&5
     11095+echo "$as_me:14123: result: $ac_cv_type_signal" >&5
    1089611096 echo "${ECHO_T}$ac_cv_type_signal" >&6
    1089711097 
    … …  
    1090111101 
    1090211102-echo "$as_me:13724: checking for type sigaction_t" >&5
    10903 +echo "$as_me:14102: checking for type sigaction_t" >&5
     11103+echo "$as_me:14130: checking for type sigaction_t" >&5
    1090411104 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
    1090511105 if test "${cf_cv_type_sigaction+set}" = set; then
    … …  
    1090911109        cat >conftest.$ac_ext <<_ACEOF
    1091011110-#line 13731 "configure"
    10911 +#line 14109 "configure"
     11111+#line 14137 "configure"
    1091211112 #include "confdefs.h"
    1091311113 
    1091411114 #include <signal.h>
    10915 @@ -13741,16 +14119,16 @@
     11115@@ -13741,16 +14147,16 @@
    1091611116 }
    1091711117 _ACEOF
    1091811118 rm -f conftest.$ac_objext
    1091911119-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
    10920 +if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
     11120+if { (eval echo "$as_me:14150: \"$ac_compile\"") >&5
    1092111121   (eval $ac_compile) 2>&5
    1092211122   ac_status=$?
    1092311123-  echo "$as_me:13747: \$? = $ac_status" >&5
    10924 +  echo "$as_me:14125: \$? = $ac_status" >&5
     11124+  echo "$as_me:14153: \$? = $ac_status" >&5
    1092511125   (exit $ac_status); } &&
    1092611126          { ac_try='test -s conftest.$ac_objext'
    1092711127-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
    10928 +  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
     11128+  { (eval echo "$as_me:14156: \"$ac_try\"") >&5
    1092911129   (eval $ac_try) 2>&5
    1093011130   ac_status=$?
    1093111131-  echo "$as_me:13753: \$? = $ac_status" >&5
    10932 +  echo "$as_me:14131: \$? = $ac_status" >&5
     11132+  echo "$as_me:14159: \$? = $ac_status" >&5
    1093311133   (exit $ac_status); }; }; then
    1093411134   cf_cv_type_sigaction=yes
    1093511135 else
    10936 @@ -13761,13 +14139,13 @@
     11136@@ -13761,13 +14167,13 @@
    1093711137 rm -f conftest.$ac_objext conftest.$ac_ext
    1093811138 fi
    1093911139 
    1094011140-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
    10941 +echo "$as_me:14142: result: $cf_cv_type_sigaction" >&5
     11141+echo "$as_me:14170: result: $cf_cv_type_sigaction" >&5
    1094211142 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
    1094311143 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
    … …  
    1094611146 
    1094711147-echo "$as_me:13770: checking declaration of size-change" >&5
    10948 +echo "$as_me:14148: checking declaration of size-change" >&5
     11148+echo "$as_me:14176: checking declaration of size-change" >&5
    1094911149 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
    1095011150 if test "${cf_cv_sizechange+set}" = set; then
    1095111151   echo $ECHO_N "(cached) $ECHO_C" >&6
    10952 @@ -13782,7 +14160,7 @@
     11152@@ -13782,7 +14188,7 @@
    1095311153     CPPFLAGS="$cf_save_CPPFLAGS"
    1095411154     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
    1095511155     cat >conftest.$ac_ext <<_ACEOF
    1095611156-#line 13785 "configure"
    10957 +#line 14163 "configure"
     11157+#line 14191 "configure"
    1095811158 #include "confdefs.h"
    1095911159 #include <sys/types.h>
    1096011160 #ifdef HAVE_TERMIOS_H
    10961 @@ -13826,16 +14204,16 @@
     11161@@ -13826,16 +14232,16 @@
    1096211162 }
    1096311163 _ACEOF
    1096411164 rm -f conftest.$ac_objext
    1096511165-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
    10966 +if { (eval echo "$as_me:14207: \"$ac_compile\"") >&5
     11166+if { (eval echo "$as_me:14235: \"$ac_compile\"") >&5
    1096711167   (eval $ac_compile) 2>&5
    1096811168   ac_status=$?
    1096911169-  echo "$as_me:13832: \$? = $ac_status" >&5
    10970 +  echo "$as_me:14210: \$? = $ac_status" >&5
     11170+  echo "$as_me:14238: \$? = $ac_status" >&5
    1097111171   (exit $ac_status); } &&
    1097211172          { ac_try='test -s conftest.$ac_objext'
    1097311173-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
    10974 +  { (eval echo "$as_me:14213: \"$ac_try\"") >&5
     11174+  { (eval echo "$as_me:14241: \"$ac_try\"") >&5
    1097511175   (eval $ac_try) 2>&5
    1097611176   ac_status=$?
    1097711177-  echo "$as_me:13838: \$? = $ac_status" >&5
    10978 +  echo "$as_me:14216: \$? = $ac_status" >&5
     11178+  echo "$as_me:14244: \$? = $ac_status" >&5
    1097911179   (exit $ac_status); }; }; then
    1098011180   cf_cv_sizechange=yes
    1098111181 else
    10982 @@ -13854,7 +14232,7 @@
     11182@@ -13854,7 +14260,7 @@
    1098311183 done
    1098411184 
    1098511185 fi
    1098611186-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
    10987 +echo "$as_me:14235: result: $cf_cv_sizechange" >&5
     11187+echo "$as_me:14263: result: $cf_cv_sizechange" >&5
    1098811188 echo "${ECHO_T}$cf_cv_sizechange" >&6
    1098911189 if test "$cf_cv_sizechange" != no ; then
    1099011190        cat >>confdefs.h <<\EOF
    10991 @@ -13871,13 +14249,13 @@
     11191@@ -13871,13 +14277,13 @@
    1099211192        esac
    1099311193 fi
    1099411194 
    1099511195-echo "$as_me:13874: checking for memmove" >&5
    10996 +echo "$as_me:14252: checking for memmove" >&5
     11196+echo "$as_me:14280: checking for memmove" >&5
    1099711197 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
    1099811198 if test "${ac_cv_func_memmove+set}" = set; then
    … …  
    1100111201   cat >conftest.$ac_ext <<_ACEOF
    1100211202-#line 13880 "configure"
    11003 +#line 14258 "configure"
     11203+#line 14286 "configure"
    1100411204 #include "confdefs.h"
    1100511205 /* System header to define __stub macros and hopefully few prototypes,
    1100611206     which can conflict with char memmove (); below.  */
    11007 @@ -13908,16 +14286,16 @@
     11207@@ -13908,16 +14314,16 @@
    1100811208 }
    1100911209 _ACEOF
    1101011210 rm -f conftest.$ac_objext conftest$ac_exeext
    1101111211-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
    11012 +if { (eval echo "$as_me:14289: \"$ac_link\"") >&5
     11212+if { (eval echo "$as_me:14317: \"$ac_link\"") >&5
    1101311213   (eval $ac_link) 2>&5
    1101411214   ac_status=$?
    1101511215-  echo "$as_me:13914: \$? = $ac_status" >&5
    11016 +  echo "$as_me:14292: \$? = $ac_status" >&5
     11216+  echo "$as_me:14320: \$? = $ac_status" >&5
    1101711217   (exit $ac_status); } &&
    1101811218          { ac_try='test -s conftest$ac_exeext'
    1101911219-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
    11020 +  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
     11220+  { (eval echo "$as_me:14323: \"$ac_try\"") >&5
    1102111221   (eval $ac_try) 2>&5
    1102211222   ac_status=$?
    1102311223-  echo "$as_me:13920: \$? = $ac_status" >&5
    11024 +  echo "$as_me:14298: \$? = $ac_status" >&5
     11224+  echo "$as_me:14326: \$? = $ac_status" >&5
    1102511225   (exit $ac_status); }; }; then
    1102611226   ac_cv_func_memmove=yes
    1102711227 else
    11028 @@ -13927,19 +14305,19 @@
     11228@@ -13927,19 +14333,19 @@
    1102911229 fi
    1103011230 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1103111231 fi
    1103211232-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
    11033 +echo "$as_me:14308: result: $ac_cv_func_memmove" >&5
     11233+echo "$as_me:14336: result: $ac_cv_func_memmove" >&5
    1103411234 echo "${ECHO_T}$ac_cv_func_memmove" >&6
    1103511235 if test $ac_cv_func_memmove = yes; then
    … …  
    1103811238 
    1103911239-echo "$as_me:13936: checking for bcopy" >&5
    11040 +echo "$as_me:14314: checking for bcopy" >&5
     11240+echo "$as_me:14342: checking for bcopy" >&5
    1104111241 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
    1104211242 if test "${ac_cv_func_bcopy+set}" = set; then
    … …  
    1104511245   cat >conftest.$ac_ext <<_ACEOF
    1104611246-#line 13942 "configure"
    11047 +#line 14320 "configure"
     11247+#line 14348 "configure"
    1104811248 #include "confdefs.h"
    1104911249 /* System header to define __stub macros and hopefully few prototypes,
    1105011250     which can conflict with char bcopy (); below.  */
    11051 @@ -13970,16 +14348,16 @@
     11251@@ -13970,16 +14376,16 @@
    1105211252 }
    1105311253 _ACEOF
    1105411254 rm -f conftest.$ac_objext conftest$ac_exeext
    1105511255-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
    11056 +if { (eval echo "$as_me:14351: \"$ac_link\"") >&5
     11256+if { (eval echo "$as_me:14379: \"$ac_link\"") >&5
    1105711257   (eval $ac_link) 2>&5
    1105811258   ac_status=$?
    1105911259-  echo "$as_me:13976: \$? = $ac_status" >&5
    11060 +  echo "$as_me:14354: \$? = $ac_status" >&5
     11260+  echo "$as_me:14382: \$? = $ac_status" >&5
    1106111261   (exit $ac_status); } &&
    1106211262          { ac_try='test -s conftest$ac_exeext'
    1106311263-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
    11064 +  { (eval echo "$as_me:14357: \"$ac_try\"") >&5
     11264+  { (eval echo "$as_me:14385: \"$ac_try\"") >&5
    1106511265   (eval $ac_try) 2>&5
    1106611266   ac_status=$?
    1106711267-  echo "$as_me:13982: \$? = $ac_status" >&5
    11068 +  echo "$as_me:14360: \$? = $ac_status" >&5
     11268+  echo "$as_me:14388: \$? = $ac_status" >&5
    1106911269   (exit $ac_status); }; }; then
    1107011270   ac_cv_func_bcopy=yes
    1107111271 else
    11072 @@ -13989,11 +14367,11 @@
     11272@@ -13989,11 +14395,11 @@
    1107311273 fi
    1107411274 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1107511275 fi
    1107611276-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
    11077 +echo "$as_me:14370: result: $ac_cv_func_bcopy" >&5
     11277+echo "$as_me:14398: result: $ac_cv_func_bcopy" >&5
    1107811278 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
    1107911279 if test $ac_cv_func_bcopy = yes; then
    1108011280 
    1108111281-       echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
    11082 +       echo "$as_me:14374: checking if bcopy does overlapping moves" >&5
     11282+       echo "$as_me:14402: checking if bcopy does overlapping moves" >&5
    1108311283 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
    1108411284 if test "${cf_cv_good_bcopy+set}" = set; then
    1108511285   echo $ECHO_N "(cached) $ECHO_C" >&6
    11086 @@ -14003,7 +14381,7 @@
     11286@@ -14003,7 +14409,7 @@
    1108711287   cf_cv_good_bcopy=unknown
    1108811288 else
    1108911289   cat >conftest.$ac_ext <<_ACEOF
    1109011290-#line 14006 "configure"
    11091 +#line 14384 "configure"
     11291+#line 14412 "configure"
    1109211292 #include "confdefs.h"
    1109311293 
    1109411294 int main() {
    11095 @@ -14017,15 +14395,15 @@
     11295@@ -14017,15 +14423,15 @@
    1109611296 
    1109711297 _ACEOF
    1109811298 rm -f conftest$ac_exeext
    1109911299-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
    11100 +if { (eval echo "$as_me:14398: \"$ac_link\"") >&5
     11300+if { (eval echo "$as_me:14426: \"$ac_link\"") >&5
    1110111301   (eval $ac_link) 2>&5
    1110211302   ac_status=$?
    1110311303-  echo "$as_me:14023: \$? = $ac_status" >&5
    11104 +  echo "$as_me:14401: \$? = $ac_status" >&5
     11304+  echo "$as_me:14429: \$? = $ac_status" >&5
    1110511305   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1110611306-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
    11107 +  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
     11307+  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
    1110811308   (eval $ac_try) 2>&5
    1110911309   ac_status=$?
    1111011310-  echo "$as_me:14028: \$? = $ac_status" >&5
    11111 +  echo "$as_me:14406: \$? = $ac_status" >&5
     11311+  echo "$as_me:14434: \$? = $ac_status" >&5
    1111211312   (exit $ac_status); }; }; then
    1111311313   cf_cv_good_bcopy=yes
    1111411314 else
    11115 @@ -14038,7 +14416,7 @@
     11315@@ -14038,7 +14444,7 @@
    1111611316 fi
    1111711317 
    1111811318 fi
    1111911319-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
    11120 +echo "$as_me:14419: result: $cf_cv_good_bcopy" >&5
     11320+echo "$as_me:14447: result: $cf_cv_good_bcopy" >&5
    1112111321 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
    1112211322 
    1112311323 else
    11124 @@ -14059,7 +14437,7 @@
     11324@@ -14059,7 +14465,7 @@
    1112511325 
    1112611326 fi
    1112711327 
    1112811328-echo "$as_me:14062: checking if poll really works" >&5
    11129 +echo "$as_me:14440: checking if poll really works" >&5
     11329+echo "$as_me:14468: checking if poll really works" >&5
    1113011330 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
    1113111331 if test "${cf_cv_working_poll+set}" = set; then
    1113211332   echo $ECHO_N "(cached) $ECHO_C" >&6
    11133 @@ -14069,7 +14447,7 @@
     11333@@ -14069,7 +14475,7 @@
    1113411334   cf_cv_working_poll=unknown
    1113511335 else
    1113611336   cat >conftest.$ac_ext <<_ACEOF
    1113711337-#line 14072 "configure"
    11138 +#line 14450 "configure"
     11338+#line 14478 "configure"
    1113911339 #include "confdefs.h"
    1114011340 
    1114111341 #include <stdio.h>
    11142 @@ -14090,15 +14468,15 @@
     11342@@ -14090,15 +14496,15 @@
    1114311343 }
    1114411344 _ACEOF
    1114511345 rm -f conftest$ac_exeext
    1114611346-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
    11147 +if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
     11347+if { (eval echo "$as_me:14499: \"$ac_link\"") >&5
    1114811348   (eval $ac_link) 2>&5
    1114911349   ac_status=$?
    1115011350-  echo "$as_me:14096: \$? = $ac_status" >&5
    11151 +  echo "$as_me:14474: \$? = $ac_status" >&5
     11351+  echo "$as_me:14502: \$? = $ac_status" >&5
    1115211352   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1115311353-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
    11154 +  { (eval echo "$as_me:14476: \"$ac_try\"") >&5
     11354+  { (eval echo "$as_me:14504: \"$ac_try\"") >&5
    1115511355   (eval $ac_try) 2>&5
    1115611356   ac_status=$?
    1115711357-  echo "$as_me:14101: \$? = $ac_status" >&5
    11158 +  echo "$as_me:14479: \$? = $ac_status" >&5
     11358+  echo "$as_me:14507: \$? = $ac_status" >&5
    1115911359   (exit $ac_status); }; }; then
    1116011360   cf_cv_working_poll=yes
    1116111361 else
    11162 @@ -14110,7 +14488,7 @@
     11362@@ -14110,7 +14516,7 @@
    1116311363 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1116411364 fi
    1116511365 fi
    1116611366-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
    11167 +echo "$as_me:14491: result: $cf_cv_working_poll" >&5
     11367+echo "$as_me:14519: result: $cf_cv_working_poll" >&5
    1116811368 echo "${ECHO_T}$cf_cv_working_poll" >&6
    1116911369 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
    1117011370 #define HAVE_WORKING_POLL 1
    11171 @@ -14118,7 +14496,7 @@
     11371@@ -14118,7 +14524,7 @@
    1117211372 
    1117311373 # special check for test/ditto.c
    1117411374 
    1117511375-echo "$as_me:14121: checking for openpty in -lutil" >&5
    11176 +echo "$as_me:14499: checking for openpty in -lutil" >&5
     11376+echo "$as_me:14527: checking for openpty in -lutil" >&5
    1117711377 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
    1117811378 if test "${ac_cv_lib_util_openpty+set}" = set; then
    1117911379   echo $ECHO_N "(cached) $ECHO_C" >&6
    11180 @@ -14126,7 +14504,7 @@
     11380@@ -14126,7 +14532,7 @@
    1118111381   ac_check_lib_save_LIBS=$LIBS
    1118211382 LIBS="-lutil  $LIBS"
    1118311383 cat >conftest.$ac_ext <<_ACEOF
    1118411384-#line 14129 "configure"
    11185 +#line 14507 "configure"
     11385+#line 14535 "configure"
    1118611386 #include "confdefs.h"
    1118711387 
    1118811388 /* Override any gcc2 internal prototype to avoid an error.  */
    11189 @@ -14145,16 +14523,16 @@
     11389@@ -14145,16 +14551,16 @@
    1119011390 }
    1119111391 _ACEOF
    1119211392 rm -f conftest.$ac_objext conftest$ac_exeext
    1119311393-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
    11194 +if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
     11394+if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
    1119511395   (eval $ac_link) 2>&5
    1119611396   ac_status=$?
    1119711397-  echo "$as_me:14151: \$? = $ac_status" >&5
    11198 +  echo "$as_me:14529: \$? = $ac_status" >&5
     11398+  echo "$as_me:14557: \$? = $ac_status" >&5
    1119911399   (exit $ac_status); } &&
    1120011400          { ac_try='test -s conftest$ac_exeext'
    1120111401-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
    11202 +  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
     11402+  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
    1120311403   (eval $ac_try) 2>&5
    1120411404   ac_status=$?
    1120511405-  echo "$as_me:14157: \$? = $ac_status" >&5
    11206 +  echo "$as_me:14535: \$? = $ac_status" >&5
     11406+  echo "$as_me:14563: \$? = $ac_status" >&5
    1120711407   (exit $ac_status); }; }; then
    1120811408   ac_cv_lib_util_openpty=yes
    1120911409 else
    11210 @@ -14165,7 +14543,7 @@
     11410@@ -14165,7 +14571,7 @@
    1121111411 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1121211412 LIBS=$ac_check_lib_save_LIBS
    1121311413 fi
    1121411414-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
    11215 +echo "$as_me:14546: result: $ac_cv_lib_util_openpty" >&5
     11415+echo "$as_me:14574: result: $ac_cv_lib_util_openpty" >&5
    1121611416 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
    1121711417 if test $ac_cv_lib_util_openpty = yes; then
    1121811418   cf_cv_lib_util=yes
    11219 @@ -14173,7 +14551,7 @@
     11419@@ -14173,7 +14579,7 @@
    1122011420   cf_cv_lib_util=no
    1122111421 fi
    1122211422 
    1122311423-echo "$as_me:14176: checking for openpty header" >&5
    11224 +echo "$as_me:14554: checking for openpty header" >&5
     11424+echo "$as_me:14582: checking for openpty header" >&5
    1122511425 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
    1122611426 if test "${cf_cv_func_openpty+set}" = set; then
    1122711427   echo $ECHO_N "(cached) $ECHO_C" >&6
    11228 @@ -14184,7 +14562,7 @@
     11428@@ -14184,7 +14590,7 @@
    1122911429     for cf_header in pty.h libutil.h util.h
    1123011430     do
    1123111431     cat >conftest.$ac_ext <<_ACEOF
    1123211432-#line 14187 "configure"
    11233 +#line 14565 "configure"
     11433+#line 14593 "configure"
    1123411434 #include "confdefs.h"
    1123511435 
    1123611436 #include <$cf_header>
    11237 @@ -14201,16 +14579,16 @@
     11437@@ -14201,16 +14607,16 @@
    1123811438 }
    1123911439 _ACEOF
    1124011440 rm -f conftest.$ac_objext conftest$ac_exeext
    1124111441-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
    11242 +if { (eval echo "$as_me:14582: \"$ac_link\"") >&5
     11442+if { (eval echo "$as_me:14610: \"$ac_link\"") >&5
    1124311443   (eval $ac_link) 2>&5
    1124411444   ac_status=$?
    1124511445-  echo "$as_me:14207: \$? = $ac_status" >&5
    11246 +  echo "$as_me:14585: \$? = $ac_status" >&5
     11446+  echo "$as_me:14613: \$? = $ac_status" >&5
    1124711447   (exit $ac_status); } &&
    1124811448          { ac_try='test -s conftest$ac_exeext'
    1124911449-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
    11250 +  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
     11450+  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
    1125111451   (eval $ac_try) 2>&5
    1125211452   ac_status=$?
    1125311453-  echo "$as_me:14213: \$? = $ac_status" >&5
    11254 +  echo "$as_me:14591: \$? = $ac_status" >&5
     11454+  echo "$as_me:14619: \$? = $ac_status" >&5
    1125511455   (exit $ac_status); }; }; then
    1125611456 
    1125711457         cf_cv_func_openpty=$cf_header
    11258 @@ -14228,7 +14606,7 @@
     11458@@ -14228,7 +14634,7 @@
    1125911459     LIBS="$cf_save_LIBS"
    1126011460 
    1126111461 fi
    1126211462-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
    11263 +echo "$as_me:14609: result: $cf_cv_func_openpty" >&5
     11463+echo "$as_me:14637: result: $cf_cv_func_openpty" >&5
    1126411464 echo "${ECHO_T}$cf_cv_func_openpty" >&6
    1126511465 
    1126611466 if test "$cf_cv_func_openpty" != no ; then
    11267 @@ -14274,13 +14652,13 @@
     11467@@ -14274,13 +14680,13 @@
    1126811468                fi
    1126911469 
    … …  
    1127711477                          cat >conftest.$ac_ext <<_ACEOF
    1127811478-#line 14283 "configure"
    11279 +#line 14661 "configure"
     11479+#line 14689 "configure"
    1128011480 #include "confdefs.h"
    1128111481 #include <stdio.h>
    1128211482 int
    11283 @@ -14292,16 +14670,16 @@
     11483@@ -14292,16 +14698,16 @@
    1128411484 }
    1128511485 _ACEOF
    1128611486 rm -f conftest.$ac_objext
    1128711487-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
    11288 +if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5
     11488+if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
    1128911489   (eval $ac_compile) 2>&5
    1129011490   ac_status=$?
    1129111491-  echo "$as_me:14298: \$? = $ac_status" >&5
    11292 +  echo "$as_me:14676: \$? = $ac_status" >&5
     11492+  echo "$as_me:14704: \$? = $ac_status" >&5
    1129311493   (exit $ac_status); } &&
    1129411494          { ac_try='test -s conftest.$ac_objext'
    1129511495-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
    11296 +  { (eval echo "$as_me:14679: \"$ac_try\"") >&5
     11496+  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
    1129711497   (eval $ac_try) 2>&5
    1129811498   ac_status=$?
    1129911499-  echo "$as_me:14304: \$? = $ac_status" >&5
    11300 +  echo "$as_me:14682: \$? = $ac_status" >&5
     11500+  echo "$as_me:14710: \$? = $ac_status" >&5
    1130111501   (exit $ac_status); }; }; then
    1130211502   :
    1130311503 else
    11304 @@ -14318,13 +14696,13 @@
     11504@@ -14318,13 +14724,13 @@
    1130511505                if test "$cf_have_incdir" = no ; then
    1130611506                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    1130711507 
    1130811508-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
    11309 +echo "${as_me-configure}:14699: testing adding $cf_add_incdir to include-path ..." 1>&5
     11509+echo "${as_me-configure}:14727: testing adding $cf_add_incdir to include-path ..." 1>&5
    1131011510 
    1131111511-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
    … …  
    1132111521                  break
    1132211522                fi
    11323 @@ -14352,7 +14730,7 @@
     11523@@ -14352,7 +14758,7 @@
    1132411524       if test "$cf_have_libdir" = no ; then
    1132511525         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    1132611526 
    1132711527-echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
    11328 +echo "${as_me-configure}:14733: testing adding $cf_add_libdir to library-path ..." 1>&5
     11528+echo "${as_me-configure}:14761: testing adding $cf_add_libdir to library-path ..." 1>&5
    1132911529 
    1133011530         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    1133111531       fi
    11332 @@ -14363,23 +14741,23 @@
     11532@@ -14363,23 +14769,23 @@
    1133311533     fi
    1133411534 esac
    1133511535 
    1133611536-echo "$as_me:14366: checking for db.h" >&5
    11337 +echo "$as_me:14744: checking for db.h" >&5
     11537+echo "$as_me:14772: checking for db.h" >&5
    1133811538 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
    1133911539 if test "${ac_cv_header_db_h+set}" = set; then
    … …  
    1134211542   cat >conftest.$ac_ext <<_ACEOF
    1134311543-#line 14372 "configure"
    11344 +#line 14750 "configure"
     11544+#line 14778 "configure"
    1134511545 #include "confdefs.h"
    1134611546 #include <db.h>
    1134711547 _ACEOF
    1134811548-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
    11349 +if { (eval echo "$as_me:14754: \"$ac_cpp conftest.$ac_ext\"") >&5
     11549+if { (eval echo "$as_me:14782: \"$ac_cpp conftest.$ac_ext\"") >&5
    1135011550   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1135111551   ac_status=$?
    … …  
    1135411554   cat conftest.err >&5
    1135511555-  echo "$as_me:14382: \$? = $ac_status" >&5
    11356 +  echo "$as_me:14760: \$? = $ac_status" >&5
     11556+  echo "$as_me:14788: \$? = $ac_status" >&5
    1135711557   (exit $ac_status); } >/dev/null; then
    1135811558   if test -s conftest.err; then
    1135911559     ac_cpp_err=$ac_c_preproc_warn_flag
    11360 @@ -14398,11 +14776,11 @@
     11560@@ -14398,11 +14804,11 @@
    1136111561 fi
    1136211562 rm -f conftest.err conftest.$ac_ext
    1136311563 fi
    1136411564-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
    11365 +echo "$as_me:14779: result: $ac_cv_header_db_h" >&5
     11565+echo "$as_me:14807: result: $ac_cv_header_db_h" >&5
    1136611566 echo "${ECHO_T}$ac_cv_header_db_h" >&6
    1136711567 if test $ac_cv_header_db_h = yes; then
    1136811568 
    1136911569-echo "$as_me:14405: checking for version of db" >&5
    11370 +echo "$as_me:14783: checking for version of db" >&5
     11570+echo "$as_me:14811: checking for version of db" >&5
    1137111571 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
    1137211572 if test "${cf_cv_hashed_db_version+set}" = set; then
    1137311573   echo $ECHO_N "(cached) $ECHO_C" >&6
    11374 @@ -14413,10 +14791,10 @@
     11574@@ -14413,10 +14819,10 @@
    1137511575 for cf_db_version in 1 2 3 4 5
    1137611576 do
    1137711577 
    1137811578-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
    11379 +echo "${as_me-configure}:14794: testing checking for db version $cf_db_version ..." 1>&5
     11579+echo "${as_me-configure}:14822: testing checking for db version $cf_db_version ..." 1>&5
    1138011580 
    1138111581        cat >conftest.$ac_ext <<_ACEOF
    1138211582-#line 14419 "configure"
    11383 +#line 14797 "configure"
     11583+#line 14825 "configure"
    1138411584 #include "confdefs.h"
    1138511585 
    1138611586 $ac_includes_default
    11387 @@ -14446,16 +14824,16 @@
     11587@@ -14446,16 +14852,16 @@
    1138811588 }
    1138911589 _ACEOF
    1139011590 rm -f conftest.$ac_objext
    1139111591-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
    11392 +if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
     11592+if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5
    1139311593   (eval $ac_compile) 2>&5
    1139411594   ac_status=$?
    1139511595-  echo "$as_me:14452: \$? = $ac_status" >&5
    11396 +  echo "$as_me:14830: \$? = $ac_status" >&5
     11596+  echo "$as_me:14858: \$? = $ac_status" >&5
    1139711597   (exit $ac_status); } &&
    1139811598          { ac_try='test -s conftest.$ac_objext'
    1139911599-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
    11400 +  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
     11600+  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
    1140111601   (eval $ac_try) 2>&5
    1140211602   ac_status=$?
    1140311603-  echo "$as_me:14458: \$? = $ac_status" >&5
    11404 +  echo "$as_me:14836: \$? = $ac_status" >&5
     11604+  echo "$as_me:14864: \$? = $ac_status" >&5
    1140511605   (exit $ac_status); }; }; then
    1140611606 
    1140711607        cf_cv_hashed_db_version=$cf_db_version
    11408 @@ -14469,16 +14847,16 @@
     11608@@ -14469,16 +14875,16 @@
    1140911609 done
    1141011610 
    1141111611 fi
    1141211612-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
    11413 +echo "$as_me:14850: result: $cf_cv_hashed_db_version" >&5
     11613+echo "$as_me:14878: result: $cf_cv_hashed_db_version" >&5
    1141411614 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
    1141511615 
    1141611616 if test "$cf_cv_hashed_db_version" = unknown ; then
    1141711617-       { { echo "$as_me:14476: error: Cannot determine version of db" >&5
    11418 +       { { echo "$as_me:14854: error: Cannot determine version of db" >&5
     11618+       { { echo "$as_me:14882: error: Cannot determine version of db" >&5
    1141911619 echo "$as_me: error: Cannot determine version of db" >&2;}
    1142011620    { (exit 1); exit 1; }; }
    … …  
    1142211622 
    1142311623-echo "$as_me:14481: checking for db libraries" >&5
    11424 +echo "$as_me:14859: checking for db libraries" >&5
     11624+echo "$as_me:14887: checking for db libraries" >&5
    1142511625 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
    1142611626 if test "${cf_cv_hashed_db_libs+set}" = set; then
    1142711627   echo $ECHO_N "(cached) $ECHO_C" >&6
    11428 @@ -14492,10 +14870,10 @@
     11628@@ -14492,10 +14898,10 @@
    1142911629                LIBS="-l$cf_db_libs $LIBS"
    1143011630        fi
    1143111631 
    1143211632-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
    11433 +echo "${as_me-configure}:14873: testing checking for library "$cf_db_libs" ..." 1>&5
     11633+echo "${as_me-configure}:14901: testing checking for library "$cf_db_libs" ..." 1>&5
    1143411634 
    1143511635        cat >conftest.$ac_ext <<_ACEOF
    1143611636-#line 14498 "configure"
    11437 +#line 14876 "configure"
     11637+#line 14904 "configure"
    1143811638 #include "confdefs.h"
    1143911639 
    1144011640 $ac_includes_default
    11441 @@ -14550,16 +14928,16 @@
     11641@@ -14550,16 +14956,16 @@
    1144211642 }
    1144311643 _ACEOF
    1144411644 rm -f conftest.$ac_objext conftest$ac_exeext
    1144511645-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
    11446 +if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
     11646+if { (eval echo "$as_me:14959: \"$ac_link\"") >&5
    1144711647   (eval $ac_link) 2>&5
    1144811648   ac_status=$?
    1144911649-  echo "$as_me:14556: \$? = $ac_status" >&5
    11450 +  echo "$as_me:14934: \$? = $ac_status" >&5
     11650+  echo "$as_me:14962: \$? = $ac_status" >&5
    1145111651   (exit $ac_status); } &&
    1145211652          { ac_try='test -s conftest$ac_exeext'
    1145311653-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
    11454 +  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
     11654+  { (eval echo "$as_me:14965: \"$ac_try\"") >&5
    1145511655   (eval $ac_try) 2>&5
    1145611656   ac_status=$?
    1145711657-  echo "$as_me:14562: \$? = $ac_status" >&5
    11458 +  echo "$as_me:14940: \$? = $ac_status" >&5
     11658+  echo "$as_me:14968: \$? = $ac_status" >&5
    1145911659   (exit $ac_status); }; }; then
    1146011660 
    1146111661        if test -n "$cf_db_libs" ; then
    11462 @@ -14579,11 +14957,11 @@
     11662@@ -14579,11 +14985,11 @@
    1146311663 done
    1146411664 
    1146511665 fi
    1146611666-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
    11467 +echo "$as_me:14960: result: $cf_cv_hashed_db_libs" >&5
     11667+echo "$as_me:14988: result: $cf_cv_hashed_db_libs" >&5
    1146811668 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
    1146911669 
    1147011670        if test "$cf_cv_hashed_db_libs" = unknown ; then
    1147111671-               { { echo "$as_me:14586: error: Cannot determine library for db" >&5
    11472 +               { { echo "$as_me:14964: error: Cannot determine library for db" >&5
     11672+               { { echo "$as_me:14992: error: Cannot determine library for db" >&5
    1147311673 echo "$as_me: error: Cannot determine library for db" >&2;}
    1147411674    { (exit 1); exit 1; }; }
    1147511675        elif test "$cf_cv_hashed_db_libs" != default ; then
    11476 @@ -14593,7 +14971,7 @@
     11676@@ -14593,7 +14999,7 @@
    1147711677 
    1147811678 else
    1147911679 
    1148011680-       { { echo "$as_me:14596: error: Cannot find db.h" >&5
    11481 +       { { echo "$as_me:14974: error: Cannot find db.h" >&5
     11681+       { { echo "$as_me:15002: error: Cannot find db.h" >&5
    1148211682 echo "$as_me: error: Cannot find db.h" >&2;}
    1148311683    { (exit 1); exit 1; }; }
    1148411684 
    11485 @@ -14608,7 +14986,7 @@
     11685@@ -14608,7 +15014,7 @@
    1148611686 
    1148711687 # Just in case, check if the C compiler has a bool type.
    1148811688 
    1148911689-echo "$as_me:14611: checking if we should include stdbool.h" >&5
    11490 +echo "$as_me:14989: checking if we should include stdbool.h" >&5
     11690+echo "$as_me:15017: checking if we should include stdbool.h" >&5
    1149111691 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1149211692 
    1149311693 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11494 @@ -14616,7 +14994,7 @@
     11694@@ -14616,7 +15022,7 @@
    1149511695 else
    1149611696 
    1149711697        cat >conftest.$ac_ext <<_ACEOF
    1149811698-#line 14619 "configure"
    11499 +#line 14997 "configure"
     11699+#line 15025 "configure"
    1150011700 #include "confdefs.h"
    1150111701 
    1150211702 int
    11503 @@ -14628,23 +15006,23 @@
     11703@@ -14628,23 +15034,23 @@
    1150411704 }
    1150511705 _ACEOF
    1150611706 rm -f conftest.$ac_objext
    1150711707-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
    11508 +if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5
     11708+if { (eval echo "$as_me:15037: \"$ac_compile\"") >&5
    1150911709   (eval $ac_compile) 2>&5
    1151011710   ac_status=$?
    1151111711-  echo "$as_me:14634: \$? = $ac_status" >&5
    11512 +  echo "$as_me:15012: \$? = $ac_status" >&5
     11712+  echo "$as_me:15040: \$? = $ac_status" >&5
    1151311713   (exit $ac_status); } &&
    1151411714          { ac_try='test -s conftest.$ac_objext'
    1151511715-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
    11516 +  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
     11716+  { (eval echo "$as_me:15043: \"$ac_try\"") >&5
    1151711717   (eval $ac_try) 2>&5
    1151811718   ac_status=$?
    1151911719-  echo "$as_me:14640: \$? = $ac_status" >&5
    11520 +  echo "$as_me:15018: \$? = $ac_status" >&5
     11720+  echo "$as_me:15046: \$? = $ac_status" >&5
    1152111721   (exit $ac_status); }; }; then
    1152211722   cf_cv_header_stdbool_h=0
    … …  
    1152611726 cat >conftest.$ac_ext <<_ACEOF
    1152711727-#line 14647 "configure"
    11528 +#line 15025 "configure"
     11728+#line 15053 "configure"
    1152911729 #include "confdefs.h"
    1153011730 
    1153111731 #ifndef __BEOS__
    11532 @@ -14660,16 +15038,16 @@
     11732@@ -14660,16 +15066,16 @@
    1153311733 }
    1153411734 _ACEOF
    1153511735 rm -f conftest.$ac_objext
    1153611736-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
    11537 +if { (eval echo "$as_me:15041: \"$ac_compile\"") >&5
     11737+if { (eval echo "$as_me:15069: \"$ac_compile\"") >&5
    1153811738   (eval $ac_compile) 2>&5
    1153911739   ac_status=$?
    1154011740-  echo "$as_me:14666: \$? = $ac_status" >&5
    11541 +  echo "$as_me:15044: \$? = $ac_status" >&5
     11741+  echo "$as_me:15072: \$? = $ac_status" >&5
    1154211742   (exit $ac_status); } &&
    1154311743          { ac_try='test -s conftest.$ac_objext'
    1154411744-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
    11545 +  { (eval echo "$as_me:15047: \"$ac_try\"") >&5
     11745+  { (eval echo "$as_me:15075: \"$ac_try\"") >&5
    1154611746   (eval $ac_try) 2>&5
    1154711747   ac_status=$?
    1154811748-  echo "$as_me:14672: \$? = $ac_status" >&5
    11549 +  echo "$as_me:15050: \$? = $ac_status" >&5
     11749+  echo "$as_me:15078: \$? = $ac_status" >&5
    1155011750   (exit $ac_status); }; }; then
    1155111751   cf_cv_header_stdbool_h=1
    1155211752 else
    11553 @@ -14683,13 +15061,13 @@
     11753@@ -14683,13 +15089,13 @@
    1155411754 fi
    1155511755 
    1155611756 if test "$cf_cv_header_stdbool_h" = 1
    1155711757-then   echo "$as_me:14686: result: yes" >&5
    11558 +then   echo "$as_me:15064: result: yes" >&5
     11758+then   echo "$as_me:15092: result: yes" >&5
    1155911759 echo "${ECHO_T}yes" >&6
    1156011760-else   echo "$as_me:14688: result: no" >&5
    11561 +else   echo "$as_me:15066: result: no" >&5
     11761+else   echo "$as_me:15094: result: no" >&5
    1156211762 echo "${ECHO_T}no" >&6
    1156311763 fi
    1156411764 
    1156511765-echo "$as_me:14692: checking for builtin bool type" >&5
    11566 +echo "$as_me:15070: checking for builtin bool type" >&5
     11766+echo "$as_me:15098: checking for builtin bool type" >&5
    1156711767 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1156811768 
    1156911769 if test "${cf_cv_cc_bool_type+set}" = set; then
    11570 @@ -14697,7 +15075,7 @@
     11770@@ -14697,7 +15103,7 @@
    1157111771 else
    1157211772 
    1157311773        cat >conftest.$ac_ext <<_ACEOF
    1157411774-#line 14700 "configure"
    11575 +#line 15078 "configure"
     11775+#line 15106 "configure"
    1157611776 #include "confdefs.h"
    1157711777 
    1157811778 #include <stdio.h>
    11579 @@ -14712,16 +15090,16 @@
     11779@@ -14712,16 +15118,16 @@
    1158011780 }
    1158111781 _ACEOF
    1158211782 rm -f conftest.$ac_objext
    1158311783-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
    11584 +if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
     11784+if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
    1158511785   (eval $ac_compile) 2>&5
    1158611786   ac_status=$?
    1158711787-  echo "$as_me:14718: \$? = $ac_status" >&5
    11588 +  echo "$as_me:15096: \$? = $ac_status" >&5
     11788+  echo "$as_me:15124: \$? = $ac_status" >&5
    1158911789   (exit $ac_status); } &&
    1159011790          { ac_try='test -s conftest.$ac_objext'
    1159111791-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
    11592 +  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
     11792+  { (eval echo "$as_me:15127: \"$ac_try\"") >&5
    1159311793   (eval $ac_try) 2>&5
    1159411794   ac_status=$?
    1159511795-  echo "$as_me:14724: \$? = $ac_status" >&5
    11596 +  echo "$as_me:15102: \$? = $ac_status" >&5
     11796+  echo "$as_me:15130: \$? = $ac_status" >&5
    1159711797   (exit $ac_status); }; }; then
    1159811798   cf_cv_cc_bool_type=1
    1159911799 else
    11600 @@ -14734,9 +15112,9 @@
     11800@@ -14734,9 +15140,9 @@
    1160111801 fi
    1160211802 
    1160311803 if test "$cf_cv_cc_bool_type" = 1
    1160411804-then   echo "$as_me:14737: result: yes" >&5
    11605 +then   echo "$as_me:15115: result: yes" >&5
     11805+then   echo "$as_me:15143: result: yes" >&5
    1160611806 echo "${ECHO_T}yes" >&6
    1160711807-else   echo "$as_me:14739: result: no" >&5
    11608 +else   echo "$as_me:15117: result: no" >&5
     11808+else   echo "$as_me:15145: result: no" >&5
    1160911809 echo "${ECHO_T}no" >&6
    1161011810 fi
    1161111811 
    11612 @@ -14758,7 +15136,7 @@
     11812@@ -14758,7 +15164,7 @@
    1161311813        cf_stdcpp_libname=stdc++
    1161411814        ;;
    1161511815 esac
    1161611816-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
    11617 +echo "$as_me:15139: checking for library $cf_stdcpp_libname" >&5
     11817+echo "$as_me:15167: checking for library $cf_stdcpp_libname" >&5
    1161811818 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
    1161911819 if test "${cf_cv_libstdcpp+set}" = set; then
    1162011820   echo $ECHO_N "(cached) $ECHO_C" >&6
    11621 @@ -14767,7 +15145,7 @@
     11821@@ -14767,7 +15173,7 @@
    1162211822        cf_save="$LIBS"
    1162311823        LIBS="$LIBS -l$cf_stdcpp_libname"
    1162411824 cat >conftest.$ac_ext <<_ACEOF
    1162511825-#line 14770 "configure"
    11626 +#line 15148 "configure"
     11826+#line 15176 "configure"
    1162711827 #include "confdefs.h"
    1162811828 
    1162911829 #include <strstream.h>
    11630 @@ -14783,16 +15161,16 @@
     11830@@ -14783,16 +15189,16 @@
    1163111831 }
    1163211832 _ACEOF
    1163311833 rm -f conftest.$ac_objext conftest$ac_exeext
    1163411834-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
    11635 +if { (eval echo "$as_me:15164: \"$ac_link\"") >&5
     11835+if { (eval echo "$as_me:15192: \"$ac_link\"") >&5
    1163611836   (eval $ac_link) 2>&5
    1163711837   ac_status=$?
    1163811838-  echo "$as_me:14789: \$? = $ac_status" >&5
    11639 +  echo "$as_me:15167: \$? = $ac_status" >&5
     11839+  echo "$as_me:15195: \$? = $ac_status" >&5
    1164011840   (exit $ac_status); } &&
    1164111841          { ac_try='test -s conftest$ac_exeext'
    1164211842-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
    11643 +  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
     11843+  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
    1164411844   (eval $ac_try) 2>&5
    1164511845   ac_status=$?
    1164611846-  echo "$as_me:14795: \$? = $ac_status" >&5
    11647 +  echo "$as_me:15173: \$? = $ac_status" >&5
     11847+  echo "$as_me:15201: \$? = $ac_status" >&5
    1164811848   (exit $ac_status); }; }; then
    1164911849   cf_cv_libstdcpp=yes
    1165011850 else
    11651 @@ -14804,12 +15182,12 @@
     11851@@ -14804,12 +15210,12 @@
    1165211852        LIBS="$cf_save"
    1165311853 
    1165411854 fi
    1165511855-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
    11656 +echo "$as_me:15185: result: $cf_cv_libstdcpp" >&5
     11856+echo "$as_me:15213: result: $cf_cv_libstdcpp" >&5
    1165711857 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
    1165811858 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
    … …  
    1166011860 
    1166111861-       echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
    11662 +       echo "$as_me:15190: checking whether $CXX understands -c and -o together" >&5
     11862+       echo "$as_me:15218: checking whether $CXX understands -c and -o together" >&5
    1166311863 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
    1166411864 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
    1166511865   echo $ECHO_N "(cached) $ECHO_C" >&6
    11666 @@ -14825,15 +15203,15 @@
     11866@@ -14825,15 +15231,15 @@
    1166711867 # We do the test twice because some compilers refuse to overwrite an
    1166811868 # existing .o file with -o, though they will create one.
    1166911869 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    1167011870-if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
    11671 +if { (eval echo "$as_me:15206: \"$ac_try\"") >&5
     11871+if { (eval echo "$as_me:15234: \"$ac_try\"") >&5
    1167211872   (eval $ac_try) 2>&5
    1167311873   ac_status=$?
    1167411874-  echo "$as_me:14831: \$? = $ac_status" >&5
    11675 +  echo "$as_me:15209: \$? = $ac_status" >&5
     11875+  echo "$as_me:15237: \$? = $ac_status" >&5
    1167611876   (exit $ac_status); } &&
    1167711877-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    11678 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:15211: \"$ac_try\"") >&5
     11878+  test -f conftest2.$ac_objext && { (eval echo "$as_me:15239: \"$ac_try\"") >&5
    1167911879   (eval $ac_try) 2>&5
    1168011880   ac_status=$?
    1168111881-  echo "$as_me:14836: \$? = $ac_status" >&5
    11682 +  echo "$as_me:15214: \$? = $ac_status" >&5
     11882+  echo "$as_me:15242: \$? = $ac_status" >&5
    1168311883   (exit $ac_status); };
    1168411884 then
    1168511885   eval cf_cv_prog_CXX_c_o=yes
    11686 @@ -14844,10 +15222,10 @@
     11886@@ -14844,10 +15250,10 @@
    1168711887 
    1168811888 fi
    1168911889 if test $cf_cv_prog_CXX_c_o = yes; then
    1169011890-  echo "$as_me:14847: result: yes" >&5
    11691 +  echo "$as_me:15225: result: yes" >&5
     11891+  echo "$as_me:15253: result: yes" >&5
    1169211892 echo "${ECHO_T}yes" >&6
    1169311893 else
    1169411894-  echo "$as_me:14850: result: no" >&5
    11695 +  echo "$as_me:15228: result: no" >&5
     11895+  echo "$as_me:15256: result: no" >&5
    1169611896 echo "${ECHO_T}no" >&6
    1169711897 fi
    1169811898 
    11699 @@ -14867,12 +15245,12 @@
     11899@@ -14867,12 +15273,12 @@
    1170011900        ;;
    1170111901 esac
    1170211902 if test "$GXX" = yes; then
    1170311903-       echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
    11704 +       echo "$as_me:15248: checking for lib$cf_gpp_libname" >&5
     11904+       echo "$as_me:15276: checking for lib$cf_gpp_libname" >&5
    1170511905 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
    1170611906        cf_save="$LIBS"
    … …  
    1170811908        cat >conftest.$ac_ext <<_ACEOF
    1170911909-#line 14875 "configure"
    11710 +#line 15253 "configure"
     11910+#line 15281 "configure"
    1171111911 #include "confdefs.h"
    1171211912 
    1171311913 #include <$cf_gpp_libname/builtin.h>
    11714 @@ -14886,16 +15264,16 @@
     11914@@ -14886,16 +15292,16 @@
    1171511915 }
    1171611916 _ACEOF
    1171711917 rm -f conftest.$ac_objext conftest$ac_exeext
    1171811918-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
    11719 +if { (eval echo "$as_me:15267: \"$ac_link\"") >&5
     11919+if { (eval echo "$as_me:15295: \"$ac_link\"") >&5
    1172011920   (eval $ac_link) 2>&5
    1172111921   ac_status=$?
    1172211922-  echo "$as_me:14892: \$? = $ac_status" >&5
    11723 +  echo "$as_me:15270: \$? = $ac_status" >&5
     11923+  echo "$as_me:15298: \$? = $ac_status" >&5
    1172411924   (exit $ac_status); } &&
    1172511925          { ac_try='test -s conftest$ac_exeext'
    1172611926-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
    11727 +  { (eval echo "$as_me:15273: \"$ac_try\"") >&5
     11927+  { (eval echo "$as_me:15301: \"$ac_try\"") >&5
    1172811928   (eval $ac_try) 2>&5
    1172911929   ac_status=$?
    1173011930-  echo "$as_me:14898: \$? = $ac_status" >&5
    11731 +  echo "$as_me:15276: \$? = $ac_status" >&5
     11931+  echo "$as_me:15304: \$? = $ac_status" >&5
    1173211932   (exit $ac_status); }; }; then
    1173311933   cf_cxx_library=yes
    1173411934         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11735 @@ -14914,7 +15292,7 @@
     11935@@ -14914,7 +15320,7 @@
    1173611936   echo "$as_me: failed program was:" >&5
    1173711937 cat conftest.$ac_ext >&5
    1173811938 cat >conftest.$ac_ext <<_ACEOF
    1173911939-#line 14917 "configure"
    11740 +#line 15295 "configure"
     11940+#line 15323 "configure"
    1174111941 #include "confdefs.h"
    1174211942 
    1174311943 #include <builtin.h>
    11744 @@ -14928,16 +15306,16 @@
     11944@@ -14928,16 +15334,16 @@
    1174511945 }
    1174611946 _ACEOF
    1174711947 rm -f conftest.$ac_objext conftest$ac_exeext
    1174811948-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    11749 +if { (eval echo "$as_me:15309: \"$ac_link\"") >&5
     11949+if { (eval echo "$as_me:15337: \"$ac_link\"") >&5
    1175011950   (eval $ac_link) 2>&5
    1175111951   ac_status=$?
    1175211952-  echo "$as_me:14934: \$? = $ac_status" >&5
    11753 +  echo "$as_me:15312: \$? = $ac_status" >&5
     11953+  echo "$as_me:15340: \$? = $ac_status" >&5
    1175411954   (exit $ac_status); } &&
    1175511955          { ac_try='test -s conftest$ac_exeext'
    1175611956-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    11757 +  { (eval echo "$as_me:15315: \"$ac_try\"") >&5
     11957+  { (eval echo "$as_me:15343: \"$ac_try\"") >&5
    1175811958   (eval $ac_try) 2>&5
    1175911959   ac_status=$?
    1176011960-  echo "$as_me:14940: \$? = $ac_status" >&5
    11761 +  echo "$as_me:15318: \$? = $ac_status" >&5
     11961+  echo "$as_me:15346: \$? = $ac_status" >&5
    1176211962   (exit $ac_status); }; }; then
    1176311963   cf_cxx_library=yes
    1176411964         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11765 @@ -14954,7 +15332,7 @@
     11965@@ -14954,7 +15360,7 @@
    1176611966 fi
    1176711967 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1176811968        LIBS="$cf_save"
    1176911969-       echo "$as_me:14957: result: $cf_cxx_library" >&5
    11770 +       echo "$as_me:15335: result: $cf_cxx_library" >&5
     11970+       echo "$as_me:15363: result: $cf_cxx_library" >&5
    1177111971 echo "${ECHO_T}$cf_cxx_library" >&6
    1177211972 fi
    1177311973 
    11774 @@ -14970,7 +15348,7 @@
     11974@@ -14970,7 +15376,7 @@
    1177511975 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    1177611976 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1177711977 ac_main_return=return
    1177811978-echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
    11779 +echo "$as_me:15351: checking how to run the C++ preprocessor" >&5
     11979+echo "$as_me:15379: checking how to run the C++ preprocessor" >&5
    1178011980 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
    1178111981 if test -z "$CXXCPP"; then
    1178211982   if test "${ac_cv_prog_CXXCPP+set}" = set; then
    11783 @@ -14987,18 +15365,18 @@
     11983@@ -14987,18 +15393,18 @@
    1178411984   # On the NeXT, cc -E runs the code through the compiler's parser,
    1178511985   # not just through cpp. "Syntax error" is here to catch this case.
    1178611986   cat >conftest.$ac_ext <<_ACEOF
    1178711987-#line 14990 "configure"
    11788 +#line 15368 "configure"
     11988+#line 15396 "configure"
    1178911989 #include "confdefs.h"
    1179011990 #include <assert.h>
    … …  
    1179211992 _ACEOF
    1179311993-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
    11794 +if { (eval echo "$as_me:15373: \"$ac_cpp conftest.$ac_ext\"") >&5
     11994+if { (eval echo "$as_me:15401: \"$ac_cpp conftest.$ac_ext\"") >&5
    1179511995   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1179611996   ac_status=$?
    … …  
    1179911999   cat conftest.err >&5
    1180012000-  echo "$as_me:15001: \$? = $ac_status" >&5
    11801 +  echo "$as_me:15379: \$? = $ac_status" >&5
     12001+  echo "$as_me:15407: \$? = $ac_status" >&5
    1180212002   (exit $ac_status); } >/dev/null; then
    1180312003   if test -s conftest.err; then
    1180412004     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11805 @@ -15021,17 +15399,17 @@
     12005@@ -15021,17 +15427,17 @@
    1180612006   # OK, works on sane cases.  Now check whether non-existent headers
    1180712007   # can be detected and how.
    1180812008   cat >conftest.$ac_ext <<_ACEOF
    1180912009-#line 15024 "configure"
    11810 +#line 15402 "configure"
     12010+#line 15430 "configure"
    1181112011 #include "confdefs.h"
    1181212012 #include <ac_nonexistent.h>
    1181312013 _ACEOF
    1181412014-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
    11815 +if { (eval echo "$as_me:15406: \"$ac_cpp conftest.$ac_ext\"") >&5
     12015+if { (eval echo "$as_me:15434: \"$ac_cpp conftest.$ac_ext\"") >&5
    1181612016   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1181712017   ac_status=$?
    … …  
    1182012020   cat conftest.err >&5
    1182112021-  echo "$as_me:15034: \$? = $ac_status" >&5
    11822 +  echo "$as_me:15412: \$? = $ac_status" >&5
     12022+  echo "$as_me:15440: \$? = $ac_status" >&5
    1182312023   (exit $ac_status); } >/dev/null; then
    1182412024   if test -s conftest.err; then
    1182512025     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11826 @@ -15068,7 +15446,7 @@
     12026@@ -15068,7 +15474,7 @@
    1182712027 else
    1182812028   ac_cv_prog_CXXCPP=$CXXCPP
    1182912029 fi
    1183012030-echo "$as_me:15071: result: $CXXCPP" >&5
    11831 +echo "$as_me:15449: result: $CXXCPP" >&5
     12031+echo "$as_me:15477: result: $CXXCPP" >&5
    1183212032 echo "${ECHO_T}$CXXCPP" >&6
    1183312033 ac_preproc_ok=false
    1183412034 for ac_cxx_preproc_warn_flag in '' yes
    11835 @@ -15078,18 +15456,18 @@
     12035@@ -15078,18 +15484,18 @@
    1183612036   # On the NeXT, cc -E runs the code through the compiler's parser,
    1183712037   # not just through cpp. "Syntax error" is here to catch this case.
    1183812038   cat >conftest.$ac_ext <<_ACEOF
    1183912039-#line 15081 "configure"
    11840 +#line 15459 "configure"
     12040+#line 15487 "configure"
    1184112041 #include "confdefs.h"
    1184212042 #include <assert.h>
    … …  
    1184412044 _ACEOF
    1184512045-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
    11846 +if { (eval echo "$as_me:15464: \"$ac_cpp conftest.$ac_ext\"") >&5
     12046+if { (eval echo "$as_me:15492: \"$ac_cpp conftest.$ac_ext\"") >&5
    1184712047   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1184812048   ac_status=$?
    … …  
    1185112051   cat conftest.err >&5
    1185212052-  echo "$as_me:15092: \$? = $ac_status" >&5
    11853 +  echo "$as_me:15470: \$? = $ac_status" >&5
     12053+  echo "$as_me:15498: \$? = $ac_status" >&5
    1185412054   (exit $ac_status); } >/dev/null; then
    1185512055   if test -s conftest.err; then
    1185612056     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11857 @@ -15112,17 +15490,17 @@
     12057@@ -15112,17 +15518,17 @@
    1185812058   # OK, works on sane cases.  Now check whether non-existent headers
    1185912059   # can be detected and how.
    1186012060   cat >conftest.$ac_ext <<_ACEOF
    1186112061-#line 15115 "configure"
    11862 +#line 15493 "configure"
     12062+#line 15521 "configure"
    1186312063 #include "confdefs.h"
    1186412064 #include <ac_nonexistent.h>
    1186512065 _ACEOF
    1186612066-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
    11867 +if { (eval echo "$as_me:15497: \"$ac_cpp conftest.$ac_ext\"") >&5
     12067+if { (eval echo "$as_me:15525: \"$ac_cpp conftest.$ac_ext\"") >&5
    1186812068   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1186912069   ac_status=$?
    … …  
    1187212072   cat conftest.err >&5
    1187312073-  echo "$as_me:15125: \$? = $ac_status" >&5
    11874 +  echo "$as_me:15503: \$? = $ac_status" >&5
     12074+  echo "$as_me:15531: \$? = $ac_status" >&5
    1187512075   (exit $ac_status); } >/dev/null; then
    1187612076   if test -s conftest.err; then
    1187712077     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11878 @@ -15150,7 +15528,7 @@
     12078@@ -15150,7 +15556,7 @@
    1187912079 if $ac_preproc_ok; then
    1188012080   :
    1188112081 else
    1188212082-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    11883 +  { { echo "$as_me:15531: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
     12083+  { { echo "$as_me:15559: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    1188412084 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    1188512085    { (exit 1); exit 1; }; }
    1188612086 fi
    11887 @@ -15165,23 +15543,23 @@
     12087@@ -15165,23 +15571,23 @@
    1188812088 for ac_header in iostream typeinfo
    1188912089 do
    1189012090 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1189112091-echo "$as_me:15168: checking for $ac_header" >&5
    11892 +echo "$as_me:15546: checking for $ac_header" >&5
     12092+echo "$as_me:15574: checking for $ac_header" >&5
    1189312093 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1189412094 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1189712097   cat >conftest.$ac_ext <<_ACEOF
    1189812098-#line 15174 "configure"
    11899 +#line 15552 "configure"
     12099+#line 15580 "configure"
    1190012100 #include "confdefs.h"
    1190112101 #include <$ac_header>
    1190212102 _ACEOF
    1190312103-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
    11904 +if { (eval echo "$as_me:15556: \"$ac_cpp conftest.$ac_ext\"") >&5
     12104+if { (eval echo "$as_me:15584: \"$ac_cpp conftest.$ac_ext\"") >&5
    1190512105   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1190612106   ac_status=$?
    … …  
    1190912109   cat conftest.err >&5
    1191012110-  echo "$as_me:15184: \$? = $ac_status" >&5
    11911 +  echo "$as_me:15562: \$? = $ac_status" >&5
     12111+  echo "$as_me:15590: \$? = $ac_status" >&5
    1191212112   (exit $ac_status); } >/dev/null; then
    1191312113   if test -s conftest.err; then
    1191412114     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11915 @@ -15200,7 +15578,7 @@
     12115@@ -15200,7 +15606,7 @@
    1191612116 fi
    1191712117 rm -f conftest.err conftest.$ac_ext
    1191812118 fi
    1191912119-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
    11920 +echo "$as_me:15581: result: `eval echo '${'$as_ac_Header'}'`" >&5
     12120+echo "$as_me:15609: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1192112121 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1192212122 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1192312123   cat >>confdefs.h <<EOF
    11924 @@ -15211,10 +15589,10 @@
     12124@@ -15211,10 +15617,10 @@
    1192512125 done
    1192612126 
    1192712127     if test x"$ac_cv_header_iostream" = xyes ; then
    1192812128-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
    11929 +        echo "$as_me:15592: checking if iostream uses std-namespace" >&5
     12129+        echo "$as_me:15620: checking if iostream uses std-namespace" >&5
    1193012130 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
    1193112131         cat >conftest.$ac_ext <<_ACEOF
    1193212132-#line 15217 "configure"
    11933 +#line 15595 "configure"
     12133+#line 15623 "configure"
    1193412134 #include "confdefs.h"
    1193512135 
    1193612136 #include <iostream>
    11937 @@ -15231,16 +15609,16 @@
     12137@@ -15231,16 +15637,16 @@
    1193812138 }
    1193912139 _ACEOF
    1194012140 rm -f conftest.$ac_objext
    1194112141-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
    11942 +if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5
     12142+if { (eval echo "$as_me:15640: \"$ac_compile\"") >&5
    1194312143   (eval $ac_compile) 2>&5
    1194412144   ac_status=$?
    1194512145-  echo "$as_me:15237: \$? = $ac_status" >&5
    11946 +  echo "$as_me:15615: \$? = $ac_status" >&5
     12146+  echo "$as_me:15643: \$? = $ac_status" >&5
    1194712147   (exit $ac_status); } &&
    1194812148          { ac_try='test -s conftest.$ac_objext'
    1194912149-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
    11950 +  { (eval echo "$as_me:15618: \"$ac_try\"") >&5
     12150+  { (eval echo "$as_me:15646: \"$ac_try\"") >&5
    1195112151   (eval $ac_try) 2>&5
    1195212152   ac_status=$?
    1195312153-  echo "$as_me:15243: \$? = $ac_status" >&5
    11954 +  echo "$as_me:15621: \$? = $ac_status" >&5
     12154+  echo "$as_me:15649: \$? = $ac_status" >&5
    1195512155   (exit $ac_status); }; }; then
    1195612156   cf_iostream_namespace=yes
    1195712157 else
    11958 @@ -15249,7 +15627,7 @@
     12158@@ -15249,7 +15655,7 @@
    1195912159 cf_iostream_namespace=no
    1196012160 fi
    1196112161 rm -f conftest.$ac_objext conftest.$ac_ext
    1196212162-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
    11963 +        echo "$as_me:15630: result: $cf_iostream_namespace" >&5
     12163+        echo "$as_me:15658: result: $cf_iostream_namespace" >&5
    1196412164 echo "${ECHO_T}$cf_iostream_namespace" >&6
    1196512165         if test "$cf_iostream_namespace" = yes ; then
    1196612166             cat >>confdefs.h <<\EOF
    11967 @@ -15259,7 +15637,7 @@
     12167@@ -15259,7 +15665,7 @@
    1196812168         fi
    1196912169     fi
    1197012170 
    1197112171-echo "$as_me:15262: checking if we should include stdbool.h" >&5
    11972 +echo "$as_me:15640: checking if we should include stdbool.h" >&5
     12172+echo "$as_me:15668: checking if we should include stdbool.h" >&5
    1197312173 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1197412174 
    1197512175 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11976 @@ -15267,7 +15645,7 @@
     12176@@ -15267,7 +15673,7 @@
    1197712177 else
    1197812178 
    1197912179        cat >conftest.$ac_ext <<_ACEOF
    1198012180-#line 15270 "configure"
    11981 +#line 15648 "configure"
     12181+#line 15676 "configure"
    1198212182 #include "confdefs.h"
    1198312183 
    1198412184 int
    11985 @@ -15279,23 +15657,23 @@
     12185@@ -15279,23 +15685,23 @@
    1198612186 }
    1198712187 _ACEOF
    1198812188 rm -f conftest.$ac_objext
    1198912189-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
    11990 +if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5
     12190+if { (eval echo "$as_me:15688: \"$ac_compile\"") >&5
    1199112191   (eval $ac_compile) 2>&5
    1199212192   ac_status=$?
    1199312193-  echo "$as_me:15285: \$? = $ac_status" >&5
    11994 +  echo "$as_me:15663: \$? = $ac_status" >&5
     12194+  echo "$as_me:15691: \$? = $ac_status" >&5
    1199512195   (exit $ac_status); } &&
    1199612196          { ac_try='test -s conftest.$ac_objext'
    1199712197-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
    11998 +  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
     12198+  { (eval echo "$as_me:15694: \"$ac_try\"") >&5
    1199912199   (eval $ac_try) 2>&5
    1200012200   ac_status=$?
    1200112201-  echo "$as_me:15291: \$? = $ac_status" >&5
    12002 +  echo "$as_me:15669: \$? = $ac_status" >&5
     12202+  echo "$as_me:15697: \$? = $ac_status" >&5
    1200312203   (exit $ac_status); }; }; then
    1200412204   cf_cv_header_stdbool_h=0
    … …  
    1200812208 cat >conftest.$ac_ext <<_ACEOF
    1200912209-#line 15298 "configure"
    12010 +#line 15676 "configure"
     12210+#line 15704 "configure"
    1201112211 #include "confdefs.h"
    1201212212 
    1201312213 #ifndef __BEOS__
    12014 @@ -15311,16 +15689,16 @@
     12214@@ -15311,16 +15717,16 @@
    1201512215 }
    1201612216 _ACEOF
    1201712217 rm -f conftest.$ac_objext
    1201812218-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
    12019 +if { (eval echo "$as_me:15692: \"$ac_compile\"") >&5
     12219+if { (eval echo "$as_me:15720: \"$ac_compile\"") >&5
    1202012220   (eval $ac_compile) 2>&5
    1202112221   ac_status=$?
    1202212222-  echo "$as_me:15317: \$? = $ac_status" >&5
    12023 +  echo "$as_me:15695: \$? = $ac_status" >&5
     12223+  echo "$as_me:15723: \$? = $ac_status" >&5
    1202412224   (exit $ac_status); } &&
    1202512225          { ac_try='test -s conftest.$ac_objext'
    1202612226-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
    12027 +  { (eval echo "$as_me:15698: \"$ac_try\"") >&5
     12227+  { (eval echo "$as_me:15726: \"$ac_try\"") >&5
    1202812228   (eval $ac_try) 2>&5
    1202912229   ac_status=$?
    1203012230-  echo "$as_me:15323: \$? = $ac_status" >&5
    12031 +  echo "$as_me:15701: \$? = $ac_status" >&5
     12231+  echo "$as_me:15729: \$? = $ac_status" >&5
    1203212232   (exit $ac_status); }; }; then
    1203312233   cf_cv_header_stdbool_h=1
    1203412234 else
    12035 @@ -15334,13 +15712,13 @@
     12235@@ -15334,13 +15740,13 @@
    1203612236 fi
    1203712237 
    1203812238 if test "$cf_cv_header_stdbool_h" = 1
    1203912239-then   echo "$as_me:15337: result: yes" >&5
    12040 +then   echo "$as_me:15715: result: yes" >&5
     12240+then   echo "$as_me:15743: result: yes" >&5
    1204112241 echo "${ECHO_T}yes" >&6
    1204212242-else   echo "$as_me:15339: result: no" >&5
    12043 +else   echo "$as_me:15717: result: no" >&5
     12243+else   echo "$as_me:15745: result: no" >&5
    1204412244 echo "${ECHO_T}no" >&6
    1204512245 fi
    1204612246 
    1204712247-echo "$as_me:15343: checking for builtin bool type" >&5
    12048 +echo "$as_me:15721: checking for builtin bool type" >&5
     12248+echo "$as_me:15749: checking for builtin bool type" >&5
    1204912249 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1205012250 
    1205112251 if test "${cf_cv_builtin_bool+set}" = set; then
    12052 @@ -15348,7 +15726,7 @@
     12252@@ -15348,7 +15754,7 @@
    1205312253 else
    1205412254 
    1205512255        cat >conftest.$ac_ext <<_ACEOF
    1205612256-#line 15351 "configure"
    12057 +#line 15729 "configure"
     12257+#line 15757 "configure"
    1205812258 #include "confdefs.h"
    1205912259 
    1206012260 #include <stdio.h>
    12061 @@ -15363,16 +15741,16 @@
     12261@@ -15363,16 +15769,16 @@
    1206212262 }
    1206312263 _ACEOF
    1206412264 rm -f conftest.$ac_objext
    1206512265-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
    12066 +if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
     12266+if { (eval echo "$as_me:15772: \"$ac_compile\"") >&5
    1206712267   (eval $ac_compile) 2>&5
    1206812268   ac_status=$?
    1206912269-  echo "$as_me:15369: \$? = $ac_status" >&5
    12070 +  echo "$as_me:15747: \$? = $ac_status" >&5
     12270+  echo "$as_me:15775: \$? = $ac_status" >&5
    1207112271   (exit $ac_status); } &&
    1207212272          { ac_try='test -s conftest.$ac_objext'
    1207312273-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
    12074 +  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
     12274+  { (eval echo "$as_me:15778: \"$ac_try\"") >&5
    1207512275   (eval $ac_try) 2>&5
    1207612276   ac_status=$?
    1207712277-  echo "$as_me:15375: \$? = $ac_status" >&5
    12078 +  echo "$as_me:15753: \$? = $ac_status" >&5
     12278+  echo "$as_me:15781: \$? = $ac_status" >&5
    1207912279   (exit $ac_status); }; }; then
    1208012280   cf_cv_builtin_bool=1
    1208112281 else
    12082 @@ -15385,13 +15763,13 @@
     12282@@ -15385,13 +15791,13 @@
    1208312283 fi
    1208412284 
    1208512285 if test "$cf_cv_builtin_bool" = 1
    1208612286-then   echo "$as_me:15388: result: yes" >&5
    12087 +then   echo "$as_me:15766: result: yes" >&5
     12287+then   echo "$as_me:15794: result: yes" >&5
    1208812288 echo "${ECHO_T}yes" >&6
    1208912289-else   echo "$as_me:15390: result: no" >&5
    12090 +else   echo "$as_me:15768: result: no" >&5
     12290+else   echo "$as_me:15796: result: no" >&5
    1209112291 echo "${ECHO_T}no" >&6
    1209212292 fi
    1209312293 
    1209412294-echo "$as_me:15394: checking for size of bool" >&5
    12095 +echo "$as_me:15772: checking for size of bool" >&5
     12295+echo "$as_me:15800: checking for size of bool" >&5
    1209612296 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1209712297 if test "${cf_cv_type_of_bool+set}" = set; then
    1209812298   echo $ECHO_N "(cached) $ECHO_C" >&6
    12099 @@ -15402,7 +15780,7 @@
     12299@@ -15402,7 +15808,7 @@
    1210012300   cf_cv_type_of_bool=unknown
    1210112301 else
    1210212302   cat >conftest.$ac_ext <<_ACEOF
    1210312303-#line 15405 "configure"
    12104 +#line 15783 "configure"
     12304+#line 15811 "configure"
    1210512305 #include "confdefs.h"
    1210612306 
    1210712307 #include <stdlib.h>
    12108 @@ -15444,15 +15822,15 @@
     12308@@ -15444,15 +15850,15 @@
    1210912309 
    1211012310 _ACEOF
    1211112311 rm -f conftest$ac_exeext
    1211212312-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
    12113 +if { (eval echo "$as_me:15825: \"$ac_link\"") >&5
     12313+if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
    1211412314   (eval $ac_link) 2>&5
    1211512315   ac_status=$?
    1211612316-  echo "$as_me:15450: \$? = $ac_status" >&5
    12117 +  echo "$as_me:15828: \$? = $ac_status" >&5
     12317+  echo "$as_me:15856: \$? = $ac_status" >&5
    1211812318   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1211912319-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
    12120 +  { (eval echo "$as_me:15830: \"$ac_try\"") >&5
     12320+  { (eval echo "$as_me:15858: \"$ac_try\"") >&5
    1212112321   (eval $ac_try) 2>&5
    1212212322   ac_status=$?
    1212312323-  echo "$as_me:15455: \$? = $ac_status" >&5
    12124 +  echo "$as_me:15833: \$? = $ac_status" >&5
     12324+  echo "$as_me:15861: \$? = $ac_status" >&5
    1212512325   (exit $ac_status); }; }; then
    1212612326   cf_cv_type_of_bool=`cat cf_test.out`
    1212712327                 if test -z "$cf_cv_type_of_bool"; then
    12128 @@ -15470,18 +15848,18 @@
     12328@@ -15470,18 +15876,18 @@
    1212912329 fi
    1213012330 
    1213112331        rm -f cf_test.out
    1213212332-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
    12133 +echo "$as_me:15851: result: $cf_cv_type_of_bool" >&5
     12333+echo "$as_me:15879: result: $cf_cv_type_of_bool" >&5
    1213412334 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1213512335 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1213812338        esac
    1213912339-       { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    12140 +       { echo "$as_me:15857: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     12340+       { echo "$as_me:15885: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1214112341 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1214212342        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1214412344 
    1214512345-echo "$as_me:15484: checking for special defines needed for etip.h" >&5
    12146 +echo "$as_me:15862: checking for special defines needed for etip.h" >&5
     12346+echo "$as_me:15890: checking for special defines needed for etip.h" >&5
    1214712347 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
    1214812348 cf_save_CXXFLAGS="$CXXFLAGS"
    1214912349 cf_result="none"
    12150 @@ -15493,7 +15871,7 @@
     12350@@ -15493,7 +15899,7 @@
    1215112351        test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
    1215212352        test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
    1215312353 cat >conftest.$ac_ext <<_ACEOF
    1215412354-#line 15496 "configure"
    12155 +#line 15874 "configure"
     12355+#line 15902 "configure"
    1215612356 #include "confdefs.h"
    1215712357 
    1215812358 #include <etip.h.in>
    12159 @@ -15507,16 +15885,16 @@
     12359@@ -15507,16 +15913,16 @@
    1216012360 }
    1216112361 _ACEOF
    1216212362 rm -f conftest.$ac_objext
    1216312363-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
    12164 +if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5
     12364+if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5
    1216512365   (eval $ac_compile) 2>&5
    1216612366   ac_status=$?
    1216712367-  echo "$as_me:15513: \$? = $ac_status" >&5
    12168 +  echo "$as_me:15891: \$? = $ac_status" >&5
     12368+  echo "$as_me:15919: \$? = $ac_status" >&5
    1216912369   (exit $ac_status); } &&
    1217012370          { ac_try='test -s conftest.$ac_objext'
    1217112371-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
    12172 +  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
     12372+  { (eval echo "$as_me:15922: \"$ac_try\"") >&5
    1217312373   (eval $ac_try) 2>&5
    1217412374   ac_status=$?
    1217512375-  echo "$as_me:15519: \$? = $ac_status" >&5
    12176 +  echo "$as_me:15897: \$? = $ac_status" >&5
     12376+  echo "$as_me:15925: \$? = $ac_status" >&5
    1217712377   (exit $ac_status); }; }; then
    1217812378 
    1217912379        test -n "$cf_math" && cat >>confdefs.h <<EOF
    12180 @@ -15537,12 +15915,12 @@
     12380@@ -15537,12 +15943,12 @@
    1218112381 rm -f conftest.$ac_objext conftest.$ac_ext
    1218212382 done
    1218312383 done
    1218412384-echo "$as_me:15540: result: $cf_result" >&5
    12185 +echo "$as_me:15918: result: $cf_result" >&5
     12385+echo "$as_me:15946: result: $cf_result" >&5
    1218612386 echo "${ECHO_T}$cf_result" >&6
    1218712387 CXXFLAGS="$cf_save_CXXFLAGS"
    … …  
    1218912389 if test -n "$CXX"; then
    1219012390-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
    12191 +echo "$as_me:15923: checking if $CXX accepts parameter initialization" >&5
     12391+echo "$as_me:15951: checking if $CXX accepts parameter initialization" >&5
    1219212392 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
    1219312393 if test "${cf_cv_cpp_param_init+set}" = set; then
    1219412394   echo $ECHO_N "(cached) $ECHO_C" >&6
    12195 @@ -15559,7 +15937,7 @@
     12395@@ -15559,7 +15965,7 @@
    1219612396   cf_cv_cpp_param_init=unknown
    1219712397 else
    1219812398   cat >conftest.$ac_ext <<_ACEOF
    1219912399-#line 15562 "configure"
    12200 +#line 15940 "configure"
     12400+#line 15968 "configure"
    1220112401 #include "confdefs.h"
    1220212402 
    1220312403 class TEST {
    12204 @@ -15578,15 +15956,15 @@
     12404@@ -15578,15 +15984,15 @@
    1220512405 
    1220612406 _ACEOF
    1220712407 rm -f conftest$ac_exeext
    1220812408-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
    12209 +if { (eval echo "$as_me:15959: \"$ac_link\"") >&5
     12409+if { (eval echo "$as_me:15987: \"$ac_link\"") >&5
    1221012410   (eval $ac_link) 2>&5
    1221112411   ac_status=$?
    1221212412-  echo "$as_me:15584: \$? = $ac_status" >&5
    12213 +  echo "$as_me:15962: \$? = $ac_status" >&5
     12413+  echo "$as_me:15990: \$? = $ac_status" >&5
    1221412414   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1221512415-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
    12216 +  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
     12416+  { (eval echo "$as_me:15992: \"$ac_try\"") >&5
    1221712417   (eval $ac_try) 2>&5
    1221812418   ac_status=$?
    1221912419-  echo "$as_me:15589: \$? = $ac_status" >&5
    12220 +  echo "$as_me:15967: \$? = $ac_status" >&5
     12420+  echo "$as_me:15995: \$? = $ac_status" >&5
    1222112421   (exit $ac_status); }; }; then
    1222212422   cf_cv_cpp_param_init=yes
    1222312423 else
    12224 @@ -15605,7 +15983,7 @@
     12424@@ -15605,7 +16011,7 @@
    1222512425 ac_main_return=return
    1222612426 
    1222712427 fi
    1222812428-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
    12229 +echo "$as_me:15986: result: $cf_cv_cpp_param_init" >&5
     12429+echo "$as_me:16014: result: $cf_cv_cpp_param_init" >&5
    1223012430 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
    1223112431 fi
    1223212432 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
    12233 @@ -15614,7 +15992,7 @@
     12433@@ -15614,7 +16020,7 @@
    1223412434 
    1223512435 if test -n "$CXX"; then
    1223612436 
    1223712437-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
    12238 +echo "$as_me:15995: checking if $CXX accepts static_cast" >&5
     12438+echo "$as_me:16023: checking if $CXX accepts static_cast" >&5
    1223912439 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
    1224012440 if test "${cf_cv_cpp_static_cast+set}" = set; then
    1224112441   echo $ECHO_N "(cached) $ECHO_C" >&6
    12242 @@ -15628,7 +16006,7 @@
     12442@@ -15628,7 +16034,7 @@
    1224312443 ac_main_return=return
    1224412444 
    1224512445        cat >conftest.$ac_ext <<_ACEOF
    1224612446-#line 15631 "configure"
    12247 +#line 16009 "configure"
     12447+#line 16037 "configure"
    1224812448 #include "confdefs.h"
    1224912449 
    1225012450 class NCursesPanel
    12251 @@ -15672,16 +16050,16 @@
     12451@@ -15672,16 +16078,16 @@
    1225212452 }
    1225312453 _ACEOF
    1225412454 rm -f conftest.$ac_objext
    1225512455-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
    12256 +if { (eval echo "$as_me:16053: \"$ac_compile\"") >&5
     12456+if { (eval echo "$as_me:16081: \"$ac_compile\"") >&5
    1225712457   (eval $ac_compile) 2>&5
    1225812458   ac_status=$?
    1225912459-  echo "$as_me:15678: \$? = $ac_status" >&5
    12260 +  echo "$as_me:16056: \$? = $ac_status" >&5
     12460+  echo "$as_me:16084: \$? = $ac_status" >&5
    1226112461   (exit $ac_status); } &&
    1226212462          { ac_try='test -s conftest.$ac_objext'
    1226312463-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
    12264 +  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
     12464+  { (eval echo "$as_me:16087: \"$ac_try\"") >&5
    1226512465   (eval $ac_try) 2>&5
    1226612466   ac_status=$?
    1226712467-  echo "$as_me:15684: \$? = $ac_status" >&5
    12268 +  echo "$as_me:16062: \$? = $ac_status" >&5
     12468+  echo "$as_me:16090: \$? = $ac_status" >&5
    1226912469   (exit $ac_status); }; }; then
    1227012470   cf_cv_cpp_static_cast=yes
    1227112471 else
    12272 @@ -15699,7 +16077,7 @@
     12472@@ -15699,7 +16105,7 @@
    1227312473 ac_main_return=return
    1227412474 
    1227512475 fi
    1227612476-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
    12277 +echo "$as_me:16080: result: $cf_cv_cpp_static_cast" >&5
     12477+echo "$as_me:16108: result: $cf_cv_cpp_static_cast" >&5
    1227812478 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
    1227912479 
    1228012480 fi
    12281 @@ -15709,12 +16087,12 @@
     12481@@ -15709,12 +16115,12 @@
    1228212482 EOF
    1228312483 
    … …  
    1229412494            ;;
    1229512495        sco3.2v5*) #(vi
    12296 @@ -15723,7 +16101,7 @@
     12496@@ -15723,7 +16129,7 @@
    1229712497        solaris2*)
    1229812498            if test "$GXX" != yes ; then
    … …  
    1230312503            ;;
    1230412504        esac
    12305 @@ -15747,7 +16125,7 @@
     12505@@ -15747,7 +16153,7 @@
    1230612506        else
    1230712507                if test "$cf_cv_header_stdbool_h" = 1 ; then
    1230812508 
    1230912509-echo "$as_me:15750: checking for size of bool" >&5
    12310 +echo "$as_me:16128: checking for size of bool" >&5
     12510+echo "$as_me:16156: checking for size of bool" >&5
    1231112511 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1231212512 if test "${cf_cv_type_of_bool+set}" = set; then
    1231312513   echo $ECHO_N "(cached) $ECHO_C" >&6
    12314 @@ -15758,7 +16136,7 @@
     12514@@ -15758,7 +16164,7 @@
    1231512515   cf_cv_type_of_bool=unknown
    1231612516 else
    1231712517   cat >conftest.$ac_ext <<_ACEOF
    1231812518-#line 15761 "configure"
    12319 +#line 16139 "configure"
     12519+#line 16167 "configure"
    1232012520 #include "confdefs.h"
    1232112521 
    1232212522 #include <stdlib.h>
    12323 @@ -15800,15 +16178,15 @@
     12523@@ -15800,15 +16206,15 @@
    1232412524 
    1232512525 _ACEOF
    1232612526 rm -f conftest$ac_exeext
    1232712527-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
    12328 +if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
     12528+if { (eval echo "$as_me:16209: \"$ac_link\"") >&5
    1232912529   (eval $ac_link) 2>&5
    1233012530   ac_status=$?
    1233112531-  echo "$as_me:15806: \$? = $ac_status" >&5
    12332 +  echo "$as_me:16184: \$? = $ac_status" >&5
     12532+  echo "$as_me:16212: \$? = $ac_status" >&5
    1233312533   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1233412534-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
    12335 +  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
     12535+  { (eval echo "$as_me:16214: \"$ac_try\"") >&5
    1233612536   (eval $ac_try) 2>&5
    1233712537   ac_status=$?
    1233812538-  echo "$as_me:15811: \$? = $ac_status" >&5
    12339 +  echo "$as_me:16189: \$? = $ac_status" >&5
     12539+  echo "$as_me:16217: \$? = $ac_status" >&5
    1234012540   (exit $ac_status); }; }; then
    1234112541   cf_cv_type_of_bool=`cat cf_test.out`
    1234212542                 if test -z "$cf_cv_type_of_bool"; then
    12343 @@ -15826,25 +16204,25 @@
     12543@@ -15826,25 +16232,25 @@
    1234412544 fi
    1234512545 
    1234612546        rm -f cf_test.out
    1234712547-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
    12348 +echo "$as_me:16207: result: $cf_cv_type_of_bool" >&5
     12548+echo "$as_me:16235: result: $cf_cv_type_of_bool" >&5
    1234912549 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1235012550 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1235312553        esac
    1235412554-       { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    12355 +       { echo "$as_me:16213: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     12555+       { echo "$as_me:16241: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1235612556 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1235712557        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1236012560                else
    1236112561-                       echo "$as_me:15841: checking for fallback type of bool" >&5
    12362 +                       echo "$as_me:16219: checking for fallback type of bool" >&5
     12562+                       echo "$as_me:16247: checking for fallback type of bool" >&5
    1236312563 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
    1236412564                        case "$host_cpu" in #(vi
    … …  
    1236712567                        esac
    1236812568-                       echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
    12369 +                       echo "$as_me:16225: result: $cf_cv_type_of_bool" >&5
     12569+                       echo "$as_me:16253: result: $cf_cv_type_of_bool" >&5
    1237012570 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1237112571                fi
    1237212572        fi
    12373 @@ -15873,7 +16251,7 @@
     12573@@ -15873,7 +16279,7 @@
    1237412574 
    1237512575 if test "$cf_with_ada" != "no" ; then
    1237612576     if test "$with_libtool" != "no"; then
    1237712577-       { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
    12378 +       { echo "$as_me:16254: WARNING: libtool does not support Ada - disabling feature" >&5
     12578+       { echo "$as_me:16282: WARNING: libtool does not support Ada - disabling feature" >&5
    1237912579 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
    1238012580        cf_with_ada=no
    1238112581     fi
    12382 @@ -15883,7 +16261,7 @@
     12582@@ -15883,7 +16289,7 @@
    1238312583 cf_ada_make=gnatmake
    1238412584 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
    1238512585 set dummy $cf_ada_make; ac_word=$2
    1238612586-echo "$as_me:15886: checking for $ac_word" >&5
    12387 +echo "$as_me:16264: checking for $ac_word" >&5
     12587+echo "$as_me:16292: checking for $ac_word" >&5
    1238812588 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1238912589 if test "${ac_cv_prog_gnat_exists+set}" = set; then
    1239012590   echo $ECHO_N "(cached) $ECHO_C" >&6
    12391 @@ -15898,7 +16276,7 @@
     12591@@ -15898,7 +16304,7 @@
    1239212592   test -z "$ac_dir" && ac_dir=.
    1239312593   $as_executable_p "$ac_dir/$ac_word" || continue
    1239412594 ac_cv_prog_gnat_exists="yes"
    1239512595-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
    12396 +echo "$as_me:16279: found $ac_dir/$ac_word" >&5
     12596+echo "$as_me:16307: found $ac_dir/$ac_word" >&5
    1239712597 break
    1239812598 done
    1239912599 
    12400 @@ -15907,10 +16285,10 @@
     12600@@ -15907,10 +16313,10 @@
    1240112601 fi
    1240212602 gnat_exists=$ac_cv_prog_gnat_exists
    1240312603 if test -n "$gnat_exists"; then
    1240412604-  echo "$as_me:15910: result: $gnat_exists" >&5
    12405 +  echo "$as_me:16288: result: $gnat_exists" >&5
     12605+  echo "$as_me:16316: result: $gnat_exists" >&5
    1240612606 echo "${ECHO_T}$gnat_exists" >&6
    1240712607 else
    1240812608-  echo "$as_me:15913: result: no" >&5
    12409 +  echo "$as_me:16291: result: no" >&5
     12609+  echo "$as_me:16319: result: no" >&5
    1241012610 echo "${ECHO_T}no" >&6
    1241112611 fi
    1241212612 
    12413 @@ -15918,11 +16296,11 @@
     12613@@ -15918,11 +16324,11 @@
    1241412614    cf_ada_make=
    1241512615 else
    1241612616 
    1241712617-echo "$as_me:15921: checking for gnat version" >&5
    12418 +echo "$as_me:16299: checking for gnat version" >&5
     12618+echo "$as_me:16327: checking for gnat version" >&5
    1241912619 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
    1242012620 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
    1242112621   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
    1242212622-echo "$as_me:15925: result: $cf_gnat_version" >&5
    12423 +echo "$as_me:16303: result: $cf_gnat_version" >&5
     12623+echo "$as_me:16331: result: $cf_gnat_version" >&5
    1242412624 echo "${ECHO_T}$cf_gnat_version" >&6
    1242512625 
    1242612626 case $cf_gnat_version in
    12427 @@ -15945,7 +16323,7 @@
     12627@@ -15945,7 +16351,7 @@
    1242812628 
    1242912629    # Extract the first word of "m4", so it can be a program name with args.
    1243012630 set dummy m4; ac_word=$2
    1243112631-echo "$as_me:15948: checking for $ac_word" >&5
    12432 +echo "$as_me:16326: checking for $ac_word" >&5
     12632+echo "$as_me:16354: checking for $ac_word" >&5
    1243312633 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1243412634 if test "${ac_cv_prog_M4_exists+set}" = set; then
    1243512635   echo $ECHO_N "(cached) $ECHO_C" >&6
    12436 @@ -15960,7 +16338,7 @@
     12636@@ -15960,7 +16366,7 @@
    1243712637   test -z "$ac_dir" && ac_dir=.
    1243812638   $as_executable_p "$ac_dir/$ac_word" || continue
    1243912639 ac_cv_prog_M4_exists="yes"
    1244012640-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
    12441 +echo "$as_me:16341: found $ac_dir/$ac_word" >&5
     12641+echo "$as_me:16369: found $ac_dir/$ac_word" >&5
    1244212642 break
    1244312643 done
    1244412644 
    12445 @@ -15969,10 +16347,10 @@
     12645@@ -15969,10 +16375,10 @@
    1244612646 fi
    1244712647 M4_exists=$ac_cv_prog_M4_exists
    1244812648 if test -n "$M4_exists"; then
    1244912649-  echo "$as_me:15972: result: $M4_exists" >&5
    12450 +  echo "$as_me:16350: result: $M4_exists" >&5
     12650+  echo "$as_me:16378: result: $M4_exists" >&5
    1245112651 echo "${ECHO_T}$M4_exists" >&6
    1245212652 else
    1245312653-  echo "$as_me:15975: result: no" >&5
    12454 +  echo "$as_me:16353: result: no" >&5
     12654+  echo "$as_me:16381: result: no" >&5
    1245512655 echo "${ECHO_T}no" >&6
    1245612656 fi
    1245712657 
    12458 @@ -15981,7 +16359,7 @@
     12658@@ -15981,7 +16387,7 @@
    1245912659       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    1246012660    fi
    1246112661    if test "$cf_cv_prog_gnat_correct" = yes; then
    1246212662-      echo "$as_me:15984: checking if GNAT works" >&5
    12463 +      echo "$as_me:16362: checking if GNAT works" >&5
     12663+      echo "$as_me:16390: checking if GNAT works" >&5
    1246412664 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
    1246512665 
    1246612666 rm -f conftest*
    12467 @@ -16009,14 +16387,14 @@
     12667@@ -16009,14 +16415,14 @@
    1246812668 fi
    1246912669 rm -f conftest*
    1247012670 
    1247112671-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
    12472 +      echo "$as_me:16390: result: $cf_cv_prog_gnat_correct" >&5
     12672+      echo "$as_me:16418: result: $cf_cv_prog_gnat_correct" >&5
    1247312673 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    1247412674    fi
    … …  
    1247812678 
    1247912679-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
    12480 +   echo "$as_me:16397: checking if GNAT pragma Unreferenced works" >&5
     12680+   echo "$as_me:16425: checking if GNAT pragma Unreferenced works" >&5
    1248112681 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
    1248212682 
    1248312683 rm -f conftest*
    12484 @@ -16043,7 +16421,7 @@
     12684@@ -16043,7 +16449,7 @@
    1248512685 fi
    1248612686 rm -f conftest*
    1248712687 
    1248812688-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
    12489 +   echo "$as_me:16424: result: $cf_cv_pragma_unreferenced" >&5
     12689+   echo "$as_me:16452: result: $cf_cv_pragma_unreferenced" >&5
    1249012690 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
    1249112691 
    1249212692    # if the pragma is supported, use it (needed in the Trace code).
    12493 @@ -16096,7 +16474,7 @@
     12693@@ -16096,7 +16502,7 @@
    1249412694   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1249512695   ;;
    1249612696 *)
    1249712697-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
    12498 +  { { echo "$as_me:16477: error: expected a pathname, not \"$withval\"" >&5
     12698+  { { echo "$as_me:16505: error: expected a pathname, not \"$withval\"" >&5
    1249912699 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1250012700    { (exit 1); exit 1; }; }
    1250112701   ;;
    12502 @@ -16138,7 +16516,7 @@
     12702@@ -16138,7 +16544,7 @@
    1250312703   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1250412704   ;;
    1250512705 *)
    1250612706-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
    12507 +  { { echo "$as_me:16519: error: expected a pathname, not \"$withval\"" >&5
     12707+  { { echo "$as_me:16547: error: expected a pathname, not \"$withval\"" >&5
    1250812708 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1250912709    { (exit 1); exit 1; }; }
    1251012710   ;;
    12511 @@ -16163,7 +16541,7 @@
     12711@@ -16163,7 +16569,7 @@
    1251212712 ### chooses to split module lists into libraries.
    1251312713 ###
    1251412714 ### (see CF_LIB_RULES).
    1251512715-echo "$as_me:16166: checking for library subsets" >&5
    12516 +echo "$as_me:16544: checking for library subsets" >&5
     12716+echo "$as_me:16572: checking for library subsets" >&5
    1251712717 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
    1251812718 LIB_SUBSETS=
    1251912719 
    12520 @@ -16176,7 +16554,17 @@
     12720@@ -16176,7 +16582,17 @@
    1252112721        fi
    1252212722 fi
    … …  
    1253712737 if test "$with_termlib" != no ; then
    1253812738        LIB_SUBSETS="${LIB_SUBSETS} "
    12539 @@ -16185,17 +16573,18 @@
     12739@@ -16185,17 +16601,18 @@
    1254012740 fi
    1254112741 
    … …  
    1254612746 
    1254712747-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
    12548 +echo "$as_me:16580: result: $LIB_SUBSETS" >&5
     12748+echo "$as_me:16608: result: $LIB_SUBSETS" >&5
    1254912749 echo "${ECHO_T}$LIB_SUBSETS" >&6
    1255012750 
    … …  
    1255912759 if test "$GCC" != yes; then
    1256012760        CPPFLAGS="$CPPFLAGS -I\${includedir}"
    12561 @@ -16226,7 +16615,7 @@
     12761@@ -16226,7 +16643,7 @@
    1256212762 fi
    1256312763 
    1256412764 ### Build up pieces for makefile rules
    1256512765-echo "$as_me:16229: checking default library suffix" >&5
    12566 +echo "$as_me:16618: checking default library suffix" >&5
     12766+echo "$as_me:16646: checking default library suffix" >&5
    1256712767 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
    1256812768 
    1256912769        case $DFT_LWR_MODEL in
    12570 @@ -16237,46 +16626,50 @@
     12770@@ -16237,46 +16654,50 @@
    1257112771        shared)  DFT_ARG_SUFFIX=''   ;;
    1257212772        esac
    1257312773        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
    1257412774-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
    12575 +echo "$as_me:16629: result: $DFT_ARG_SUFFIX" >&5
     12775+echo "$as_me:16657: result: $DFT_ARG_SUFFIX" >&5
    1257612776 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
    1257712777 
    1257812778-echo "$as_me:16243: checking default library-dependency suffix" >&5
    12579 +echo "$as_me:16632: checking default library-dependency suffix" >&5
     12779+echo "$as_me:16660: checking default library-dependency suffix" >&5
    1258012780 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
    1258112781 
    … …  
    1263212832                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
    1263312833                                ;;
    12634 @@ -16289,10 +16682,10 @@
     12834@@ -16289,10 +16710,10 @@
    1263512835        esac
    1263612836        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
    1263712837        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
    1263812838-echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
    12639 +echo "$as_me:16685: result: $DFT_DEP_SUFFIX" >&5
     12839+echo "$as_me:16713: result: $DFT_DEP_SUFFIX" >&5
    1264012840 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
    1264112841 
    1264212842-echo "$as_me:16295: checking default object directory" >&5
    12643 +echo "$as_me:16688: checking default object directory" >&5
     12843+echo "$as_me:16716: checking default object directory" >&5
    1264412844 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
    1264512845 
    1264612846        case $DFT_LWR_MODEL in
    12647 @@ -16308,51 +16701,55 @@
     12847@@ -16308,51 +16729,55 @@
    1264812848                        DFT_OBJ_SUBDIR='obj_s' ;;
    1264912849                esac
    1265012850        esac
    1265112851-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
    12652 +echo "$as_me:16704: result: $DFT_OBJ_SUBDIR" >&5
     12852+echo "$as_me:16732: result: $DFT_OBJ_SUBDIR" >&5
    1265312853 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
    1265412854 
    … …  
    1265612856 if test "$cf_with_cxx" = yes ; then
    1265712857-echo "$as_me:16316: checking c++ library-dependency suffix" >&5
    12658 +echo "$as_me:16709: checking c++ library-dependency suffix" >&5
     12858+echo "$as_me:16737: checking c++ library-dependency suffix" >&5
    1265912859 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
    1266012860 if test "$with_libtool" != "no"; then
    … …  
    1271412914                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
    1271512915                                ;;
    12716 @@ -16366,7 +16763,7 @@
     12916@@ -16366,7 +16791,7 @@
    1271712917        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
    1271812918        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
    1271912919 fi
    1272012920-echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
    12721 +echo "$as_me:16766: result: $CXX_LIB_SUFFIX" >&5
     12921+echo "$as_me:16794: result: $CXX_LIB_SUFFIX" >&5
    1272212922 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
    1272312923 
    1272412924 fi
    12725 @@ -16480,7 +16877,7 @@
     12925@@ -16431,6 +16856,8 @@
     12926                TEST_ARGS="${TEST_DEPS}"
     12927                TEST_ARG2="${TEST_DEP2}"
     12928                TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
     12929+               TICS_LIST="$SHLIB_LIST $TEST_ARGS"
     12930+               SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
     12931        else
     12932                TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
     12933                TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
     12934@@ -16480,7 +16907,7 @@
    1272612935 
    1272712936 if test "$GCC" = yes ; then
    1272812937        case $cf_cv_system_name in #(
    1272912938-       OS/2*|os2*|aix[45]*)    #( vi
    12730 +       OS/2*|os2*|aix[4]*)     #( vi
     12939+       OS/2*|os2*|aix[4]*|solaris2.1[0-9])     #( vi
    1273112940                LDFLAGS_STATIC=
    1273212941                LDFLAGS_SHARED=
    1273312942                ;;
    12734 @@ -16491,7 +16888,7 @@
     12943@@ -16491,7 +16918,7 @@
    1273512944     esac
    1273612945 else
    … …  
    1274112950                LDFLAGS_SHARED=-bdynamic
    1274212951                ;;
    12743 @@ -16519,12 +16916,12 @@
     12952@@ -16519,12 +16946,12 @@
    1274412953        ;;
    1274512954 esac
    1274612955 
    1274712956-echo "$as_me:16522: checking where we will install curses.h" >&5
    12748 +echo "$as_me:16919: checking where we will install curses.h" >&5
     12957+echo "$as_me:16949: checking where we will install curses.h" >&5
    1274912958 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
    1275012959 test "$with_overwrite" = no && \
    … …  
    1275212961        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
    1275312962-echo "$as_me:16527: result: $includedir" >&5
    12754 +echo "$as_me:16924: result: $includedir" >&5
     12963+echo "$as_me:16954: result: $includedir" >&5
    1275512964 echo "${ECHO_T}$includedir" >&6
    1275612965 
    1275712966 ### Resolve a conflict between normal and wide-curses by forcing applications
    12758 @@ -16532,10 +16929,11 @@
     12967@@ -16532,10 +16959,11 @@
    1275912968 if test "$with_overwrite" != no ; then
    1276012969 if test "$NCURSES_LIBUTF8" = 1 ; then
    1276112970        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
    1276212971-       { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    12763 +       { echo "$as_me:16932: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
     12972+       { echo "$as_me:16962: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    1276412973 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
    1276512974 fi
    … …  
    1276912978 # used to separate tack out of the tree
    1277012979 NCURSES_TREE=
    12771 @@ -16548,7 +16946,7 @@
     12980@@ -16548,7 +16976,7 @@
    1277212981 ### Construct the list of subdirectories for which we'll customize makefiles
    1277312982 ### with the appropriate compile-rules.
    1277412983 
    1277512984-echo "$as_me:16551: checking for src modules" >&5
    12776 +echo "$as_me:16949: checking for src modules" >&5
     12985+echo "$as_me:16979: checking for src modules" >&5
    1277712986 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
    1277812987 
    1277912988 # dependencies and linker-arguments for test-programs
    12780 @@ -16611,13 +17009,17 @@
     12989@@ -16611,13 +17039,17 @@
    1278112990                fi
    1278212991        fi
    1278312992 done
    1278412993-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
    12785 +echo "$as_me:17012: result: $cf_cv_src_modules" >&5
     12994+echo "$as_me:17042: result: $cf_cv_src_modules" >&5
    1278612995 echo "${ECHO_T}$cf_cv_src_modules" >&6
    1278712996 
    … …  
    1279813007 do
    1279913008        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    12800 @@ -16628,8 +17030,8 @@
     13009@@ -16628,8 +17060,8 @@
    1280113010 
    1280213011 ADA_SUBDIRS=
    … …  
    1280913018 
    1281013019 SUB_MAKEFILES=
    12811 @@ -16639,15 +17041,15 @@
     13020@@ -16639,15 +17071,15 @@
    1281213021 done
    1281313022 
    … …  
    1283013039 
    1283113040 DIRS_TO_MAKE="lib"
    12832 @@ -16680,7 +17082,7 @@
     13041@@ -16680,7 +17112,7 @@
    1283313042 done
    1283413043 
    … …  
    1283913048 
    1284013049 cat >>confdefs.h <<EOF
    12841 @@ -16749,7 +17151,7 @@
     13050@@ -16749,7 +17181,7 @@
    1284213051 
    1284313052 if test -n "$cf_new_cppflags" ; then
    … …  
    1284813057 
    1284913058 if test -n "$cf_new_extra_cppflags" ; then
    12850 @@ -16760,18 +17162,18 @@
     13059@@ -16760,18 +17192,18 @@
    1285113060 ### If we're building with rpath, try to link non-standard libs that way too.
    1285213061 if test "$DFT_LWR_MODEL" = "shared"; then
    1285313062 
    1285413063-echo "$as_me:16763: checking for updated LDFLAGS" >&5
    12855 +echo "$as_me:17165: checking for updated LDFLAGS" >&5
     13064+echo "$as_me:17195: checking for updated LDFLAGS" >&5
    1285613065 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
    1285713066 if test -n "$LDFLAGS" ; then
    1285813067-echo "$as_me:16766: result: maybe" >&5
    12859 +echo "$as_me:17168: result: maybe" >&5
     13068+echo "$as_me:17198: result: maybe" >&5
    1286013069 echo "${ECHO_T}maybe" >&6
    1286113070 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
    1286213071 
    1286313072-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    12864 +echo "${as_me-configure}:17172: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
     13073+echo "${as_me-configure}:17202: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    1286513074 
    1286613075 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1286713076 
    1286813077-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12869 +echo "${as_me-configure}:17176: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     13078+echo "${as_me-configure}:17206: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1287013079 
    1287113080 case "$EXTRA_LDFLAGS" in #(vi
    1287213081 -Wl,-rpath,*) #(vi
    12873 @@ -16793,7 +17195,7 @@
     13082@@ -16793,7 +17225,7 @@
    1287413083        do
    1287513084                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
    1287613085 
    1287713086-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
    12878 +echo "${as_me-configure}:17198: testing Filtering $cf_rpath_src ..." 1>&5
     13087+echo "${as_me-configure}:17228: testing Filtering $cf_rpath_src ..." 1>&5
    1287913088 
    1288013089                case $cf_rpath_src in #(vi
    1288113090                -L*) #(vi
    12882 @@ -16804,7 +17206,7 @@
     13091@@ -16804,7 +17236,7 @@
    1288313092                        fi
    1288413093                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
    1288513094 
    1288613095-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
    12887 +echo "${as_me-configure}:17209: testing ...Filter $cf_rpath_tmp ..." 1>&5
     13096+echo "${as_me-configure}:17239: testing ...Filter $cf_rpath_tmp ..." 1>&5
    1288813097 
    1288913098                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
    1289013099                        ;;
    12891 @@ -16814,15 +17216,15 @@
     13100@@ -16814,15 +17246,15 @@
    1289213101        LDFLAGS=$cf_rpath_dst
    1289313102        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
    1289413103 
    1289513104-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    12896 +echo "${as_me-configure}:17219: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
     13105+echo "${as_me-configure}:17249: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    1289713106 
    1289813107        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1289913108 
    1290013109-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12901 +echo "${as_me-configure}:17223: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     13110+echo "${as_me-configure}:17253: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1290213111 
    1290313112 fi
    1290413113 else
    1290513114-echo "$as_me:16825: result: no" >&5
    12906 +echo "$as_me:17227: result: no" >&5
     13115+echo "$as_me:17257: result: no" >&5
    1290713116 echo "${ECHO_T}no" >&6
    1290813117 fi
    1290913118 
    12910 @@ -16849,8 +17251,18 @@
     13119@@ -16849,8 +17281,18 @@
    1291113120 fi
    1291213121 
    … …  
    1292813137 ac_config_commands="$ac_config_commands default"
    1292913138 cat >confcache <<\_ACEOF
    12930 @@ -16932,7 +17344,7 @@
     13139@@ -16932,7 +17374,7 @@
    1293113140 : ${CONFIG_STATUS=./config.status}
    1293213141 ac_clean_files_save=$ac_clean_files
    1293313142 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    1293413143-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
    12935 +{ echo "$as_me:17347: creating $CONFIG_STATUS" >&5
     13144+{ echo "$as_me:17377: creating $CONFIG_STATUS" >&5
    1293613145 echo "$as_me: creating $CONFIG_STATUS" >&6;}
    1293713146 cat >$CONFIG_STATUS <<_ACEOF
    1293813147 #! $SHELL
    12939 @@ -17064,7 +17476,7 @@
     13148@@ -17064,7 +17506,7 @@
    1294013149 cat >>$CONFIG_STATUS <<EOF
    1294113150 ac_cs_version="\\
    … …  
    1294613155 
    1294713156 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
    12948 @@ -17108,7 +17520,7 @@
     13157@@ -17108,7 +17550,7 @@
    1294913158     echo "$ac_cs_version"; exit 0 ;;
    1295013159   --he | --h)
    1295113160     # Conflict between --help and --header
    1295213161-    { { echo "$as_me:17111: error: ambiguous option: $1
    12953 +    { { echo "$as_me:17523: error: ambiguous option: $1
     13162+    { { echo "$as_me:17553: error: ambiguous option: $1
    1295413163 Try \`$0 --help' for more information." >&5
    1295513164 echo "$as_me: error: ambiguous option: $1
    1295613165 Try \`$0 --help' for more information." >&2;}
    12957 @@ -17127,7 +17539,7 @@
     13166@@ -17127,7 +17569,7 @@
    1295813167     ac_need_defaults=false;;
    1295913168 
    1296013169   # This is an error.
    1296113170-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
    12962 +  -*) { { echo "$as_me:17542: error: unrecognized option: $1
     13171+  -*) { { echo "$as_me:17572: error: unrecognized option: $1
    1296313172 Try \`$0 --help' for more information." >&5
    1296413173 echo "$as_me: error: unrecognized option: $1
    1296513174 Try \`$0 --help' for more information." >&2;}
    12966 @@ -17146,7 +17558,7 @@
     13175@@ -17146,7 +17588,7 @@
    1296713176 ## Running config.status.  ##
    1296813177 ## ----------------------- ##
    … …  
    1297313182   CONFIG_HEADERS  = $CONFIG_HEADERS
    1297413183   CONFIG_LINKS    = $CONFIG_LINKS
    12975 @@ -17181,13 +17593,13 @@
     13184@@ -17181,13 +17623,13 @@
    1297613185 NCURSES_PATCH="$NCURSES_PATCH"
    1297713186 SRC_SUBDIRS="$SRC_SUBDIRS"
    … …  
    1299013199 WITH_ECHO="$with_echo"
    1299113200 WITH_OVERWRITE="$with_overwrite"
    12992 @@ -17206,6 +17618,7 @@
     13201@@ -17206,6 +17648,7 @@
    1299313202 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1299413203 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1299813207 target="$target"
    1299913208 
    13000 @@ -17224,7 +17637,7 @@
     13209@@ -17224,7 +17667,7 @@
    1300113210   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1300213211   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    1300313212   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
    1300413213-  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
    13005 +  *) { { echo "$as_me:17640: error: invalid argument: $ac_config_target" >&5
     13214+  *) { { echo "$as_me:17670: error: invalid argument: $ac_config_target" >&5
    1300613215 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    1300713216    { (exit 1); exit 1; }; };;
    1300813217   esac
    13009 @@ -17349,6 +17762,8 @@
     13218@@ -17349,6 +17792,8 @@
    1301013219 s,@LINT@,$LINT,;t t
    1301113220 s,@LINT_OPTS@,$LINT_OPTS,;t t
    … …  
    1301613225 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
    1301713226 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
    13018 @@ -17359,7 +17774,7 @@
     13227@@ -17359,7 +17804,7 @@
    1301913228 s,@ac_ct_LD@,$ac_ct_LD,;t t
    1302013229 s,@AR@,$AR,;t t
    … …  
    1302513234 s,@BUILD_CC@,$BUILD_CC,;t t
    1302613235 s,@BUILD_CPP@,$BUILD_CPP,;t t
    13027 @@ -17392,6 +17807,7 @@
     13236@@ -17392,6 +17837,7 @@
    1302813237 s,@CXX_G_OPT@,$CXX_G_OPT,;t t
    1302913238 s,@LD_MODEL@,$LD_MODEL,;t t
    … …  
    1303313242 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
    1303413243 s,@LINK_PROGS@,$LINK_PROGS,;t t
    13035 @@ -17401,7 +17817,6 @@
     13244@@ -17401,7 +17847,6 @@
    1303613245 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
    1303713246 s,@INSTALL_LIB@,$INSTALL_LIB,;t t
    … …  
    1304113250 s,@WHICH_XTERM@,$WHICH_XTERM,;t t
    1304213251 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
    13043 @@ -17425,6 +17840,9 @@
     13252@@ -17425,6 +17870,9 @@
    1304413253 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
    1304513254 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
    … …  
    1305113260 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
    1305213261 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
    13053 @@ -17449,7 +17867,7 @@
     13262@@ -17435,6 +17883,7 @@
     13263 s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
     13264 s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
     13265 s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t
     13266+s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
     13267 s,@ECHO_LINK@,$ECHO_LINK,;t t
     13268 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
     13269 s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t
     13270@@ -17449,7 +17898,7 @@
    1305413271 s,@CXXCPP@,$CXXCPP,;t t
    1305513272 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
    … …  
    1306013277 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
    1306113278 s,@gnat_exists@,$gnat_exists,;t t
    13062 @@ -17493,6 +17911,7 @@
     13279@@ -17493,6 +17942,7 @@
    1306313280 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
    1306413281 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
    … …  
    1306813285 
    1306913286 EOF
    13070 @@ -17607,7 +18026,7 @@
     13287@@ -17607,7 +18057,7 @@
    1307113288   esac
    1307213289 
    1307313290   if test x"$ac_file" != x-; then
    1307413291-    { echo "$as_me:17610: creating $ac_file" >&5
    13075 +    { echo "$as_me:18029: creating $ac_file" >&5
     13292+    { echo "$as_me:18060: creating $ac_file" >&5
    1307613293 echo "$as_me: creating $ac_file" >&6;}
    1307713294     rm -f "$ac_file"
    1307813295   fi
    13079 @@ -17625,7 +18044,7 @@
     13296@@ -17625,7 +18075,7 @@
    1308013297       -) echo $tmp/stdin ;;
    1308113298       [\\/$]*)
    1308213299          # Absolute (can't be DOS-style, as IFS=:)
    1308313300-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
    13084 +         test -f "$f" || { { echo "$as_me:18047: error: cannot find input file: $f" >&5
     13301+         test -f "$f" || { { echo "$as_me:18078: error: cannot find input file: $f" >&5
    1308513302 echo "$as_me: error: cannot find input file: $f" >&2;}
    1308613303    { (exit 1); exit 1; }; }
    1308713304          echo $f;;
    13088 @@ -17638,7 +18057,7 @@
     13305@@ -17638,7 +18088,7 @@
    1308913306            echo $srcdir/$f
    1309013307          else
    1309113308            # /dev/null tree
    1309213309-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
    13093 +           { { echo "$as_me:18060: error: cannot find input file: $f" >&5
     13310+           { { echo "$as_me:18091: error: cannot find input file: $f" >&5
    1309413311 echo "$as_me: error: cannot find input file: $f" >&2;}
    1309513312    { (exit 1); exit 1; }; }
    1309613313          fi;;
    13097 @@ -17704,7 +18123,7 @@
     13314@@ -17704,7 +18154,7 @@
    1309813315   * )   ac_file_in=$ac_file.in ;;
    1309913316   esac
    1310013317 
    1310113318-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
    13102 +  test x"$ac_file" != x- && { echo "$as_me:18126: creating $ac_file" >&5
     13319+  test x"$ac_file" != x- && { echo "$as_me:18157: creating $ac_file" >&5
    1310313320 echo "$as_me: creating $ac_file" >&6;}
    1310413321 
    1310513322   # First look for the input files in the build tree, otherwise in the
    13106 @@ -17715,7 +18134,7 @@
     13323@@ -17715,7 +18165,7 @@
    1310713324       -) echo $tmp/stdin ;;
    1310813325       [\\/$]*)
    1310913326          # Absolute (can't be DOS-style, as IFS=:)
    1311013327-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
    13111 +         test -f "$f" || { { echo "$as_me:18137: error: cannot find input file: $f" >&5
     13328+         test -f "$f" || { { echo "$as_me:18168: error: cannot find input file: $f" >&5
    1311213329 echo "$as_me: error: cannot find input file: $f" >&2;}
    1311313330    { (exit 1); exit 1; }; }
    1311413331          echo $f;;
    13115 @@ -17728,7 +18147,7 @@
     13332@@ -17728,7 +18178,7 @@
    1311613333            echo $srcdir/$f
    1311713334          else
    1311813335            # /dev/null tree
    1311913336-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
    13120 +           { { echo "$as_me:18150: error: cannot find input file: $f" >&5
     13337+           { { echo "$as_me:18181: error: cannot find input file: $f" >&5
    1312113338 echo "$as_me: error: cannot find input file: $f" >&2;}
    1312213339    { (exit 1); exit 1; }; }
    1312313340          fi;;
    13124 @@ -17786,7 +18205,7 @@
     13341@@ -17786,7 +18236,7 @@
    1312513342   rm -f $tmp/in
    1312613343   if test x"$ac_file" != x-; then
    1312713344     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
    1312813345-      { echo "$as_me:17789: $ac_file is unchanged" >&5
    13129 +      { echo "$as_me:18208: $ac_file is unchanged" >&5
     13346+      { echo "$as_me:18239: $ac_file is unchanged" >&5
    1313013347 echo "$as_me: $ac_file is unchanged" >&6;}
    1313113348     else
    1313213349       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    13133 @@ -17873,40 +18292,44 @@
     13350@@ -17873,40 +18323,44 @@
    1313413351                for cf_item in $cf_LIST_MODELS
    1313513352                do
    … …  
    1318713404                                cf_depsuf=$cf_suffix
    1318813405                                ;;
    13189 @@ -18020,40 +18443,44 @@
     13406@@ -18020,40 +18474,44 @@
    1319013407 
    1319113408 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    … …  
    1324313460                                cf_depsuf=$cf_suffix
    1324413461                                ;;
    13245 @@ -18234,18 +18661,28 @@
     13462@@ -18234,18 +18692,28 @@
    1324613463 install.libs uninstall.libs \\
    1324713464 install.data uninstall.data ::
    … …  
    1327213489 if test -f $srcdir/$tack.h; then
    1327313490 cat >> Makefile <<CF_EOF
    13274 @@ -18256,6 +18693,7 @@
     13491@@ -18256,6 +18724,7 @@
    1327513492 CF_EOF
    1327613493 fi
    … …  
    1328213499diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
    1328313500--- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
    13284 +++ ncurses-5.7/configure.in    2009-02-28 20:38:57.043235088 -0800
     13501+++ ncurses-5.7/configure.in    2009-03-22 21:17:11.636377985 -0700
    1328513502@@ -1,5 +1,5 @@
    1328613503 dnl***************************************************************************
    … …  
    1329513512 dnl
    1329613513-dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
    13297 +dnl $Id: configure.in,v 1.466 2009/02/15 00:19:01 tom Exp $
     13514+dnl $Id: configure.in,v 1.469 2009/03/21 21:45:29 Charles.Wilson Exp $
    1329813515 dnl Process this file with autoconf to produce a configure script.
    1329913516 dnl
    … …  
    1330313520 AC_PREREQ(2.13.20020210)
    1330413521-AC_REVISION($Revision: 1.454 $)
    13305 +AC_REVISION($Revision: 1.466 $)
     13522+AC_REVISION($Revision: 1.469 $)
    1330613523 AC_INIT(ncurses/base/lib_initscr.c)
    1330713524 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
    … …  
    1340213619 ###   use option --enable-const to turn on use of const beyond that in XSI.
    1340313620 AC_MSG_CHECKING(for extended use of const keyword)
    13404 @@ -1165,12 +1217,18 @@
     13621@@ -1024,11 +1076,11 @@
     13622        cf_cv_enable_opaque="NCURSES_INTERNALS"
     13623        NCURSES_OPAQUE=1
     13624        NCURSES_SIZE_T=int
     13625-    if test $cf_cv_weak_symbols = yes ; then
     13626-        CF_REMOVE_LIB(LIBS,$LIBS,pthread)
     13627-    else
     13628-        LIB_SUFFIX="t${LIB_SUFFIX}"
     13629-    fi
     13630+       if test $cf_cv_weak_symbols = yes ; then
     13631+               CF_REMOVE_LIB(LIBS,$LIBS,pthread)
     13632+       else
     13633+               LIB_SUFFIX="t${LIB_SUFFIX}"
     13634+       fi
     13635        AC_DEFINE(USE_REENTRANT)
     13636        CF_NCURSES_ABI_6
     13637 else
     13638@@ -1042,6 +1094,20 @@
     13639 AC_SUBST(NCURSES_OPAQUE)
     13640 AC_SUBST(NCURSES_SIZE_T)
     13641 
     13642+### Allow using a different wrap-prefix
     13643+if test "$cf_cv_enable_reentrant" != 0 ; then
     13644+       AC_MSG_CHECKING(for prefix used to wrap public variables)
     13645+       AC_ARG_WITH(wrap-prefix,
     13646+               [  --with-wrap-prefix=XXX  override prefix used for public variables],
     13647+               [NCURSES_WRAP_PREFIX=$withval],
     13648+               [NCURSES_WRAP_PREFIX=_nc_])
     13649+       AC_MSG_RESULT($NCURSES_WRAP_PREFIX)
     13650+else
     13651+       NCURSES_WRAP_PREFIX=_nc_
     13652+fi
     13653+AC_SUBST(NCURSES_WRAP_PREFIX)
     13654+AC_DEFINE_UNQUOTED(NCURSES_WRAP_PREFIX,"$NCURSES_WRAP_PREFIX")
     13655+
     13656 AC_MSG_CHECKING(if you want experimental safe-sprintf code)
     13657 AC_ARG_ENABLE(safe-sprintf,
     13658        [  --enable-safe-sprintf   compile with experimental safe-sprintf code],
     13659@@ -1165,12 +1231,18 @@
    1340513660 AC_SUBST(ADA_TRACE)
    1340613661 
    … …  
    1342113676 CF_MATH_LIB(MATH_LIB,sin(x))
    1342213677 AC_SUBST(MATH_LIB)
    13423 @@ -1354,12 +1412,12 @@
     13678@@ -1354,12 +1426,12 @@
    1342413679        CF_CPP_STATIC_CAST
    1342513680 
    … …  
    1343613691            ;;
    1343713692        sco3.2v5*) #(vi
    13438 @@ -1368,13 +1426,13 @@
     13693@@ -1368,13 +1440,13 @@
    1343913694        solaris2*)
    1344013695            if test "$GXX" != yes ; then
    … …  
    1345213707        cf_cxx_library=no
    1345313708        cf_cv_builtin_bool=1
    13454 @@ -1552,7 +1610,17 @@
     13709@@ -1552,7 +1624,17 @@
    1345513710        fi
    1345613711 fi
    … …  
    1347113726 if test "$with_termlib" != no ; then
    1347213727        LIB_SUBSETS="${LIB_SUBSETS} "
    13473 @@ -1561,6 +1629,7 @@
     13728@@ -1561,6 +1643,7 @@
    1347413729 fi
    1347513730 
    … …  
    1347913734 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
    1348013735 
    13481 @@ -1723,6 +1792,7 @@
     13736@@ -1656,6 +1739,8 @@
     13737                TEST_ARGS="${TEST_DEPS}"
     13738                TEST_ARG2="${TEST_DEP2}"
     13739                TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
     13740+               TICS_LIST="$SHLIB_LIST $TEST_ARGS"
     13741+               SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
     13742        else
     13743                TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
     13744                TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
     13745@@ -1723,6 +1808,7 @@
    1348213746        AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
    1348313747 fi
    … …  
    1348713751 AC_SUBST(WITH_OVERWRITE)
    1348813752 AC_SUBST(TICS_LIST)
    13489 @@ -1742,12 +1812,12 @@
     13753@@ -1742,12 +1828,12 @@
    1349013754 CF_SRC_MODULES($modules_to_build)
    1349113755 
    … …  
    1350213766 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}")
    1350313767 
    13504 @@ -1765,8 +1835,19 @@
     13768@@ -1765,8 +1851,19 @@
    1350513769 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
    1350613770 
    … …  
    1352313787        include/MKterm.h.awk \
    1352413788        include/curses.head:include/curses.h.in \
    13525 @@ -1796,13 +1877,13 @@
     13789@@ -1796,13 +1893,13 @@
    1352613790 NCURSES_PATCH="$NCURSES_PATCH"
    1352713791 SRC_SUBDIRS="$SRC_SUBDIRS"
    … …  
    1354013804 WITH_ECHO="$with_echo"
    1354113805 WITH_OVERWRITE="$with_overwrite"
    13542 @@ -1821,6 +1902,7 @@
     13806@@ -1821,6 +1918,7 @@
    1354313807 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1354413808 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1355013814diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
    1355113815--- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
    13552 +++ ncurses-5.7/dist.mk 2009-02-28 20:38:59.855417236 -0800
     13816+++ ncurses-5.7/dist.mk 2009-03-22 21:17:11.636377985 -0700
    1355313817@@ -25,7 +25,7 @@
    1355413818 # use or other dealings in this Software without prior written               #
    … …  
    1355613820 ##############################################################################
    1355713821-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
    13558 +# $Id: dist.mk,v 1.688 2009/02/28 14:49:13 tom Exp $
     13822+# $Id: dist.mk,v 1.690 2009/03/21 18:31:13 tom Exp $
    1355913823 # Makefile for creating ncurses distributions.
    1356013824 #
    … …  
    1356513829 NCURSES_MINOR = 7
    1356613830-NCURSES_PATCH = 20081102
    13567 +NCURSES_PATCH = 20090228
     13831+NCURSES_PATCH = 20090321
    1356813832 
    1356913833 # We don't append the patch to the version, since this only applies to releases
    … …  
    1357113835diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c
    1357213836--- ncurses-5.7.orig/form/fld_def.c     2007-10-13 12:29:58.000000000 -0700
    13573 +++ ncurses-5.7/form/fld_def.c  2009-02-28 20:38:59.855417236 -0800
     13837+++ ncurses-5.7/form/fld_def.c  2009-03-22 21:17:08.396170694 -0700
    1357413838@@ -32,7 +32,7 @@
    1357513839 
    … …  
    1359313857diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
    1359413858--- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
    13595 +++ ncurses-5.7/form/frm_driver.c       2009-02-28 20:38:39.770130185 -0800
     13859+++ ncurses-5.7/form/frm_driver.c       2009-03-22 21:16:49.034929738 -0700
    1359613860@@ -32,7 +32,7 @@
    1359713861 
    … …  
    1361313877diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
    1361413878--- ncurses-5.7.orig/form/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13615 +++ ncurses-5.7/form/Makefile.in        2009-02-28 20:38:46.310547562 -0800
     13879+++ ncurses-5.7/form/Makefile.in        2009-03-22 21:16:55.671355217 -0700
    1361613880@@ -1,6 +1,6 @@
    1361713881-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
    … …  
    1363413898diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c
    1363513899--- ncurses-5.7.orig/include/capdefaults.c      2008-08-04 05:33:42.000000000 -0700
    13636 +++ ncurses-5.7/include/capdefaults.c   2009-02-28 20:38:58.435326721 -0800
     13900+++ ncurses-5.7/include/capdefaults.c   2009-03-22 21:17:07.012081575 -0700
    1363713901@@ -32,7 +32,7 @@
    1363813902  *     and: Thomas E. Dickey                        1996-on                 *
    … …  
    1366013924diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
    1366113925--- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
    13662 +++ ncurses-5.7/include/curses.h.in     2009-02-28 20:38:58.435326721 -0800
     13926+++ ncurses-5.7/include/curses.h.in     2009-03-22 21:17:11.636377985 -0700
    1366313927@@ -1,5 +1,5 @@
    1366413928 /****************************************************************************
    … …  
    1367313937 
    1367413938-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
    13675 +/* $Id: curses.h.in,v 1.194 2009/02/21 22:44:41 tom Exp $ */
     13939+/* $Id: curses.h.in,v 1.195 2009/03/21 21:04:57 tom Exp $ */
    1367613940 
    1367713941 #ifndef __NCURSES_H
    … …  
    1369013954 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
    1369113955 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
    13692 @@ -110,6 +104,13 @@
     13956@@ -110,6 +104,20 @@
    1369313957 #endif
    1369413958 
    … …  
    1370113965+
    1370213966+/*
     13967+ * For reentrant code, we map the various global variables into SCREEN by
     13968+ * using functions to access them.
     13969+ */
     13970+#define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name
     13971+#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
     13972+
     13973+/*
    1370313974  * The internal type used for window dimensions.
    1370413975  */
    1370513976 #undef NCURSES_SIZE_T
    13706 @@ -224,7 +225,7 @@
     13977@@ -224,9 +232,9 @@
    1370713978 
    1370813979 /* line graphics */
    … …  
    1371113982+#if @BROKEN_LINKER@ || NCURSES_REENTRANT
    1371213983 NCURSES_WRAPPED_VAR(chtype*, acs_map);
    13713  #define acs_map (_nc_acs_map())
     13984-#define acs_map (_nc_acs_map())
     13985+#define acs_map NCURSES_PUBLIC_VAR(acs_map())
    1371413986 #else
    13715 @@ -646,7 +647,7 @@
     13987 extern NCURSES_EXPORT_VAR(chtype) acs_map[];
     13988 #endif
     13989@@ -646,7 +654,7 @@
    1371613990 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);                /* generated */
    1371713991 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);              /* generated */
    … …  
    1372213996 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)       /* implemented */
    1372313997                GCC_PRINTFLIKE(4,5);
    13724 @@ -654,9 +655,9 @@
     13998@@ -654,9 +662,9 @@
    1372513999                GCC_SCANFLIKE(4,5);
    1372614000 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);  /* generated */
    … …  
    1373414008 extern NCURSES_EXPORT(int) nocbreak (void);                            /* implemented */
    1373514009 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);                    /* implemented */
    13736 @@ -710,7 +711,7 @@
     14010@@ -710,7 +718,7 @@
    1373714011 extern NCURSES_EXPORT(int) slk_refresh (void);                         /* implemented */
    1373814012 extern NCURSES_EXPORT(int) slk_restore (void);                         /* implemented */
    … …  
    1374314017 extern NCURSES_EXPORT(int) standend (void);                            /* generated */
    1374414018 extern NCURSES_EXPORT(int) start_color (void);                         /* implemented */
    13745 @@ -856,23 +857,119 @@
     14019@@ -856,23 +864,119 @@
    1374614020  * These extensions provide access to information stored in the WINDOW even
    1374714021  * when NCURSES_OPAQUE is set:
    … …  
    1387514149 
    1387614150 #define NCURSES_ATTR_SHIFT       8
    13877 @@ -1173,7 +1270,7 @@
     14151@@ -1173,7 +1277,7 @@
    1387814152  *        It gives the ESC expire time in milliseconds.
    1387914153  *     b. ttytype is needed for backward compatibility
    … …  
    1388614160diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
    1388714161--- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
    13888 +++ ncurses-5.7/include/curses.tail     2009-02-28 20:38:37.161961447 -0800
     14162+++ ncurses-5.7/include/curses.tail     2009-03-22 21:16:46.494768822 -0700
    1388914163@@ -1,4 +1,4 @@
    1389014164-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
    … …  
    1390314177diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
    1390414178--- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
    13905 +++ ncurses-5.7/include/curses.wide     2009-02-28 20:38:38.454044419 -0800
     14179+++ ncurses-5.7/include/curses.wide     2009-03-22 21:16:47.770848442 -0700
    1390614180@@ -1,9 +1,11 @@
    1390714181-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
    … …  
    1391914193diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in
    1392014194--- ncurses-5.7.orig/include/MKterm.h.awk.in    2008-05-24 16:13:59.000000000 -0700
    13921 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-02-28 20:38:59.855417236 -0800
     14195+++ ncurses-5.7/include/MKterm.h.awk.in 2009-03-22 21:17:08.396170694 -0700
    1392214196@@ -1,7 +1,7 @@
    1392314197 # vile:awkmode
    … …  
    1397314247                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
    1397414248                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
     14249diff -Naur ncurses-5.7.orig/include/ncurses_dll.h ncurses-5.7/include/ncurses_dll.h
     14250--- ncurses-5.7.orig/include/ncurses_dll.h      2007-03-10 11:21:49.000000000 -0800
     14251+++ ncurses-5.7/include/ncurses_dll.h   2009-03-22 21:17:11.636377985 -0700
     14252@@ -1,5 +1,5 @@
     14253 /****************************************************************************
     14254- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
     14255+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     14256  *                                                                          *
     14257  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14258  * copy of this software and associated documentation files (the            *
     14259@@ -25,7 +25,7 @@
     14260  * sale, use or other dealings in this Software without prior written       *
     14261  * authorization.                                                           *
     14262  ****************************************************************************/
     14263-/* $Id: ncurses_dll.h,v 1.6 2007/03/10 19:21:49 tom Exp $ */
     14264+/* $Id: ncurses_dll.h,v 1.7 2009/03/21 18:55:22 tom Exp $ */
     14265 
     14266 #ifndef NCURSES_DLL_H_incl
     14267 #define NCURSES_DLL_H_incl 1
     14268@@ -76,11 +76,4 @@
     14269 #  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
     14270 #endif
     14271 
     14272-/*
     14273- * For reentrant code, we map the various global variables into SCREEN by
     14274- * using functions to access them.
     14275- */
     14276-#define NCURSES_PUBLIC_VAR(name) _nc_##name
     14277-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
     14278-
     14279 #endif /* NCURSES_DLL_H_incl */
    1397514280diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    1397614281--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    13977 +++ ncurses-5.7/INSTALL 2009-02-28 20:38:46.282546444 -0800
     14282+++ ncurses-5.7/INSTALL 2009-03-22 21:17:11.612376588 -0700
    1397814283@@ -1,5 +1,5 @@
    1397914284 -------------------------------------------------------------------------------
    … …  
    1398814293 -------------------------------------------------------------------------------
    1398914294--- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
    13990 +-- $Id: INSTALL,v 1.137 2009/01/03 23:59:23 tom Exp $
     14295+-- $Id: INSTALL,v 1.138 2009/03/21 20:23:29 tom Exp $
    1399114296 ---------------------------------------------------------------------
    1399214297              How to install Ncurses/Terminfo on your system
    … …  
    1401414319        Generate profile-libraries These are named by adding "_p" to the root,
    1401514320        e.g., libncurses_p.a
    14016 @@ -975,6 +983,9 @@
     14321@@ -946,6 +954,17 @@
     14322        For testing, compile with debug option.
     14323        This also sets the --disable-leaks option.
     14324 
     14325+    --with-wrap-prefix=XXX
     14326+       When using the --enable-reentrant option, ncurses redefines variables
     14327+       that would be global in curses, e.g., LINES, as a macro that calls a
     14328+       "wrapping" function which fetches the data from the current SCREEN
     14329+       structure.  Normally that function is named by prepending "_nc_" to the
     14330+       variable's name.  The function is technically private (since portable
     14331+       applications would not refer directly to it).  But according to one
     14332+       line of reasoning, it is not the same type of "private" as functions
     14333+       which applications should not call even via a macro.  This configure
     14334+       option lets you choose the prefix for these wrapped variables.
     14335+
     14336     --without-ada
     14337        Suppress the configure script's check for Ada95, do not build the
     14338        Ada95 binding and related demo.
     14339@@ -975,6 +994,9 @@
    1401714340     --without-dlsym
    1401814341        Do not use dlsym() to load GPM dynamically.
    … …  
    1402614349diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
    1402714350--- ncurses-5.7.orig/man/curs_color.3x  2005-12-17 16:00:37.000000000 -0800
    14028 +++ ncurses-5.7/man/curs_color.3x       2009-02-28 20:38:53.014978628 -0800
     14351+++ ncurses-5.7/man/curs_color.3x       2009-03-22 21:17:02.195775108 -0700
    1402914352@@ -1,5 +1,5 @@
    1403014353 .\"***************************************************************************
    … …  
    1405714380diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
    1405814381--- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
    14059 +++ ncurses-5.7/man/curs_mouse.3x       2009-02-28 20:38:37.161961447 -0800
     14382+++ ncurses-5.7/man/curs_mouse.3x       2009-03-22 21:16:46.494768822 -0700
    1406014383@@ -1,6 +1,6 @@
    1406114384 '\" t
    … …  
    1410314426diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
    1410414427--- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
    14105 +++ ncurses-5.7/man/keybound.3x 2009-02-28 20:38:41.374231037 -0800
     14428+++ ncurses-5.7/man/keybound.3x 2009-03-22 21:16:50.643032825 -0700
    1410614429@@ -1,5 +1,5 @@
    1410714430 .\"***************************************************************************
    … …  
    1412414447diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
    1412514448--- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
    14126 +++ ncurses-5.7/man/tabs.1      2009-02-28 20:38:35.777872887 -0800
     14449+++ ncurses-5.7/man/tabs.1      2009-03-22 21:16:45.114678865 -0700
    1412714450@@ -0,0 +1,143 @@
    1412814451+.\"***************************************************************************
    … …  
    1427114594diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
    1427214595--- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
    14273 +++ ncurses-5.7/man/tset.1      2009-02-28 20:38:35.777872887 -0800
     14596+++ ncurses-5.7/man/tset.1      2009-03-22 21:16:45.114678865 -0700
    1427414597@@ -1,5 +1,5 @@
    1427514598 .\"***************************************************************************
    … …  
    1429214615diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    1429314616--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    14294 +++ ncurses-5.7/MANIFEST        2009-02-28 20:38:46.282546444 -0800
     14617+++ ncurses-5.7/MANIFEST        2009-03-22 21:17:09.900267355 -0700
    1429514618@@ -640,6 +640,7 @@
    1429614619 ./man/ncurses.3x
    … …  
    1430914632 ./misc/jpf-indent
    1431014633 ./misc/makedef.cmd
    14311 @@ -947,6 +949,7 @@
     14634@@ -947,9 +949,11 @@
    1431214635 ./progs/infocmp.c
    1431314636 ./progs/modules
    … …  
    1431714640 ./progs/toe.c
    1431814641 ./progs/tput.c
    14319 @@ -963,6 +966,7 @@
     14642+./progs/transform.c
     14643 ./progs/tset.c
     14644 ./tar-copy.sh
     14645 ./test/Makefile.in
     14646@@ -963,6 +967,7 @@
    1432014647 ./test/cardfile.c
    1432114648 ./test/cardfile.dat
    … …  
    1432514652 ./test/configure
    1432614653 ./test/configure.in
    14327 @@ -990,6 +994,7 @@
     14654@@ -990,6 +995,7 @@
    1432814655 ./test/inch_wide.c
    1432914656 ./test/inchs.c
    … …  
    1433514662diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
    1433614663--- ncurses-5.7.orig/menu/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    14337 +++ ncurses-5.7/menu/Makefile.in        2009-02-28 20:38:46.310547562 -0800
     14664+++ ncurses-5.7/menu/Makefile.in        2009-03-22 21:16:55.671355217 -0700
    1433814665@@ -1,6 +1,6 @@
    1433914666-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
    … …  
    1435614683diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c
    1435714684--- ncurses-5.7.orig/menu/m_cursor.c    2005-10-22 16:03:32.000000000 -0700
    14358 +++ ncurses-5.7/menu/m_cursor.c 2009-02-28 20:38:59.855417236 -0800
     14685+++ ncurses-5.7/menu/m_cursor.c 2009-03-22 21:17:08.396170694 -0700
    1435914686@@ -1,5 +1,5 @@
    1436014687 /****************************************************************************
    … …  
    1438414711diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c
    1438514712--- ncurses-5.7.orig/menu/m_driver.c    2008-08-03 15:08:22.000000000 -0700
    14386 +++ ncurses-5.7/menu/m_driver.c 2009-02-28 20:38:59.855417236 -0800
     14713+++ ncurses-5.7/menu/m_driver.c 2009-03-22 21:17:08.396170694 -0700
    1438714714@@ -1,5 +1,5 @@
    1438814715 /****************************************************************************
    … …  
    1441214739diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h
    1441314740--- ncurses-5.7.orig/menu/menu.priv.h   2005-01-15 17:02:23.000000000 -0800
    14414 +++ ncurses-5.7/menu/menu.priv.h        2009-02-28 20:38:59.859415560 -0800
     14741+++ ncurses-5.7/menu/menu.priv.h        2009-03-22 21:17:08.396170694 -0700
    1441514742@@ -1,5 +1,5 @@
    1441614743 /****************************************************************************
    … …  
    1444514772diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c
    1444614773--- ncurses-5.7.orig/menu/m_global.c    2005-12-31 13:51:52.000000000 -0800
    14447 +++ ncurses-5.7/menu/m_global.c 2009-02-28 20:38:59.855417236 -0800
     14774+++ ncurses-5.7/menu/m_global.c 2009-03-22 21:17:08.396170694 -0700
    1444814775@@ -1,5 +1,5 @@
    1444914776 /****************************************************************************
    … …  
    1448614813diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c
    1448714814--- ncurses-5.7.orig/menu/m_post.c      2004-12-25 15:57:04.000000000 -0800
    14488 +++ ncurses-5.7/menu/m_post.c   2009-02-28 20:38:59.855417236 -0800
     14815+++ ncurses-5.7/menu/m_post.c   2009-03-22 21:17:08.396170694 -0700
    1448914816@@ -1,5 +1,5 @@
    1449014817 /****************************************************************************
    … …  
    1452314850diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
    1452414851--- ncurses-5.7.orig/misc/gen-pkgconfig.in      1969-12-31 16:00:00.000000000 -0800
    14525 +++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-28 20:38:53.014978628 -0800
    14526 @@ -0,0 +1,119 @@
     14852+++ ncurses-5.7/misc/gen-pkgconfig.in   2009-03-22 21:17:09.916267635 -0700
     14853@@ -0,0 +1,140 @@
    1452714854+#!@SHELL@
    14528 +# $Id: gen-pkgconfig.in,v 1.5 2009/01/24 21:06:36 tom Exp $
     14855+# $Id: gen-pkgconfig.in,v 1.7 2009/03/14 20:37:54 tom Exp $
    1452914856+##############################################################################
    1453014857+# Copyright (c) 2009 Free Software Foundation, Inc.                          #
    … …  
    1456614893+LIB_NAME=@LIB_NAME@
    1456714894+TINFO_NAME=@TINFO_NAME@
     14895+PANEL_NAME=panel # @PANEL_NAME@
     14896+MENU_NAME=menu # @MENU_NAME@
     14897+FORM_NAME=form # @FORM_NAME@
     14898+CXX_NAME=ncurses++ # @CXX_NAME@
    1456814899+DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
    1456914900+CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
    … …  
    1458114912+MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
    1458214913+SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
     14914+PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
     14915+MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
     14916+FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
     14917+
     14918+SUB_LIBRARY_REQ=${SUB_LIBRARY}
     14919+TINFO_NAME_REQ=${TINFO_NAME}
     14920+if test $TINFO_NAME = $LIB_NAME ; then
     14921+       SUB_LIBRARY_REQ=
     14922+       TINFO_NAME_REQ=
     14923+fi
    1458314924+
    1458414925+for lib in ../lib/*
    1458514926+do
    1458614927+       name=`basename $lib`
     14928+       if test "$name" = "*" ; then
     14929+               break
     14930+       fi
     14931+
    1458714932+       root=`basename $name "$DFT_DEP_SUFFIX"`
    1458814933+       if test "$name" = "$root" ; then
    … …  
    1459714942+       desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
    1459814943+       if test $name = $MAIN_LIBRARY ; then
    14599 +               reqs=
     14944+               reqs=$TINFO_NAME_REQ
    1460014945+               desc="$desc library"
    1460114946+       elif test $name = $SUB_LIBRARY ; then
    1460214947+               reqs=
    1460314948+               desc="$desc terminal interface library"
     14949+       elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
     14950+               reqs="$PANEL_LIBRARY $MENU_LIBRARY $FORM_LIBRARY $MAIN_LIBRARY $SUB_LIBRARY_REQ"
     14951+               desc="$desc add-on library"
    1460414952+       else
    14605 +               reqs=$MAIN_LIBRARY
     14953+               reqs="$MAIN_LIBRARY $SUB_LIBRARY_REQ"
    1460614954+               desc="$desc add-on library"
    1460714955+       fi
    … …  
    1464614994diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
    1464714995--- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
    14648 +++ ncurses-5.7/misc/Makefile.in        2009-02-28 20:38:54.335061600 -0800
     14996+++ ncurses-5.7/misc/Makefile.in        2009-03-22 21:17:03.943886576 -0700
    1464914997@@ -1,6 +1,6 @@
    1465014998-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
    … …  
    1472915077diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent
    1473015078--- ncurses-5.7.orig/misc/ncu-indent    2008-08-03 08:46:44.000000000 -0700
    14731 +++ ncurses-5.7/misc/ncu-indent 2009-02-28 20:38:59.859415560 -0800
     15079+++ ncurses-5.7/misc/ncu-indent 2009-03-22 21:17:08.396170694 -0700
    1473215080@@ -26,7 +26,7 @@
    1473315081 #* sale, use or other dealings in this Software without prior written       *
    … …  
    1477815126diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
    1477915127--- ncurses-5.7.orig/misc/ncurses-config.in     2007-03-17 13:02:19.000000000 -0700
    14780 +++ ncurses-5.7/misc/ncurses-config.in  2009-02-28 20:38:53.014978628 -0800
     15128+++ ncurses-5.7/misc/ncurses-config.in  2009-03-22 21:17:09.916267635 -0700
    1478115129@@ -1,7 +1,7 @@
    1478215130 #!@SHELL@
    1478315131-# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
    14784 +# $Id: ncurses-config.in,v 1.22 2009/01/24 21:06:45 tom Exp $
     15132+# $Id: ncurses-config.in,v 1.23 2009/03/14 19:20:57 Charles.Wilson Exp $
    1478515133 ##############################################################################
    1478615134-# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
    … …  
    1478915137 # Permission is hereby granted, free of charge, to any person obtaining a    #
    1479015138 # copy of this software and associated documentation files (the "Software"), #
    14791 @@ -28,58 +28,54 @@
     15139@@ -28,67 +28,70 @@
    1479215140 # authorization.                                                             #
    1479315141 ##############################################################################
    … …  
    1480715155-THIS="ncurses@DFT_ARG_SUFFIX@"
    1480815156+THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
     15157+TINFO_LIB="@TINFO_NAME@@DFT_ARG_SUFFIX@"
    1480915158 
    1481015159 LANG=C;                export LANG
    … …  
    1483215181        esac
    1483315182+fi
    14834  
     15183+
    1483515184+test $# = 0 && exec @SHELL@ $0 --error
    14836 +
     15185 
    1483715186+while test $# -gt 0; do
    1483815187        case "$1" in
    … …  
    1486615215                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
    1486715216                        $INCS
    14868 @@ -87,7 +83,7 @@
     15217 ENDECHO
    1486915218                ;;
    1487015219        --libs)
     15220+               if test @TINFO_NAME@ = @LIB_NAME@ ; then
    1487115221                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
    1487215222-                       -L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
    1487315223+                       -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
    1487415224 ENDECHO
     15225+               else
     15226+               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
     15227+                       -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
     15228+ENDECHO
     15229+               fi
    1487515230                ;;
    1487615231        # identification
    14877 @@ -107,6 +103,9 @@
     15232        --version)
     15233@@ -107,6 +110,9 @@
    1487815234        --datadir)
    1487915235                echo "${datadir}"
    … …  
    1488515241                echo "${libdir}"
    1488615242                ;;
    14887 @@ -129,9 +128,7 @@
     15243@@ -129,9 +135,7 @@
    1488815244 
    1488915245 Options:
    … …  
    1489515251   --cflags           echos the C compiler flags needed to compile with ${THIS}
    1489615252   --libs             echos the libraries needed to link with ${THIS}
    14897 @@ -142,6 +139,7 @@
     15253@@ -142,6 +146,7 @@
    1489815254 
    1489915255   --bindir           echos the directory containing ${THIS} programs
    … …  
    1490515261diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
    1490615262--- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
    14907 +++ ncurses-5.7/misc/terminfo.src       2009-02-28 20:38:50.326805978 -0800
     15263+++ ncurses-5.7/misc/terminfo.src       2009-03-22 21:16:59.595606369 -0700
    1490815264@@ -6,8 +6,8 @@
    1490915265 # Report bugs and new terminal descriptions to
    … …  
    1507115427diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
    1507215428--- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
    15073 +++ ncurses-5.7/mk-1st.awk      2009-02-28 20:38:47.598636401 -0800
     15429+++ ncurses-5.7/mk-1st.awk      2009-03-22 21:16:56.935437910 -0700
    1507415430@@ -1,6 +1,6 @@
    1507515431-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
    … …  
    1510115457diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c
    1510215458--- ncurses-5.7.orig/ncurses/base/define_key.c  2006-12-30 15:23:31.000000000 -0800
    15103 +++ ncurses-5.7/ncurses/base/define_key.c       2009-02-28 20:38:57.043235088 -0800
     15459+++ ncurses-5.7/ncurses/base/define_key.c       2009-03-22 21:17:05.639993853 -0700
    1510415460@@ -1,5 +1,5 @@
    1510515461 /****************************************************************************
    … …  
    1517015526diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c
    1517115527--- ncurses-5.7.orig/ncurses/base/keybound.c    2006-06-17 11:19:24.000000000 -0700
    15172 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-28 20:38:58.435326721 -0800
     15528+++ ncurses-5.7/ncurses/base/keybound.c 2009-03-22 21:17:07.012081575 -0700
    1517315529@@ -1,5 +1,5 @@
    1517415530 /****************************************************************************
    … …  
    1522115577diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c
    1522215578--- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800
    15223 +++ ncurses-5.7/ncurses/base/key_defined.c      2009-02-28 20:38:58.435326721 -0800
     15579+++ ncurses-5.7/ncurses/base/key_defined.c      2009-03-22 21:17:07.012081575 -0700
    1522415580@@ -1,5 +1,5 @@
    1522515581 /****************************************************************************
    … …  
    1526715623diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c
    1526815624--- ncurses-5.7.orig/ncurses/base/keyok.c       2006-12-30 08:22:33.000000000 -0800
    15269 +++ ncurses-5.7/ncurses/base/keyok.c    2009-02-28 20:38:57.043235088 -0800
     15625+++ ncurses-5.7/ncurses/base/keyok.c    2009-03-22 21:17:05.639993853 -0700
    1527015626@@ -1,5 +1,5 @@
    1527115627 /****************************************************************************
    … …  
    1533915695diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c
    1534015696--- ncurses-5.7.orig/ncurses/base/legacy_coding.c       2005-12-17 15:38:17.000000000 -0800
    15341 +++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-02-28 20:38:58.435326721 -0800
     15697+++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-03-22 21:17:07.012081575 -0700
    1534215698@@ -1,5 +1,5 @@
    1534315699 /****************************************************************************
    … …  
    1538815744diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
    1538915745--- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
    15390 +++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-28 20:38:51.642889230 -0800
     15746+++ ncurses-5.7/ncurses/base/lib_addch.c        2009-03-22 21:17:00.859689900 -0700
    1539115747@@ -1,5 +1,5 @@
    1539215748 /****************************************************************************
    … …  
    1544515801diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c
    1544615802--- ncurses-5.7.orig/ncurses/base/lib_beep.c    2005-04-09 08:20:04.000000000 -0700
    15447 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-28 20:38:57.043235088 -0800
     15803+++ ncurses-5.7/ncurses/base/lib_beep.c 2009-03-22 21:17:05.639993853 -0700
    1544815804@@ -1,5 +1,5 @@
    1544915805 /****************************************************************************
    … …  
    1549315849diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
    1549415850--- ncurses-5.7.orig/ncurses/base/lib_color.c   2007-04-07 10:07:28.000000000 -0700
    15495 +++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-28 20:38:57.047235367 -0800
     15851+++ ncurses-5.7/ncurses/base/lib_color.c        2009-03-22 21:17:05.643993853 -0700
    1549615852@@ -1,5 +1,5 @@
    1549715853 /****************************************************************************
    … …  
    1590616262diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
    1590716263--- ncurses-5.7.orig/ncurses/base/lib_colorset.c        2005-01-29 13:40:51.000000000 -0800
    15908 +++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-28 20:38:53.014978628 -0800
     16264+++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-03-22 21:17:02.195775108 -0700
    1590916265@@ -1,5 +1,5 @@
    1591016266 /****************************************************************************
    … …  
    1595416310diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c
    1595516311--- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c        2005-11-26 12:03:38.000000000 -0800
    15956 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-02-28 20:38:57.047235367 -0800
     16312+++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-03-22 21:17:05.643993853 -0700
    1595716313@@ -1,5 +1,5 @@
    1595816314 /****************************************************************************
    … …  
    1604216398diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c
    1604316399--- ncurses-5.7.orig/ncurses/base/lib_echo.c    2000-12-09 18:43:27.000000000 -0800
    16044 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-28 20:38:58.435326721 -0800
     16400+++ ncurses-5.7/ncurses/base/lib_echo.c 2009-03-22 21:17:07.012081575 -0700
    1604516401@@ -1,5 +1,5 @@
    1604616402 /****************************************************************************
    … …  
    1610816464diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
    1610916465--- ncurses-5.7.orig/ncurses/base/lib_endwin.c  2000-12-09 18:43:27.000000000 -0800
    16110 +++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-02-28 20:38:57.047235367 -0800
     16466+++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-03-22 21:17:05.643993853 -0700
    1611116467@@ -1,5 +1,5 @@
    1611216468 /****************************************************************************
    … …  
    1616116517diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
    1616216518--- ncurses-5.7.orig/ncurses/base/lib_flash.c   2000-12-09 18:43:27.000000000 -0800
    16163 +++ ncurses-5.7/ncurses/base/lib_flash.c        2009-02-28 20:38:57.047235367 -0800
     16519+++ ncurses-5.7/ncurses/base/lib_flash.c        2009-03-22 21:17:05.643993853 -0700
    1616416520@@ -1,5 +1,5 @@
    1616516521 /****************************************************************************
    … …  
    1621016566diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
    1621116567--- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
    16212 +++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-28 20:38:39.770130185 -0800
     16568+++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-03-22 21:16:49.034929738 -0700
    1621316569@@ -40,7 +40,7 @@
    1621416570 extern int malloc_errfd;       /* FIXME */
    … …  
    1623116587diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c
    1623216588--- ncurses-5.7.orig/ncurses/base/lib_getch.c   2008-09-20 12:46:13.000000000 -0700
    16233 +++ ncurses-5.7/ncurses/base/lib_getch.c        2009-02-28 20:38:59.859415560 -0800
     16589+++ ncurses-5.7/ncurses/base/lib_getch.c        2009-03-22 21:17:08.396170694 -0700
    1623416590@@ -1,5 +1,5 @@
    1623516591 /****************************************************************************
    … …  
    1640916765diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c
    1641016766--- ncurses-5.7.orig/ncurses/base/lib_isendwin.c        2000-12-09 18:43:27.000000000 -0800
    16411 +++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-02-28 20:38:57.047235367 -0800
     16767+++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-03-22 21:17:05.643993853 -0700
    1641216768@@ -1,5 +1,5 @@
    1641316769 /****************************************************************************
    … …  
    1645316809diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
    1645416810--- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
    16455 +++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-28 20:38:59.859415560 -0800
     16811+++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-03-22 21:17:08.400170414 -0700
    1645616812@@ -1,5 +1,5 @@
    1645716813 /****************************************************************************
    … …  
    1677317129diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c
    1677417130--- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700
    16775 +++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-02-28 20:38:57.047235367 -0800
     17131+++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-03-22 21:17:05.643993853 -0700
    1677617132@@ -1,5 +1,5 @@
    1677717133 /****************************************************************************
    … …  
    1688417240diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c
    1688517241--- ncurses-5.7.orig/ncurses/base/lib_newwin.c  2008-06-07 06:58:09.000000000 -0700
    16886 +++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-02-28 20:38:57.047235367 -0800
     17242+++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-03-22 21:17:05.643993853 -0700
    1688717243@@ -1,5 +1,5 @@
    1688817244 /****************************************************************************
    … …  
    1694617302diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c
    1694717303--- ncurses-5.7.orig/ncurses/base/lib_nl.c      2000-12-09 18:43:27.000000000 -0800
    16948 +++ ncurses-5.7/ncurses/base/lib_nl.c   2009-02-28 20:38:58.435326721 -0800
     17304+++ ncurses-5.7/ncurses/base/lib_nl.c   2009-03-22 21:17:07.012081575 -0700
    1694917305@@ -1,5 +1,5 @@
    1695017306 /****************************************************************************
    … …  
    1703017386diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c
    1703117387--- ncurses-5.7.orig/ncurses/base/lib_pad.c     2006-10-14 13:47:13.000000000 -0700
    17032 +++ ncurses-5.7/ncurses/base/lib_pad.c  2009-02-28 20:38:57.047235367 -0800
     17388+++ ncurses-5.7/ncurses/base/lib_pad.c  2009-03-22 21:17:05.643993853 -0700
    1703317389@@ -1,5 +1,5 @@
    1703417390 /****************************************************************************
    … …  
    1707717433diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c
    1707817434--- ncurses-5.7.orig/ncurses/base/lib_screen.c  2008-08-16 12:05:37.000000000 -0700
    17079 +++ ncurses-5.7/ncurses/base/lib_screen.c       2009-02-28 20:38:57.047235367 -0800
     17435+++ ncurses-5.7/ncurses/base/lib_screen.c       2009-03-22 21:17:05.647994412 -0700
    1708017436@@ -1,5 +1,5 @@
    1708117437 /****************************************************************************
    … …  
    1719517551diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c
    1719617552--- ncurses-5.7.orig/ncurses/base/lib_set_term.c        2008-08-04 11:11:12.000000000 -0700
    17197 +++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-02-28 20:38:57.051235647 -0800
     17553+++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-03-22 21:17:05.647994412 -0700
    1719817554@@ -1,5 +1,5 @@
    1719917555 /****************************************************************************
    … …  
    1724517601diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c
    1724617602--- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c        2005-01-08 15:01:32.000000000 -0800
    17247 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-02-28 20:38:58.439326442 -0800
     17603+++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-03-22 21:17:07.016081855 -0700
    1724817604@@ -1,5 +1,5 @@
    1724917605 /****************************************************************************
    … …  
    1729317649diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c
    1729417650--- ncurses-5.7.orig/ncurses/base/lib_slkatron.c        2005-01-08 15:02:01.000000000 -0800
    17295 +++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-02-28 20:38:58.439326442 -0800
     17651+++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-03-22 21:17:07.016081855 -0700
    1729617652@@ -1,5 +1,5 @@
    1729717653 /****************************************************************************
    … …  
    1734117697diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
    1734217698--- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c      2005-01-28 13:11:53.000000000 -0800
    17343 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-28 20:38:58.439326442 -0800
     17699+++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-03-22 21:17:07.016081855 -0700
    1734417700@@ -1,5 +1,5 @@
    1734517701 /****************************************************************************
    … …  
    1741217768diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c
    1741317769--- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c       2005-01-08 13:46:47.000000000 -0800
    17414 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-02-28 20:38:58.439326442 -0800
     17770+++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-03-22 21:17:07.016081855 -0700
    1741517771@@ -1,5 +1,5 @@
    1741617772 /****************************************************************************
    … …  
    1745217808diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c
    1745317809--- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800
    17454 +++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-02-28 20:38:58.439326442 -0800
     17810+++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-03-22 21:17:07.016081855 -0700
    1745517811@@ -1,5 +1,5 @@
    1745617812 /****************************************************************************
    … …  
    1749617852diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c
    1749717853--- ncurses-5.7.orig/ncurses/base/lib_slk.c     2008-09-27 07:07:33.000000000 -0700
    17498 +++ ncurses-5.7/ncurses/base/lib_slk.c  2009-02-28 20:38:57.051235647 -0800
     17854+++ ncurses-5.7/ncurses/base/lib_slk.c  2009-03-22 21:17:05.647994412 -0700
    1749917855@@ -1,5 +1,5 @@
    1750017856 /****************************************************************************
    … …  
    1754217898diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c
    1754317899--- ncurses-5.7.orig/ncurses/base/lib_slkclear.c        2007-12-29 09:51:47.000000000 -0800
    17544 +++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-02-28 20:38:58.439326442 -0800
     17900+++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-03-22 21:17:07.016081855 -0700
    1754517901@@ -1,5 +1,5 @@
    1754617902 /****************************************************************************
    … …  
    1759817954diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
    1759917955--- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c        2005-01-28 13:11:53.000000000 -0800
    17600 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-28 20:38:58.439326442 -0800
     17956+++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-03-22 21:17:07.016081855 -0700
    1760117957@@ -1,5 +1,5 @@
    1760217958 /****************************************************************************
    … …  
    1766218018diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c
    1766318019--- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800
    17664 +++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-02-28 20:38:57.051235647 -0800
     18020+++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-03-22 21:17:05.647994412 -0700
    1766518021@@ -1,5 +1,5 @@
    1766618022 /****************************************************************************
    … …  
    1770518061diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c
    1770618062--- ncurses-5.7.orig/ncurses/base/lib_slklab.c  2003-03-29 14:53:48.000000000 -0800
    17707 +++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-02-28 20:38:58.439326442 -0800
     18063+++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-03-22 21:17:07.016081855 -0700
    1770818064@@ -1,5 +1,5 @@
    1770918065 /****************************************************************************
    … …  
    1775218108diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c
    1775318109--- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700
    17754 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-02-28 20:38:57.051235647 -0800
     18110+++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-03-22 21:17:05.647994412 -0700
    1775518111@@ -1,5 +1,5 @@
    1775618112 /****************************************************************************
    … …  
    1783018186diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c
    1783118187--- ncurses-5.7.orig/ncurses/base/lib_slkset.c  2007-10-13 13:08:46.000000000 -0700
    17832 +++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-02-28 20:38:58.439326442 -0800
     18188+++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-03-22 21:17:07.016081855 -0700
    1783318189@@ -1,5 +1,5 @@
    1783418190 /****************************************************************************
    … …  
    1789118247diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c
    1789218248--- ncurses-5.7.orig/ncurses/base/lib_slktouch.c        2000-12-09 18:43:27.000000000 -0800
    17893 +++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-02-28 20:38:58.439326442 -0800
     18249+++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-03-22 21:17:07.016081855 -0700
    1789418250@@ -1,5 +1,5 @@
    1789518251 /****************************************************************************
    … …  
    1794218298diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c
    1794318299--- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700
    17944 +++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-02-28 20:38:57.055236206 -0800
     18300+++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-03-22 21:17:05.651994412 -0700
    1794518301@@ -1,5 +1,5 @@
    1794618302 /****************************************************************************
    … …  
    1798818344diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c
    1798918345--- ncurses-5.7.orig/ncurses/base/lib_winch.c   2001-06-02 16:42:08.000000000 -0700
    17990 +++ ncurses-5.7/ncurses/base/lib_winch.c        2009-02-28 20:38:58.439326442 -0800
     18346+++ ncurses-5.7/ncurses/base/lib_winch.c        2009-03-22 21:17:07.016081855 -0700
    1799118347@@ -39,16 +39,16 @@
    1799218348 
    … …  
    1801218368diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk
    1801318369--- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700
    18014 +++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-02-28 20:38:57.043235088 -0800
     18370+++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-03-22 21:17:05.639993853 -0700
    1801518371@@ -1,6 +1,6 @@
    1801618372-# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $
    … …  
    1804718403diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh
    1804818404--- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh  2008-08-30 12:20:50.000000000 -0700
    18049 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh       2009-02-28 20:38:58.435326721 -0800
     18405+++ ncurses-5.7/ncurses/base/MKlib_gen.sh       2009-03-22 21:17:07.012081575 -0700
    1805018406@@ -2,7 +2,7 @@
    1805118407 #
    … …  
    1806818424diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c
    1806918425--- ncurses-5.7.orig/ncurses/base/tries.c       2008-08-16 12:22:55.000000000 -0700
    18070 +++ ncurses-5.7/ncurses/base/tries.c    2009-02-28 20:38:58.439326442 -0800
     18426+++ ncurses-5.7/ncurses/base/tries.c    2009-03-22 21:17:07.016081855 -0700
    1807118427@@ -39,7 +39,7 @@
    1807218428 
    … …  
    1809118447diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
    1809218448--- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
    18093 +++ ncurses-5.7/ncurses/curses.priv.h   2009-02-28 20:38:59.859415560 -0800
     18449+++ ncurses-5.7/ncurses/curses.priv.h   2009-03-22 21:17:08.400170414 -0700
    1809418450@@ -1,5 +1,5 @@
    1809518451 /****************************************************************************
    … …  
    1835818714diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
    1835918715--- ncurses-5.7.orig/ncurses/Makefile.in        2008-10-18 07:11:54.000000000 -0700
    18360 +++ ncurses-5.7/ncurses/Makefile.in     2009-02-28 20:38:46.310547562 -0800
     18716+++ ncurses-5.7/ncurses/Makefile.in     2009-03-22 21:16:55.671355217 -0700
    1836118717@@ -1,6 +1,6 @@
    1836218718-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
    … …  
    1837918735diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
    1838018736--- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
    18381 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-28 20:38:39.770130185 -0800
     18737+++ ncurses-5.7/ncurses/tinfo/entries.c 2009-03-22 21:17:09.916267635 -0700
     18738@@ -1,5 +1,5 @@
     18739 /****************************************************************************
     18740- * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.              *
     18741+ * Copyright (c) 2006-2008,2009 Free Software Foundation, Inc.              *
     18742  *                                                                          *
     18743  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18744  * copy of this software and associated documentation files (the            *
    1838218745@@ -37,7 +37,7 @@
    1838318746 #include <tic.h>
    … …  
    1838518748 
    1838618749-MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $")
    18387 +MODULE_ID("$Id: entries.c,v 1.10 2008/12/07 00:11:45 tom Exp $")
     18750+MODULE_ID("$Id: entries.c,v 1.11 2009/03/14 15:22:37 tom Exp $")
    1838818751 
    1838918752 /****************************************************************************
    1839018753  *
    18391 @@ -117,6 +117,9 @@
    18392  
    18393      T((T_CALLED("_nc_free_tinfo()")));
     18754@@ -119,6 +119,10 @@
    1839418755 #if NO_LEAKS
     18756     _nc_free_tparm();
     18757     _nc_tgetent_leaks();
     18758+
    1839518759+    if (cur_term != 0)
    1839618760+       del_curterm(cur_term);
    1839718761+
    18398      _nc_free_tparm();
    18399      _nc_tgetent_leaks();
    1840018762     _nc_free_entries(_nc_head);
     18763     _nc_get_type(0);
     18764     _nc_first_name(0);
    1840118765diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
    1840218766--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
    18403 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-28 20:38:41.374231037 -0800
     18767+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-03-22 21:16:50.643032825 -0700
    1840418768@@ -1,5 +1,5 @@
    1840518769 /****************************************************************************
    … …  
    1850518869 }
    1850618870 
     18871diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_acs.c ncurses-5.7/ncurses/tinfo/lib_acs.c
     18872--- ncurses-5.7.orig/ncurses/tinfo/lib_acs.c    2008-08-16 12:22:55.000000000 -0700
     18873+++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-03-22 21:17:11.636377985 -0700
     18874@@ -35,12 +35,12 @@
     18875 #include <curses.priv.h>
     18876 #include <term.h>              /* ena_acs, acs_chars */
     18877 
     18878-MODULE_ID("$Id: lib_acs.c,v 1.36 2008/08/16 19:22:55 tom Exp $")
     18879+MODULE_ID("$Id: lib_acs.c,v 1.37 2009/03/21 19:39:23 tom Exp $")
     18880 
     18881 #if BROKEN_LINKER || USE_REENTRANT
     18882 #define MyBuffer _nc_prescreen.real_acs_map
     18883 NCURSES_EXPORT_VAR(chtype *)
     18884-_nc_acs_map(void)
     18885+NCURSES_PUBLIC_VAR(acs_map)(void)
     18886 {
     18887     if (MyBuffer == 0)
     18888        MyBuffer = typeCalloc(chtype, ACS_LEN);
    1850718889diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c
    1850818890--- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c       2008-06-28 08:19:24.000000000 -0700
    18509 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-02-28 20:38:57.055236206 -0800
     18891+++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-03-22 21:17:05.651994412 -0700
    1851018892@@ -1,5 +1,5 @@
    1851118893 /****************************************************************************
    … …  
    1855618938diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c
    1855718939--- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c       2008-08-16 12:22:55.000000000 -0700
    18558 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c    2009-02-28 20:38:59.859415560 -0800
     18940+++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c    2009-03-22 21:17:09.916267635 -0700
    1855918941@@ -1,5 +1,5 @@
    1856018942 /****************************************************************************
    … …  
    1856918951 
    1857018952-MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $")
    18571 +MODULE_ID("$Id: lib_cur_term.c,v 1.19 2009/02/28 15:49:58 tom Exp $")
     18953+MODULE_ID("$Id: lib_cur_term.c,v 1.20 2009/03/14 14:39:32 tom Exp $")
    1857218954 
    1857318955 #undef CUR
    … …  
    1858118963 NCURSES_PUBLIC_VAR(cur_term) (void)
    1858218964 {
     18965@@ -66,7 +68,9 @@
     18966     oldterm = cur_term;
     18967     if (SP)
     18968        SP->_term = termp;
     18969-#if BROKEN_LINKER || USE_REENTRANT
     18970+#if BROKEN_LINKER && !USE_REENTRANT
     18971+    cur_term = termp;
     18972+#elif BROKEN_LINKER || USE_REENTRANT
     18973     _nc_prescreen._cur_term = termp;
     18974 #else
     18975     cur_term = termp;
    1858318976diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c
    1858418977--- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c        2003-10-25 12:43:55.000000000 -0700
    18585 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-02-28 20:38:57.055236206 -0800
     18978+++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-03-22 21:17:05.651994412 -0700
    1858618979@@ -1,5 +1,5 @@
    1858718980 /****************************************************************************
    … …  
    1864319036diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c
    1864419037--- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700
    18645 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-02-28 20:38:57.055236206 -0800
     19038+++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-03-22 21:17:05.651994412 -0700
    1864619039@@ -1,5 +1,5 @@
    1864719040 /****************************************************************************
    … …  
    1875419147diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c
    1875519148--- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c       2000-12-09 18:55:07.000000000 -0800
    18756 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-02-28 20:38:57.055236206 -0800
     19149+++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-03-22 21:17:05.651994412 -0700
    1875719150@@ -1,5 +1,5 @@
    1875819151 /****************************************************************************
    … …  
    1879819191diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c
    1879919192--- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c  2008-05-03 14:34:13.000000000 -0700
    18800 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-02-28 20:38:57.055236206 -0800
     19193+++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-03-22 21:17:05.651994412 -0700
    1880119194@@ -1,5 +1,5 @@
    1880219195 /****************************************************************************
    … …  
    1884219235diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c
    1884319236--- ncurses-5.7.orig/ncurses/tinfo/lib_options.c        2008-08-16 14:20:48.000000000 -0700
    18844 +++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-02-28 20:38:59.859415560 -0800
     19237+++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-03-22 21:17:08.400170414 -0700
    1884519238@@ -1,5 +1,5 @@
    1884619239 /****************************************************************************
    … …  
    1900119394diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c
    1900219395--- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c    2007-09-29 14:50:22.000000000 -0700
    19003 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-28 20:38:57.055236206 -0800
     19396+++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-03-22 21:17:05.651994412 -0700
    1900419397@@ -1,5 +1,5 @@
    1900519398 /****************************************************************************
    … …  
    1925019643diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c
    1925119644--- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c  2008-08-03 15:42:33.000000000 -0700
    19252 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-02-28 20:38:57.055236206 -0800
     19645+++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-03-22 21:17:05.655995250 -0700
    1925319646@@ -1,5 +1,5 @@
    1925419647 /****************************************************************************
    … …  
    1933919732diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c
    1934019733--- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c       2003-12-27 10:23:01.000000000 -0800
    19341 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-02-28 20:38:58.439326442 -0800
     19734+++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-03-22 21:17:07.020082134 -0700
    1934219735@@ -1,5 +1,5 @@
    1934319736 /****************************************************************************
    … …  
    1938419777diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c
    1938519778--- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c  2008-08-16 12:22:55.000000000 -0700
    19386 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c       2009-02-28 20:38:58.439326442 -0800
     19779+++ ncurses-5.7/ncurses/tinfo/lib_tparm.c       2009-03-22 21:17:07.020082134 -0700
    1938719780@@ -40,10 +40,9 @@
    1938819781 #include <curses.priv.h>
    … …  
    1939919792diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c
    1940019793--- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c  2008-06-28 06:12:15.000000000 -0700
    19401 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-02-28 20:38:59.859415560 -0800
     19794+++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-03-22 21:17:08.400170414 -0700
    1940219795@@ -1,5 +1,5 @@
    1940319796 /****************************************************************************
    … …  
    1949019883diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c
    1949119884--- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c       2008-08-03 15:10:44.000000000 -0700
    19492 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-02-28 20:38:57.059236485 -0800
     19885+++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-03-22 21:17:05.655995250 -0700
    1949319886@@ -1,5 +1,5 @@
    1949419887 /****************************************************************************
    … …  
    1960619999diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c
    1960720000--- ncurses-5.7.orig/ncurses/tinfo/make_keys.c  2008-08-03 14:57:22.000000000 -0700
    19608 +++ ncurses-5.7/ncurses/tinfo/make_keys.c       2009-02-28 20:38:58.439326442 -0800
     20001+++ ncurses-5.7/ncurses/tinfo/make_keys.c       2009-03-22 21:17:07.020082134 -0700
    1960920002@@ -39,16 +39,16 @@
    1961020003 #define USE_TERMLIB 1
    … …  
    1964920042            fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
    1965020043                    code,
     20044diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk ncurses-5.7/ncurses/tinfo/MKcodes.awk
     20045--- ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk  2008-06-28 16:13:25.000000000 -0700
     20046+++ ncurses-5.7/ncurses/tinfo/MKcodes.awk       2009-03-22 21:17:11.636377985 -0700
     20047@@ -1,5 +1,5 @@
     20048 ##############################################################################
     20049-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
     20050+# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
     20051 #                                                                            #
     20052 # Permission is hereby granted, free of charge, to any person obtaining a    #
     20053 # copy of this software and associated documentation files (the "Software"), #
     20054@@ -25,7 +25,7 @@
     20055 # use or other dealings in this Software without prior written               #
     20056 # authorization.                                                             #
     20057 ##############################################################################
     20058-# $Id: MKcodes.awk,v 1.5 2008/06/28 23:13:25 tom Exp $
     20059+# $Id: MKcodes.awk,v 1.6 2009/03/21 21:03:39 tom Exp $
     20060 function large_item(value) {
     20061        result = sprintf("%d,", offset);
     20062        offset = offset + length(value) + 1;
     20063@@ -124,7 +124,7 @@
     20064                        print  "        return *value;"
     20065                        print  "}"
     20066                        print  ""
     20067-                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
     20068+                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
     20069                } else {
     20070                        print  "#define DCL(it) static IT data##it[]"
     20071                        print  ""
     20072@@ -134,11 +134,22 @@
     20073                        print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
     20074                }
     20075                print  ""
     20076+               print  "/* remove public definition which conflicts with FIX() */"
     20077+               print  "#undef boolcodes"
     20078+               print  "#undef numcodes"
     20079+               print  "#undef strcodes"
     20080+               print  ""
     20081+               print  "/* add local definition */"
     20082                print  "FIX(boolcodes)"
     20083                print  "FIX(numcodes)"
     20084                print  "FIX(strcodes)"
     20085                print  ""
     20086+               print  "/* restore the public definition */"
     20087+               print  ""
     20088                print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
     20089+               print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
     20090+               print  "#define numcodes   NCURSES_PUBLIC_VAR(numcodes())"
     20091+               print  "#define strcodes   NCURSES_PUBLIC_VAR(strcodes())"
     20092                print  ""
     20093                print  "#if NO_LEAKS"
     20094                print  "NCURSES_EXPORT(void)"
    1965120095diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk
    1965220096--- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk  2008-10-11 14:07:56.000000000 -0700
    19653 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk       2009-02-28 20:38:58.439326442 -0800
     20097+++ ncurses-5.7/ncurses/tinfo/MKnames.awk       2009-03-22 21:17:11.636377985 -0700
     20098@@ -1,5 +1,5 @@
     20099 ##############################################################################
     20100-# Copyright (c) 2007,2008 Free Software Foundation, Inc.                     #
     20101+# Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.                #
     20102 #                                                                            #
     20103 # Permission is hereby granted, free of charge, to any person obtaining a    #
     20104 # copy of this software and associated documentation files (the "Software"), #
    1965420105@@ -25,7 +25,7 @@
    1965520106 # use or other dealings in this Software without prior written               #
    … …  
    1965720108 ##############################################################################
    1965820109-# $Id: MKnames.awk,v 1.20 2008/10/11 21:07:56 tom Exp $
    19659 +# $Id: MKnames.awk,v 1.21 2008/11/16 00:19:59 juergen Exp $
     20110+# $Id: MKnames.awk,v 1.22 2009/03/21 21:03:39 tom Exp $
    1966020111 function large_item(value) {
    1966120112        result = sprintf("%d,", offset);
    … …  
    1967020121                        printf "static const char _nc_name_blob[] = \n"
    1967120122                        printf "%s;\n", bigstr;
     20123@@ -133,7 +131,7 @@
     20124                        print  "        return *value;"
     20125                        print  "}"
     20126                        print  ""
     20127-                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
     20128+                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
     20129                } else {
     20130                        print  "#define DCL(it) static IT data##it[]"
     20131                        print  ""
     20132@@ -143,9 +141,18 @@
     20133                        print_strings("numfnames", small_numfnames);
     20134                        print_strings("strnames", small_strnames);
     20135                        print_strings("strfnames", small_strfnames);
     20136-                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
     20137+                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return data##it; }"
     20138                }
     20139                print  ""
     20140+               print  "/* remove public definition which conflicts with FIX() */"
     20141+               print  "#undef boolnames"
     20142+               print  "#undef boolfnames"
     20143+               print  "#undef numnames"
     20144+               print  "#undef numfnames"
     20145+               print  "#undef strnames"
     20146+               print  "#undef strfnames"
     20147+               print  ""
     20148+               print  "/* add local definition */"
     20149                print  "FIX(boolnames)"
     20150                print  "FIX(boolfnames)"
     20151                print  "FIX(numnames)"
     20152@@ -153,6 +160,13 @@
     20153                print  "FIX(strnames)"
     20154                print  "FIX(strfnames)"
     20155                print  ""
     20156+               print  "/* restore the public definition */"
     20157+               print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
     20158+               print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
     20159+               print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
     20160+               print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
     20161+               print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
     20162+               print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"
     20163                print  ""
     20164                print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
     20165                print  ""
    1967220166diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c
    1967320167--- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700
    19674 +++ ncurses-5.7/ncurses/tinfo/name_match.c      2009-02-28 20:38:58.439326442 -0800
     20168+++ ncurses-5.7/ncurses/tinfo/name_match.c      2009-03-22 21:17:07.020082134 -0700
    1967520169@@ -31,10 +31,9 @@
    1967620170  ****************************************************************************/
    … …  
    1968720181diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c
    1968820182--- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700
    19689 +++ ncurses-5.7/ncurses/tinfo/use_screen.c      2009-02-28 20:38:58.443328118 -0800
     20183+++ ncurses-5.7/ncurses/tinfo/use_screen.c      2009-03-22 21:17:07.020082134 -0700
    1969020184@@ -32,7 +32,7 @@
    1969120185 
    … …  
    1970820202diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c
    1970920203--- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c       2008-08-03 09:24:53.000000000 -0700
    19710 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c    2009-02-28 20:38:59.863415840 -0800
     20204+++ ncurses-5.7/ncurses/trace/lib_traceatr.c    2009-03-22 21:17:08.400170414 -0700
    1971120205@@ -1,5 +1,5 @@
    1971220206 /****************************************************************************
    … …  
    1978520279diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c
    1978620280--- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c      2008-08-03 09:09:26.000000000 -0700
    19787 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c   2009-02-28 20:38:58.443328118 -0800
     20281+++ ncurses-5.7/ncurses/trace/lib_tracebits.c   2009-03-22 21:17:07.020082134 -0700
    1978820282@@ -33,9 +33,8 @@
    1978920283  ****************************************************************************/
    … …  
    1979920293diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c
    1980020294--- ncurses-5.7.orig/ncurses/trace/lib_trace.c  2008-08-23 11:04:29.000000000 -0700
    19801 +++ ncurses-5.7/ncurses/trace/lib_trace.c       2009-02-28 20:38:59.859415560 -0800
     20295+++ ncurses-5.7/ncurses/trace/lib_trace.c       2009-03-22 21:17:08.400170414 -0700
    1980220296@@ -1,5 +1,5 @@
    1980320297 /****************************************************************************
    … …  
    1985920353diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c
    1986020354--- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c       2008-08-03 08:39:29.000000000 -0700
    19861 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c    2009-02-28 20:38:58.443328118 -0800
     20355+++ ncurses-5.7/ncurses/trace/lib_tracemse.c    2009-03-22 21:17:07.020082134 -0700
    1986220356@@ -38,7 +38,7 @@
    1986320357 
    … …  
    1988020374diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c
    1988120375--- ncurses-5.7.orig/ncurses/trace/varargs.c    2008-08-03 08:42:49.000000000 -0700
    19882 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-02-28 20:38:58.443328118 -0800
     20376+++ ncurses-5.7/ncurses/trace/varargs.c 2009-03-22 21:17:07.020082134 -0700
    1988320377@@ -34,7 +34,7 @@
    1988420378 
    … …  
    1990120395diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c
    1990220396--- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c    2008-08-16 12:30:58.000000000 -0700
    19903 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-28 20:38:57.059236485 -0800
     20397+++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-03-22 21:17:05.655995250 -0700
    1990420398@@ -1,5 +1,5 @@
    1990520399 /****************************************************************************
    … …  
    1999220486diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c
    1999320487--- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c  2007-06-30 14:58:04.000000000 -0700
    19994 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-02-28 20:38:58.443328118 -0800
     20488+++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-03-22 21:17:07.020082134 -0700
    1999520489@@ -1,5 +1,5 @@
    1999620490 /****************************************************************************
    … …  
    2004920543diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
    2005020544--- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
    20051 +++ ncurses-5.7/ncurses/tty/tty_update.c        2009-02-28 20:38:57.059236485 -0800
     20545+++ ncurses-5.7/ncurses/tty/tty_update.c        2009-03-22 21:17:05.655995250 -0700
    2005220546@@ -1,5 +1,5 @@
    2005320547 /****************************************************************************
    … …  
    2019620690diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c
    2019720691--- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c       2007-05-12 12:03:06.000000000 -0700
    20198 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c    2009-02-28 20:38:58.443328118 -0800
     20692+++ ncurses-5.7/ncurses/widechar/lib_cchar.c    2009-03-22 21:17:07.020082134 -0700
    2019920693@@ -1,5 +1,5 @@
    2020020694 /****************************************************************************
    … …  
    2022620720diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c
    2022720721--- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c    2008-08-16 12:25:33.000000000 -0700
    20228 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-02-28 20:38:58.443328118 -0800
     20722+++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-03-22 21:17:07.020082134 -0700
    2022920723@@ -38,9 +38,8 @@
    2023020724 */
    … …  
    2024020734diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c
    2024120735--- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c        2006-12-17 07:16:17.000000000 -0800
    20242 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c     2009-02-28 20:38:58.443328118 -0800
     20736+++ ncurses-5.7/ncurses/widechar/lib_wacs.c     2009-03-22 21:17:07.020082134 -0700
    2024320737@@ -31,9 +31,8 @@
    2024420738  ****************************************************************************/
    … …  
    2025420748diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    2025520749--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    20256 +++ ncurses-5.7/NEWS    2009-02-28 20:38:59.855417236 -0800
     20750+++ ncurses-5.7/NEWS    2009-03-22 21:17:11.616376588 -0700
    2025720751@@ -1,5 +1,5 @@
    2025820752 -------------------------------------------------------------------------------
    … …  
    2026720761 -------------------------------------------------------------------------------
    2026820762--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    20269 +-- $Id: NEWS,v 1.1367 2009/02/28 22:38:03 tom Exp $
     20763+-- $Id: NEWS,v 1.1373 2009/03/21 23:24:10 tom Exp $
    2027020764 -------------------------------------------------------------------------------
    2027120765 
    2027220766 This is a log of changes that ncurses has gone through since Zeyd started
    20273 @@ -45,6 +45,158 @@
     20767@@ -45,6 +45,185 @@
    2027420768 Changes through 1.9.9e did not credit all contributions;
    2027520769 it is not possible to add this information.
    2027620770 
     20771+20090321
     20772+       + add TICS_LIST and SHLIB_LIST to allow libtool 2.2.6 on Cygwin to
     20773+         build with tic and term libraries (patch by Charles Wilson).
     20774+       + add -no-undefined option to libtool for Cygwin, MinGW, U/Win and AIX
     20775+         (report by Charles Wilson).
     20776+       + fix definition for c++/Makefile.in's SHLIB_LIST, which did not list
     20777+         the form, menu or panel libraries (patch by Charles Wilson).
     20778+       + add configure option --with-wrap-prefix to allow setting the prefix
     20779+         for functions used to wrap global variables to something other than
     20780+         "_nc_" (discussion with Charles Wilson).
     20781+
     20782+20090314
     20783+       + modify scripts to generate ncurses*-config and pc-files to add
     20784+         dependency for tinfo library (patch by Charles Wilson).
     20785+       + improve comparison of program-names when checking for linked flavors
     20786+         such as "reset" by ignoring the executable suffix (reports by Charles
     20787+         Wilson, Samuel Thibault and Cedric Bretaudeau on Cygwin mailing
     20788+         list).
     20789+       + suppress configure check for static/dynamic linker flags for gcc on
     20790+         Solaris 10, since gcc is confused by absence of static libc, and
     20791+         does not switch back to dynamic mode before finishing the libraries
     20792+         (reports by Joel Bertrand, Alan Pae).
     20793+       + minor fixes to Intel compiler warning checks in configure script.
     20794+       + modify _nc_leaks_tinfo() so leak-checking in test/railroad.c works.
     20795+       + modify set_curterm() to make broken-linker configuration work with
     20796+         changes from 20090228 (report by Charles Wilson).
     20797+
    2027720798+20090228
    2027820799+       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
    … …  
    2043220953diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
    2043320954--- ncurses-5.7.orig/panel/Makefile.in  2007-04-28 07:56:11.000000000 -0700
    20434 +++ ncurses-5.7/panel/Makefile.in       2009-02-28 20:38:46.310547562 -0800
     20955+++ ncurses-5.7/panel/Makefile.in       2009-03-22 21:16:55.671355217 -0700
    2043520956@@ -1,6 +1,6 @@
    2043620957-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
    … …  
    2045320974diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
    2045420975--- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
    20455 +++ ncurses-5.7/progs/Makefile.in       2009-02-28 20:38:35.789873445 -0800
     20976+++ ncurses-5.7/progs/Makefile.in       2009-03-22 21:17:09.916267635 -0700
    2045620977@@ -1,6 +1,6 @@
    2045720978-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
    20458 +# $Id: Makefile.in,v 1.80 2008/11/15 19:04:19 tom Exp $
     20979+# $Id: Makefile.in,v 1.81 2009/03/14 18:45:55 tom Exp $
    2045920980 ##############################################################################
    2046020981-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
    20461 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
     20982+# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
    2046220983 #                                                                            #
    2046320984 # Permission is hereby granted, free of charge, to any person obtaining a    #
    … …  
    2048021001 actual_toe       = `echo toe$x|       $(TRANSFORM)`
    2048121002 actual_tput      = `echo tput$x|      $(TRANSFORM)`
    20482 @@ -187,6 +188,7 @@
     21003@@ -171,10 +172,16 @@
     21004 define_reset     = `echo reset|       $(TRANSFORM)`
     21005 
     21006 transform.h :
     21007-       echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\"" >$@
     21008-       echo "#define PROG_INFOTOCAP \"$(define_infotocap)\"" >>$@
     21009-       echo "#define PROG_RESET     \"$(define_reset)\""     >>$@
     21010-       echo "#define PROG_INIT      \"$(define_init)\""      >>$@
     21011+       echo "#ifndef __TRANSFORM_H"                                    >$@
     21012+       echo "#define __TRANSFORM_H 1"                                  >>$@
     21013+       echo "#include <progs.priv.h>"                                  >>$@
     21014+       echo "extern bool same_program(const char *, const char *);"    >>$@
     21015+       -test -n "$x" && echo "#define SUFFIX_IGNORED \"$x\""           >>$@
     21016+       echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\""           >>$@
     21017+       echo "#define PROG_INFOTOCAP \"$(define_infotocap)\""           >>$@
     21018+       echo "#define PROG_RESET     \"$(define_reset)\""               >>$@
     21019+       echo "#define PROG_INIT      \"$(define_init)\""                >>$@
     21020+       echo "#endif /* __TRANSFORM_H */"                               >>$@
     21021 
     21022 install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
     21023 @MAKE_TERMINFO@        $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x     $(DESTDIR)$(bindir)/$(actual_tic)
     21024@@ -187,6 +194,7 @@
    2048321025 @MAKE_TERMINFO@        (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
    2048421026        $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
    … …  
    2048821030        $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
    2048921031        @echo "linking $(actual_reset) to $(actual_tset)"
    20490 @@ -200,6 +202,7 @@
     21032@@ -200,6 +208,7 @@
    2049121033 @MAKE_TERMINFO@        -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
    2049221034        -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
    … …  
    2049621038        -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
    2049721039        -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
    20498 @@ -230,6 +233,12 @@
     21040@@ -213,7 +222,8 @@
     21041 
     21042 DEPS_TIC = \
     21043        $(MODEL)/tic$o \
     21044-       $(MODEL)/dump_entry$o
     21045+       $(MODEL)/dump_entry$o \
     21046+       $(MODEL)/transform$o
     21047 
     21048 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
     21049        @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
     21050@@ -230,8 +240,15 @@
    2049921051 clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
    2050021052        @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
    … …  
    2050721059+
    2050821060 DEPS_TPUT = \
    20509         $(MODEL)/tput$o
    20510  
    20511 @@ -289,6 +298,7 @@
     21061-       $(MODEL)/tput$o
     21062+       $(MODEL)/tput$o \
     21063+       $(MODEL)/transform$o
     21064 
     21065 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
     21066        @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
     21067@@ -244,7 +261,8 @@
     21068        @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
     21069 
     21070 DEPS_TSET = \
     21071-       $(MODEL)/tset$o
     21072+       $(MODEL)/tset$o \
     21073+       $(MODEL)/transform$o
     21074 
     21075 tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
     21076        @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
     21077@@ -289,6 +307,7 @@
    2051221078 @MAKE_TERMINFO@        $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/toe.c     $(srcdir)/dump_entry.c $(LINT_LIBS)
    2051321079        $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c                          $(LINT_LIBS)
    … …  
    2051921085diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
    2052021086--- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
    20521 +++ ncurses-5.7/progs/modules   2009-02-28 20:38:35.789873445 -0800
     21087+++ ncurses-5.7/progs/modules   2009-03-22 21:17:09.916267635 -0700
    2052221088@@ -1,7 +1,7 @@
    2052321089-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
    20524 +# $Id: modules,v 1.14 2008/11/15 16:26:48 tom Exp $
     21090+# $Id: modules,v 1.15 2009/03/14 18:45:55 tom Exp $
    2052521091 # Program modules (some are in ncurses lib!)
    2052621092 ##############################################################################
    2052721093-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
    20528 +# Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.                #
     21094+# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
    2052921095 #                                                                            #
    2053021096 # Permission is hereby granted, free of charge, to any person obtaining a    #
    2053121097 # copy of this software and associated documentation files (the "Software"), #
    20532 @@ -37,6 +37,7 @@
     21098@@ -37,7 +37,9 @@
    2053321099 toe            progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h
    2053421100 dump_entry     progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
    … …  
    2053721103 tput           progs           $(srcdir)       $(HEADER_DEPS) transform.h termsort.c
    2053821104 tset           progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
    20539  
     21105+transform      progs           $(srcdir)       $(HEADER_DEPS)
     21106 
     21107 # vile:makemode
    2054021108diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
    2054121109--- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
    20542 +++ ncurses-5.7/progs/tabs.c    2009-02-28 20:38:37.161961447 -0800
     21110+++ ncurses-5.7/progs/tabs.c    2009-03-22 21:16:46.494768822 -0700
    2054321111@@ -0,0 +1,506 @@
    2054421112+/****************************************************************************
    … …  
    2104821616+    ExitProgram(rc);
    2104921617+}
     21618diff -Naur ncurses-5.7.orig/progs/tic.c ncurses-5.7/progs/tic.c
     21619--- ncurses-5.7.orig/progs/tic.c        2008-09-13 09:59:24.000000000 -0700
     21620+++ ncurses-5.7/progs/tic.c     2009-03-22 21:17:09.916267635 -0700
     21621@@ -1,5 +1,5 @@
     21622 /****************************************************************************
     21623- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     21624+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     21625  *                                                                          *
     21626  * Permission is hereby granted, free of charge, to any person obtaining a  *
     21627  * copy of this software and associated documentation files (the            *
     21628@@ -44,7 +44,7 @@
     21629 #include <dump_entry.h>
     21630 #include <transform.h>
     21631 
     21632-MODULE_ID("$Id: tic.c,v 1.137 2008/09/13 16:59:24 tom Exp $")
     21633+MODULE_ID("$Id: tic.c,v 1.138 2009/03/14 18:45:55 tom Exp $")
     21634 
     21635 const char *_nc_progname = "tic";
     21636 
     21637@@ -495,11 +495,11 @@
     21638 
     21639     _nc_progname = _nc_rootname(argv[0]);
     21640 
     21641-    if ((infodump = (strcmp(_nc_progname, PROG_CAPTOINFO) == 0)) != FALSE) {
     21642+    if ((infodump = same_program(_nc_progname, PROG_CAPTOINFO)) != FALSE) {
     21643        outform = F_TERMINFO;
     21644        sortmode = S_TERMINFO;
     21645     }
     21646-    if ((capdump = (strcmp(_nc_progname, PROG_INFOTOCAP) == 0)) != FALSE) {
     21647+    if ((capdump = same_program(_nc_progname, PROG_INFOTOCAP)) != FALSE) {
     21648        outform = F_TERMCAP;
     21649        sortmode = S_TERMCAP;
     21650     }
     21651diff -Naur ncurses-5.7.orig/progs/tput.c ncurses-5.7/progs/tput.c
     21652--- ncurses-5.7.orig/progs/tput.c       2008-07-13 04:05:12.000000000 -0700
     21653+++ ncurses-5.7/progs/tput.c    2009-03-22 21:17:09.916267635 -0700
     21654@@ -1,5 +1,5 @@
     21655 /****************************************************************************
     21656- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     21657+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     21658  *                                                                          *
     21659  * Permission is hereby granted, free of charge, to any person obtaining a  *
     21660  * copy of this software and associated documentation files (the            *
     21661@@ -47,7 +47,7 @@
     21662 #endif
     21663 #include <transform.h>
     21664 
     21665-MODULE_ID("$Id: tput.c,v 1.42 2008/07/13 11:05:12 tom Exp $")
     21666+MODULE_ID("$Id: tput.c,v 1.43 2009/03/14 18:45:55 tom Exp $")
     21667 
     21668 #define PUTS(s)                fputs(s, stdout)
     21669 #define PUTCHAR(c)     putchar(c)
     21670@@ -86,8 +86,8 @@
     21671 static void
     21672 check_aliases(const char *name)
     21673 {
     21674-    is_init = (strcmp(name, PROG_INIT) == 0);
     21675-    is_reset = (strcmp(name, PROG_RESET) == 0);
     21676+    is_init = same_program(name, PROG_INIT);
     21677+    is_reset = same_program(name, PROG_RESET);
     21678 }
     21679 
     21680 /*
     21681diff -Naur ncurses-5.7.orig/progs/transform.c ncurses-5.7/progs/transform.c
     21682--- ncurses-5.7.orig/progs/transform.c  1969-12-31 16:00:00.000000000 -0800
     21683+++ ncurses-5.7/progs/transform.c       2009-03-22 21:17:09.916267635 -0700
     21684@@ -0,0 +1,79 @@
     21685+/****************************************************************************
     21686+ * Copyright (c) 2009 Free Software Foundation, Inc.                        *
     21687+ *                                                                          *
     21688+ * Permission is hereby granted, free of charge, to any person obtaining a  *
     21689+ * copy of this software and associated documentation files (the            *
     21690+ * "Software"), to deal in the Software without restriction, including      *
     21691+ * without limitation the rights to use, copy, modify, merge, publish,      *
     21692+ * distribute, distribute with modifications, sublicense, and/or sell       *
     21693+ * copies of the Software, and to permit persons to whom the Software is    *
     21694+ * furnished to do so, subject to the following conditions:                 *
     21695+ *                                                                          *
     21696+ * The above copyright notice and this permission notice shall be included  *
     21697+ * in all copies or substantial portions of the Software.                   *
     21698+ *                                                                          *
     21699+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
     21700+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
     21701+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
     21702+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
     21703+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
     21704+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
     21705+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
     21706+ *                                                                          *
     21707+ * Except as contained in this notice, the name(s) of the above copyright   *
     21708+ * holders shall not be used in advertising or otherwise to promote the     *
     21709+ * sale, use or other dealings in this Software without prior written       *
     21710+ * authorization.                                                           *
     21711+ ****************************************************************************/
     21712+
     21713+/****************************************************************************
     21714+ *  Author: Thomas E. Dickey                                                *
     21715+ ****************************************************************************/
     21716+#include <progs.priv.h>
     21717+#include <string.h>
     21718+
     21719+#include <transform.h>
     21720+
     21721+MODULE_ID("$Id: transform.c,v 1.1 2009/03/14 19:08:28 tom Exp $")
     21722+
     21723+#ifdef SUFFIX_IGNORED
     21724+static void
     21725+trim_suffix(const char *a, unsigned *len)
     21726+{
     21727+    const char ignore[] = SUFFIX_IGNORED;
     21728+
     21729+    if (sizeof(ignore) != 0) {
     21730+       bool trim = FALSE;
     21731+       unsigned need = (sizeof(ignore) - 1);
     21732+
     21733+       if (*len > need) {
     21734+           unsigned first = *len - need;
     21735+           unsigned n;
     21736+           trim = TRUE;
     21737+           for (n = first; n < *len; ++n) {
     21738+               if (tolower(a[n]) != tolower(ignore[n - first])) {
     21739+                   trim = FALSE;
     21740+                   break;
     21741+               }
     21742+           }
     21743+           if (trim) {
     21744+               *len -= need;
     21745+           }
     21746+       }
     21747+    }
     21748+}
     21749+#else
     21750+#define trim_suffix(a, len) /* nothing */
     21751+#endif
     21752+
     21753+bool
     21754+same_program(const char *a, const char *b)
     21755+{
     21756+    unsigned len_a = strlen(a);
     21757+    unsigned len_b = strlen(b);
     21758+
     21759+    trim_suffix(a, &len_a);
     21760+    trim_suffix(b, &len_b);
     21761+
     21762+    return (len_a == len_b) && (strncmp(a, b, len_a) == 0);
     21763+}
     21764diff -Naur ncurses-5.7.orig/progs/tset.c ncurses-5.7/progs/tset.c
     21765--- ncurses-5.7.orig/progs/tset.c       2008-10-11 12:26:19.000000000 -0700
     21766+++ ncurses-5.7/progs/tset.c    2009-03-22 21:17:09.916267635 -0700
     21767@@ -1,5 +1,5 @@
     21768 /****************************************************************************
     21769- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     21770+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     21771  *                                                                          *
     21772  * Permission is hereby granted, free of charge, to any person obtaining a  *
     21773  * copy of this software and associated documentation files (the            *
     21774@@ -107,7 +107,7 @@
     21775 #include <dump_entry.h>
     21776 #include <transform.h>
     21777 
     21778-MODULE_ID("$Id: tset.c,v 1.76 2008/10/11 19:26:19 tom Exp $")
     21779+MODULE_ID("$Id: tset.c,v 1.77 2009/03/14 19:08:35 tom Exp $")
     21780 
     21781 /*
     21782  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
     21783@@ -1247,7 +1247,7 @@
     21784     ospeed = (NCURSES_OSPEED) mode.sg_ospeed;
     21785 #endif
     21786 
     21787-    if (!strcmp(_nc_progname, PROG_RESET)) {
     21788+    if (same_program(_nc_progname, PROG_RESET)) {
     21789        isreset = TRUE;
     21790        reset_mode();
     21791     }
    2105021792diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
    2105121793--- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
    21052 +++ ncurses-5.7/test/clip_printw.c      2009-02-28 20:38:42.990334962 -0800
     21794+++ ncurses-5.7/test/clip_printw.c      2009-03-22 21:16:52.251135633 -0700
    2105321795@@ -0,0 +1,360 @@
    2105421796+/****************************************************************************
    … …  
    2141422156diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
    2141522157--- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
    21416 +++ ncurses-5.7/test/demo_forms.c       2009-02-28 20:38:42.990334962 -0800
     22158+++ ncurses-5.7/test/demo_forms.c       2009-03-22 21:16:52.251135633 -0700
    2141722159@@ -26,7 +26,7 @@
    2141822160  * authorization.                                                           *
    … …  
    2144922191diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
    2145022192--- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
    21451 +++ ncurses-5.7/test/edit_field.c       2009-02-28 20:38:42.990334962 -0800
     22193+++ ncurses-5.7/test/edit_field.c       2009-03-22 21:16:52.251135633 -0700
    2145222194@@ -26,7 +26,7 @@
    2145322195  * authorization.                                                           *
    … …  
    2147222214diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
    2147322215--- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
    21474 +++ ncurses-5.7/test/edit_field.h       2009-02-28 20:38:42.990334962 -0800
     22216+++ ncurses-5.7/test/edit_field.h       2009-03-22 21:16:52.251135633 -0700
    2147522217@@ -1,5 +1,5 @@
    2147622218 /****************************************************************************
    … …  
    2150222244diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
    2150322245--- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
    21504 +++ ncurses-5.7/test/filter.c   2009-02-28 20:38:39.770130185 -0800
     22246+++ ncurses-5.7/test/filter.c   2009-03-22 21:16:49.034929738 -0700
    2150522247@@ -1,5 +1,5 @@
    2150622248 /****************************************************************************
    … …  
    2157422316diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
    2157522317--- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
    21576 +++ ncurses-5.7/test/insdelln.c 2009-02-28 20:38:42.990334962 -0800
     22318+++ ncurses-5.7/test/insdelln.c 2009-03-22 21:16:52.251135633 -0700
    2157722319@@ -0,0 +1,380 @@
    2157822320+/****************************************************************************
    … …  
    2195822700diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
    2195922701--- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
    21960 +++ ncurses-5.7/test/modules    2009-02-28 20:38:42.990334962 -0800
     22702+++ ncurses-5.7/test/modules    2009-03-22 21:16:52.251135633 -0700
    2196122703@@ -1,4 +1,4 @@
    2196222704-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
    … …  
    2198322725diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
    2198422726--- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
    21985 +++ ncurses-5.7/test/ncurses.c  2009-02-28 20:38:53.018977231 -0800
     22727+++ ncurses-5.7/test/ncurses.c  2009-03-22 21:17:02.199776504 -0700
    2198622728@@ -40,7 +40,7 @@
    2198722729    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
    … …  
    2247523217diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
    2247623218--- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
    22477 +++ ncurses-5.7/test/programs   2009-02-28 20:38:42.994335242 -0800
     23219+++ ncurses-5.7/test/programs   2009-03-22 21:16:52.255135912 -0700
    2247823220@@ -1,4 +1,4 @@
    2247923221-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
    … …  
    2250023242diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c
    2250123243--- ncurses-5.7.orig/test/railroad.c    2008-02-09 10:08:43.000000000 -0800
    22502 +++ ncurses-5.7/test/railroad.c 2009-02-28 20:38:59.863415840 -0800
     23244+++ ncurses-5.7/test/railroad.c 2009-03-22 21:17:08.400170414 -0700
    2250323245@@ -29,7 +29,7 @@
    2250423246 /*
    … …  
    2254723289diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
    2254823290--- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
    22549 +++ ncurses-5.7/test/README     2009-02-28 20:38:42.990334962 -0800
     23291+++ ncurses-5.7/test/README     2009-03-22 21:16:52.251135633 -0700
    2255023292@@ -25,7 +25,7 @@
    2255123293 -- sale, use or other dealings in this Software without prior written        --
    … …  
    2284323585diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
    2284423586--- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
    22845 +++ ncurses-5.7/test/test.priv.h        2009-02-28 20:38:42.994335242 -0800
     23587+++ ncurses-5.7/test/test.priv.h        2009-03-22 21:16:52.255135912 -0700
    2284623588@@ -29,7 +29,7 @@
    2284723589 /****************************************************************************
    … …  
    2286523607diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    2286623608--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    22867 +++ ncurses-5.7/TO-DO   2009-02-28 20:38:38.454044419 -0800
     23609+++ ncurses-5.7/TO-DO   2009-03-22 21:16:47.770848442 -0700
    2286823610@@ -25,7 +25,7 @@
    2286923611 -- sale, use or other dealings in this Software without prior written        --

  • patches/vim-7.2-branch_update-12.patch

    r78ffc068 r1e1873cf  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 03-12-2009
     2Date: 03-22-2009
    33Initial Package Version: 7.2
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 7.2.141
     6Description: Contains all upstream patches up to 7.2.148
    77             The following patches were skipped
    88             007 036 041 049 071 072 074 088 089 093 101 138
    … …  
    1010diff -Naur vim72.orig/Filelist vim72/Filelist
    1111--- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
    12 +++ vim72/Filelist      2009-03-12 11:54:40.397486521 -0700
     12+++ vim72/Filelist      2009-03-22 21:27:50.249298785 -0700
    1313@@ -285,6 +285,7 @@
    1414                src/proto/os_win32.pro \
    … …  
    2121diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
    2222--- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
    23 +++ vim72/runtime/doc/cmdline.txt       2009-03-12 11:54:40.529493784 -0700
     23+++ vim72/runtime/doc/cmdline.txt       2009-03-22 21:28:12.878748987 -0700
    2424@@ -1,4 +1,4 @@
    2525-*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
    … …  
    8080diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
    8181--- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
    82 +++ vim72/runtime/doc/eval.txt  2009-03-12 11:54:50.318122364 -0700
     82+++ vim72/runtime/doc/eval.txt  2009-03-22 21:29:41.424424361 -0700
    8383@@ -1,4 +1,4 @@
    8484-*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
    … …  
    198198 multi_lang             Compiled with support for multiple languages.
    199199 mzscheme               Compiled with MzScheme interface |mzscheme|.
     200diff -Naur vim72.orig/runtime/doc/if_cscop.txt vim72/runtime/doc/if_cscop.txt
     201--- vim72.orig/runtime/doc/if_cscop.txt 2008-08-09 07:22:59.000000000 -0700
     202+++ vim72/runtime/doc/if_cscop.txt      2009-03-22 21:32:56.384915491 -0700
     203@@ -1,4 +1,4 @@
     204-*if_cscop.txt*  For Vim version 7.2.  Last change: 2005 Mar 29
     205+*if_cscop.txt*  For Vim version 7.2.  Last change: 2009 Mar 18
     206 
     207 
     208                  VIM REFERENCE MANUAL    by Andy Kahn
     209@@ -131,11 +131,22 @@
     210                7 or f: Find this file
     211                8 or i: Find files #including this file
     212 
     213+       For all types, except 4 and 6, leading white space for {name} is
     214+       removed.  For 4 and 6 there is exactly one space between {querytype}
     215+       and {name}.  Further white space is included in {name}.
     216+
     217        EXAMPLES >
     218            :cscope find c vim_free
     219-           :cscope find 3 vim_free
     220+           :cscope find 3  vim_free
     221+<
     222+           These two examples perform the same query: functions calling
     223+           "vim_free". >
     224+
     225+           :cscope find t initOnce
     226+           :cscope find t  initOnce
     227 <
     228-           These two examples perform the same query. >
     229+           The first one searches for the text "initOnce", the second one for
     230+           " initOnce". >
     231 
     232            :cscope find 0 DEFAULT_TERM
     233 <
    200234diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
    201235--- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
    202 +++ vim72/runtime/doc/netbeans.txt      2009-03-12 11:54:59.850731108 -0700
     236+++ vim72/runtime/doc/netbeans.txt      2009-03-22 21:30:13.574484705 -0700
    203237@@ -1,4 +1,4 @@
    204238-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
    … …  
    222256diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
    223257--- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
    224 +++ vim72/runtime/doc/options.txt       2009-03-12 11:55:13.407601900 -0700
     258+++ vim72/runtime/doc/options.txt       2009-03-22 21:31:27.231204917 -0700
    225259@@ -1,4 +1,4 @@
    226260-*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
    … …  
    253287diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
    254288--- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
    255 +++ vim72/runtime/doc/spell.txt 2009-03-12 11:54:50.218113983 -0700
     289+++ vim72/runtime/doc/spell.txt 2009-03-22 21:29:26.755482609 -0700
    256290@@ -1,4 +1,4 @@
    257291-*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
    … …  
    383417diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
    384418--- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
    385 +++ vim72/runtime/doc/starting.txt      2009-03-12 11:54:40.533495740 -0700
     419+++ vim72/runtime/doc/starting.txt      2009-03-22 21:28:12.882751502 -0700
    386420@@ -1,4 +1,4 @@
    387421-*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
    … …  
    445479diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
    446480--- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
    447 +++ vim72/runtime/doc/usr_21.txt        2009-03-12 11:54:40.533495740 -0700
     481+++ vim72/runtime/doc/usr_21.txt        2009-03-22 21:28:12.882751502 -0700
    448482@@ -1,4 +1,4 @@
    449483-*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
    … …  
    512546diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
    513547--- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
    514 +++ vim72/runtime/scripts.vim   2009-03-12 11:54:28.900750105 -0700
     548+++ vim72/runtime/scripts.vim   2009-03-22 21:27:09.826708758 -0700
    515549@@ -234,6 +234,10 @@
    516550   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
    … …  
    526560diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
    527561--- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
    528 +++ vim72/src/auto/configure    2009-03-12 11:55:13.667618383 -0700
     562+++ vim72/src/auto/configure    2009-03-22 21:32:18.746505099 -0700
    529563@@ -11565,6 +11565,67 @@
    530564 
    … …  
    635669diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
    636670--- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
    637 +++ vim72/src/buffer.c  2009-03-12 11:55:13.507605811 -0700
     671+++ vim72/src/buffer.c  2009-03-22 21:31:46.680450343 -0700
    638672@@ -437,10 +437,6 @@
    639673        return;
    … …  
    763797diff -Naur vim72.orig/src/config.h.in vim72/src/config.h.in
    764798--- vim72.orig/src/config.h.in  2008-06-21 08:01:41.000000000 -0700
    765 +++ vim72/src/config.h.in       2009-03-12 11:55:13.667618383 -0700
     799+++ vim72/src/config.h.in       2009-03-22 21:32:18.746505099 -0700
    766800@@ -50,6 +50,9 @@
    767801 /* Define to empty if the keyword does not work.  */
    … …  
    776810diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
    777811--- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
    778 +++ vim72/src/configure.in      2009-03-12 11:55:13.667618383 -0700
     812+++ vim72/src/configure.in      2009-03-22 21:32:18.746505099 -0700
    779813@@ -2148,6 +2148,7 @@
    780814 dnl Checks for typedefs, structures, and compiler characteristics.
    … …  
    819853diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
    820854--- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
    821 +++ vim72/src/diff.c    2009-03-12 11:55:16.155775667 -0700
     855+++ vim72/src/diff.c    2009-03-22 21:32:26.210983378 -0700
    822856@@ -8,7 +8,7 @@
    823857  */
    … …  
    954988diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
    955989--- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
    956 +++ vim72/src/edit.c    2009-03-12 11:55:13.411601900 -0700
     990+++ vim72/src/edit.c    2009-03-22 21:31:27.235204917 -0700
    957991@@ -147,6 +147,7 @@
    958992 static int  ins_compl_bs __ARGS((void));
    … …  
    12141248diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
    12151249--- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
    1216 +++ vim72/src/eval.c    2009-03-12 11:55:08.231269731 -0700
     1250+++ vim72/src/eval.c    2009-03-22 21:31:00.153469200 -0700
    12171251@@ -32,6 +32,9 @@
    12181252 
    … …  
    21032137diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
    21042138--- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
    2105 +++ vim72/src/ex_cmds2.c        2009-03-12 11:55:13.311593519 -0700
     2139+++ vim72/src/ex_cmds2.c        2009-03-22 21:31:09.882091074 -0700
    21062140@@ -2842,6 +2842,7 @@
    21072141     linenr_T               save_sourcing_lnum;
    … …  
    21962230diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
    21972231--- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
    2198 +++ vim72/src/ex_cmds.c 2009-03-12 11:55:13.611614471 -0700
     2232+++ vim72/src/ex_cmds.c 2009-03-22 21:32:08.697861154 -0700
    21992233@@ -24,7 +24,7 @@
    22002234 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
    … …  
    24612495diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
    24622496--- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
    2463 +++ vim72/src/ex_cmds.h 2009-03-12 11:54:40.541495740 -0700
     2497+++ vim72/src/ex_cmds.h 2009-03-22 21:28:12.894752340 -0700
    24642498@@ -278,7 +278,7 @@
    24652499 EX(CMD_crewind,                "crewind",      ex_cc,
    … …  
    25092543diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
    25102544--- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
    2511 +++ vim72/src/ex_docmd.c        2009-03-12 11:55:24.900337757 -0700
     2545+++ vim72/src/ex_docmd.c        2009-03-22 21:32:51.508603437 -0700
    25122546@@ -364,6 +364,7 @@
    25132547 # define ex_function           ex_ni
    … …  
    25432577 #endif
    25442578        case CMD_set:
    2545 @@ -5121,7 +5124,11 @@
     2579@@ -3680,6 +3683,11 @@
     2580        case CMD_highlight:
     2581            set_context_in_highlight_cmd(xp, arg);
     2582            break;
     2583+#ifdef FEAT_CSCOPE
     2584+       case CMD_cscope:
     2585+           set_context_in_cscope_cmd(xp, arg);
     2586+           break;
     2587+#endif
     2588 #ifdef FEAT_LISTCMDS
     2589        case CMD_bdelete:
     2590        case CMD_bwipeout:
     2591@@ -5121,7 +5129,11 @@
    25462592            }
    25472593 
    … …  
    25562602        }
    25572603 
    2558 @@ -5479,6 +5486,9 @@
     2604@@ -5180,6 +5192,9 @@
     2605     {EXPAND_AUGROUP, "augroup"},
     2606     {EXPAND_BUFFERS, "buffer"},
     2607     {EXPAND_COMMANDS, "command"},
     2608+#if defined(FEAT_CSCOPE)
     2609+    {EXPAND_CSCOPE, "cscope"},
     2610+#endif
     2611 #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
     2612     {EXPAND_USER_DEFINED, "custom"},
     2613     {EXPAND_USER_LIST, "customlist"},
     2614@@ -5479,6 +5494,9 @@
    25592615     return OK;
    25602616 }
    … …  
    25662622 ex_command(eap)
    25672623     exarg_T   *eap;
    2568 @@ -5910,7 +5920,8 @@
     2624@@ -5910,7 +5928,8 @@
    25692625     char_u     *q;
    25702626 
    … …  
    25762632 
    25772633     size_t     split_len = 0;
    2578 @@ -5927,16 +5938,51 @@
     2634@@ -5927,16 +5946,51 @@
    25792635 
    25802636     /*
    … …  
    26322688            ++end;
    26332689 
    2634 @@ -7803,6 +7849,9 @@
     2690@@ -7803,6 +7857,9 @@
    26352691 {
    26362692     vim_free(prev_dir);
    … …  
    26422698 #endif
    26432699 
    2644 @@ -7825,6 +7874,10 @@
     2700@@ -7825,6 +7882,10 @@
    26452701     else
    26462702 #endif
    … …  
    26532709                                                             && !eap->forceit)
    26542710        {
    2655 @@ -8749,8 +8802,8 @@
     2711@@ -8749,8 +8810,8 @@
    26562712                else if (*dirnow != NUL
    26572713                        && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
    … …  
    26642720 
    26652721                failed |= (makeopens(fd, dirnow) == FAIL);
    2666 @@ -9506,24 +9559,50 @@
     2722@@ -9506,24 +9567,50 @@
    26672723                    break;
    26682724                }
    … …  
    27252781 
    27262782 #ifdef FEAT_SEARCHPATH
    2727 @@ -9541,6 +9620,15 @@
     2783@@ -9541,6 +9628,15 @@
    27282784 #ifdef FEAT_AUTOCMD
    27292785        case SPEC_AFILE:        /* file name for autocommand */
    … …  
    27412797                {
    27422798                    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
    2743 @@ -10067,7 +10155,7 @@
     2799@@ -10067,7 +10163,7 @@
    27442800      */
    27452801     if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
    … …  
    27502806        return FAIL;
    27512807 
    2752 @@ -10689,7 +10777,8 @@
     2808@@ -10689,7 +10785,8 @@
    27532809        p_viminfo = (char_u *)"'100";
    27542810     if (eap->cmdidx == CMD_rviminfo)
    … …  
    27622818diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
    27632819--- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
    2764 +++ vim72/src/ex_getln.c        2009-03-12 11:55:13.699620338 -0700
     2820+++ vim72/src/ex_getln.c        2009-03-22 21:32:51.512605113 -0700
    27652821@@ -31,6 +31,8 @@
    27662822     int                cmdattr;        /* attributes for prompt */
    … …  
    28922948 #ifndef BACKSLASH_IN_FILENAME
    28932949     xp->xp_shell = FALSE;
    2894 @@ -4871,7 +4912,7 @@
     2950@@ -4477,6 +4518,9 @@
     2951            {EXPAND_EVENTS, get_event_name, TRUE},
     2952            {EXPAND_AUGROUP, get_augroup_name, TRUE},
     2953 #endif
     2954+#ifdef FEAT_CSCOPE
     2955+           {EXPAND_CSCOPE, get_cscope_name, TRUE},
     2956+#endif
     2957 #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
     2958        && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
     2959            {EXPAND_LANGUAGE, get_lang_arg, TRUE},
     2960@@ -4871,7 +4915,7 @@
    28952961     if (s == NULL)
    28962962        return FAIL;
    … …  
    29012967     if (all == NULL)
    29022968        return FAIL;
    2903 @@ -4912,9 +4953,10 @@
     2969@@ -4912,9 +4956,10 @@
    29042970  * newlines.  Returns NULL for an error or no matches.
    29052971  */
    … …  
    29132979     expand_T   xpc;
    29142980     char_u     *buf;
    2915 @@ -4943,10 +4985,10 @@
     2981@@ -4943,10 +4988,10 @@
    29162982        {
    29172983            add_pathsep(buf);
    … …  
    29272993                    len += (int)STRLEN(p[i]) + 1;
    29282994 
    2929 @@ -6020,9 +6062,7 @@
     2995@@ -6020,9 +6065,7 @@
    29302996 # endif
    29312997        return K_IGNORE;
    … …  
    29383004     /* Create the command-line buffer empty. */
    29393005     (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
    2940 @@ -6046,7 +6086,7 @@
     3006@@ -6046,7 +6089,7 @@
    29413007     /* Showing the prompt may have set need_wait_return, reset it. */
    29423008     need_wait_return = FALSE;
    … …  
    29493015diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
    29503016--- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
    2951 +++ vim72/src/feature.h 2009-03-12 11:54:40.545495740 -0700
     3017+++ vim72/src/feature.h 2009-03-22 21:28:12.894752340 -0700
    29523018@@ -767,9 +767,13 @@
    29533019 
    … …  
    29683034diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
    29693035--- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
    2970 +++ vim72/src/fileio.c  2009-03-12 11:55:18.711941333 -0700
     3036+++ vim72/src/fileio.c  2009-03-22 21:32:58.833074173 -0700
    29713037@@ -69,7 +69,7 @@
    29723038 static int au_find_group __ARGS((char_u *name));
    … …  
    32783344            if (n)
    32793345            {
    3280 @@ -8523,6 +8632,7 @@
     3346@@ -6538,6 +6647,11 @@
     3347            tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
     3348                                                        + STRLEN(mesg2) + 2));
     3349            sprintf((char *)tbuf, mesg, path);
     3350+#ifdef FEAT_EVAL
     3351+           /* Set warningmsg here, before the unimportant and output-specific
     3352+            * mesg2 has been appended. */
     3353+           set_vim_var_string(VV_WARNINGMSG, tbuf, -1);
     3354+#endif
     3355 #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG)
     3356            if (can_reload)
     3357            {
     3358@@ -8523,6 +8637,7 @@
    32813359     char_u     *save_sourcing_name;
    32823360     linenr_T   save_sourcing_lnum;
    … …  
    32863364     char_u     *save_autocmd_match;
    32873365     int                save_autocmd_busy;
    3288 @@ -8601,6 +8711,7 @@
     3366@@ -8601,6 +8716,7 @@
    32893367      * Save the autocmd_* variables and info about the current buffer.
    32903368      */
    … …  
    32943372     save_autocmd_match = autocmd_match;
    32953373     save_autocmd_busy = autocmd_busy;
    3296 @@ -8618,14 +8729,15 @@
     3374@@ -8618,14 +8734,15 @@
    32973375        if (fname != NULL && *fname != NUL)
    32983376            autocmd_fname = fname;
    … …  
    33123390     /*
    33133391      * Set the buffer number to be used for <abuf>.
    3314 @@ -8810,6 +8922,7 @@
     3392@@ -8810,6 +8927,7 @@
    33153393     sourcing_lnum = save_sourcing_lnum;
    33163394     vim_free(autocmd_fname);
    … …  
    33203398     autocmd_match = save_autocmd_match;
    33213399 #ifdef FEAT_EVAL
    3322 @@ -8918,7 +9031,7 @@
     3400@@ -8918,7 +9036,7 @@
    33233401     {
    33243402        apc->curpat = NULL;
    … …  
    33293407         * buffer number. */
    33303408        if (ap->pat != NULL && ap->cmds != NULL
    3331 @@ -9104,7 +9217,7 @@
     3409@@ -9104,7 +9222,7 @@
    33323410 set_context_in_autocmd(xp, arg, doautocmd)
    33333411     expand_T   *xp;
    … …  
    33403418diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
    33413419--- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
    3342 +++ vim72/src/fold.c    2009-03-12 11:54:59.842732505 -0700
     3420+++ vim72/src/fold.c    2009-03-22 21:30:10.950316246 -0700
    33433421@@ -48,7 +48,7 @@
    33443422 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
    … …  
    34293507diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
    34303508--- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
    3431 +++ vim72/src/getchar.c 2009-03-12 11:55:13.579612236 -0700
     3509+++ vim72/src/getchar.c 2009-03-22 21:32:01.425393770 -0700
    34323510@@ -3816,7 +3816,11 @@
    34333511     int len = 1;
    … …  
    34623540diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
    34633541--- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
    3464 +++ vim72/src/globals.h 2009-03-12 11:55:13.699620338 -0700
     3542+++ vim72/src/globals.h 2009-03-22 21:32:23.782828328 -0700
    34653543@@ -482,8 +482,10 @@
    34663544 /*
    … …  
    35563634diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
    35573635--- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
    3558 +++ vim72/src/gui_at_sb.c       2009-03-12 11:54:50.138110630 -0700
     3636+++ vim72/src/gui_at_sb.c       2009-03-22 21:29:14.042669926 -0700
    35593637@@ -1078,6 +1078,12 @@
    35603638     Cardinal   *num_params;    /* unused */
    … …  
    35803658 }
    35813659 
     3660diff -Naur vim72.orig/src/gui_beval.c vim72/src/gui_beval.c
     3661--- vim72.orig/src/gui_beval.c  2007-05-07 12:33:41.000000000 -0700
     3662+++ vim72/src/gui_beval.c       2009-03-22 21:32:48.872435816 -0700
     3663@@ -1291,6 +1291,23 @@
     3664                XtNy, ty,
     3665                NULL);
     3666 #endif
     3667+       /* Set tooltip colors */
     3668+       {
     3669+           Arg args[2];
     3670+
     3671+#ifdef FEAT_GUI_MOTIF
     3672+           args[0].name = XmNbackground;
     3673+           args[0].value = gui.tooltip_bg_pixel;
     3674+           args[1].name = XmNforeground;
     3675+           args[1].value = gui.tooltip_fg_pixel;
     3676+#else /* Athena */
     3677+           args[0].name = XtNbackground;
     3678+           args[0].value = gui.tooltip_bg_pixel;
     3679+           args[1].name = XtNforeground;
     3680+           args[1].value = gui.tooltip_fg_pixel;
     3681+#endif
     3682+           XtSetValues(beval->balloonLabel, &args[0], XtNumber(args));
     3683+       }
     3684 
     3685        XtPopup(beval->balloonShell, XtGrabNone);
     3686 
    35823687diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
    35833688--- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
    3584 +++ vim72/src/gui.c     2009-03-12 11:54:50.298121805 -0700
     3689+++ vim72/src/gui.c     2009-03-22 21:29:38.972265680 -0700
    35853690@@ -139,7 +139,7 @@
    35863691                /* The read returns when the child closes the pipe (or when
    … …  
    36753780diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
    36763781--- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
    3677 +++ vim72/src/gui_gtk_x11.c     2009-03-12 11:54:50.138110630 -0700
     3782+++ vim72/src/gui_gtk_x11.c     2009-03-22 21:29:14.042669926 -0700
    36783783@@ -4070,14 +4070,14 @@
    36793784 
    … …  
    36993804diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
    37003805--- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
    3701 +++ vim72/src/gui_x11.c 2009-03-12 11:55:13.599613075 -0700
     3806+++ vim72/src/gui_x11.c 2009-03-22 21:32:06.281706663 -0700
    37023807@@ -1587,6 +1587,8 @@
    37033808     XtCloseDisplay(gui.dpy);
    … …  
    38083913diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
    38093914--- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
    3810 +++ vim72/src/gui_xmdlg.c       2009-03-12 11:54:50.142110910 -0700
     3915+++ vim72/src/gui_xmdlg.c       2009-03-22 21:29:14.042669926 -0700
    38113916@@ -369,10 +369,10 @@
    38123917     char       buf[TEMP_BUF_SIZE];
    … …  
    39644069diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
    39654070--- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
    3966 +++ vim72/src/gui_xmebw.c       2009-03-12 11:54:50.142110910 -0700
     4071+++ vim72/src/gui_xmebw.c       2009-03-22 21:29:14.042669926 -0700
    39674072@@ -1256,7 +1256,7 @@
    39684073     }
    … …  
    39914096diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
    39924097--- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
    3993 +++ vim72/src/if_cscope.c       2009-03-12 11:55:05.383086185 -0700
     4098+++ vim72/src/if_cscope.c       2009-03-22 21:32:56.384915491 -0700
    39944099@@ -74,7 +74,7 @@
    39954100     { "add",   cs_add,
    … …  
    40014106                N_("Show this message"),      "help", 0 },
    40024107     { "kill",  cs_kill,
    4003 @@ -1177,10 +1177,27 @@
     4108@@ -93,12 +93,117 @@
     4109     (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage);
     4110 }
     4111 
     4112+#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
     4113+
     4114+static enum
     4115+{
     4116+    EXP_CSCOPE_SUBCMD, /* expand ":cscope" sub-commands */
     4117+    EXP_CSCOPE_FIND,   /* expand ":cscope find" arguments */
     4118+    EXP_CSCOPE_KILL    /* expand ":cscope kill" arguments */
     4119+} expand_what;
     4120+
     4121+/*
     4122+ * Function given to ExpandGeneric() to obtain the cscope command
     4123+ * expansion.
     4124+ */
     4125+/*ARGSUSED*/
     4126+    char_u *
     4127+get_cscope_name(xp, idx)
     4128+    expand_T   *xp;
     4129+    int                idx;
     4130+{
     4131+    switch (expand_what)
     4132+    {
     4133+    case EXP_CSCOPE_SUBCMD:
     4134+       /* Complete with sub-commands of ":cscope":
     4135+        * add, find, help, kill, reset, show */
     4136+       return (char_u *)cs_cmds[idx].name;
     4137+    case EXP_CSCOPE_FIND:
     4138+       {
     4139+           const char *query_type[] =
     4140+           {
     4141+               "c", "d", "e", "f", "g", "i", "s", "t", NULL
     4142+           };
     4143+
     4144+           /* Complete with query type of ":cscope find {query_type}".
     4145+            * {query_type} can be letters (c, d, ... t) or numbers (0, 1,
     4146+            * ..., 8) but only complete with letters, since numbers are
     4147+            * redundant. */
     4148+           return (char_u *)query_type[idx];
     4149+       }
     4150+    case EXP_CSCOPE_KILL:
     4151+       {
     4152+           int                 i;
     4153+           int                 current_idx = 0;
     4154+           static char_u       connection[2];
     4155+
     4156+           /* ":cscope kill" accepts connection numbers or partial names of
     4157+            * the pathname of the cscope database as argument.  Only complete
     4158+            * with connection numbers. -1 can also be used to kill all
     4159+            * connections. */
     4160+           for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
     4161+           {
     4162+               if (csinfo[i].fname == NULL)
     4163+                   continue;
     4164+               if (current_idx++ == idx)
     4165+               {
     4166+                   /* Connection number fits in one character since
     4167+                    * CSCOPE_MAX_CONNECTIONS is < 10 */
     4168+                   connection[0] = i + '0';
     4169+                   connection[1] = NUL;
     4170+                   return connection;
     4171+               }
     4172+           }
     4173+           return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
     4174+       }
     4175+    default:
     4176+       return NULL;
     4177+    }
     4178+}
     4179+
     4180+/*
     4181+ * Handle command line completion for :cscope command.
     4182+ */
     4183+    void
     4184+set_context_in_cscope_cmd(xp, arg)
     4185+    expand_T   *xp;
     4186+    char_u     *arg;
     4187+{
     4188+    char_u     *p;
     4189+
     4190+    /* Default: expand subcommands */
     4191+    xp->xp_context = EXPAND_CSCOPE;
     4192+    expand_what = EXP_CSCOPE_SUBCMD;
     4193+    xp->xp_pattern = arg;
     4194+
     4195+    /* (part of) subcommand already typed */
     4196+    if (*arg != NUL)
     4197+    {
     4198+       p = skiptowhite(arg);
     4199+       if (*p != NUL)              /* past first word */
     4200+       {
     4201+           xp->xp_pattern = skipwhite(p);
     4202+           if (*skiptowhite(xp->xp_pattern) != NUL)
     4203+               xp->xp_context = EXPAND_NOTHING;
     4204+           else if (STRNICMP(arg, "add", p - arg) == 0)
     4205+               xp->xp_context = EXPAND_FILES;
     4206+           else if (STRNICMP(arg, "kill", p - arg) == 0)
     4207+               expand_what = EXP_CSCOPE_KILL;
     4208+           else if (STRNICMP(arg, "find", p - arg) == 0)
     4209+               expand_what = EXP_CSCOPE_FIND;
     4210+           else
     4211+               xp->xp_context = EXPAND_NOTHING;
     4212+       }
     4213+    }
     4214+}
     4215+
     4216+#endif /* FEAT_CMDL_COMPL */
     4217+
     4218 /*
     4219  * PRIVATE: do_cscope_general
     4220  *
     4221- * find the command, print help if invalid, and the then call the
     4222- * corresponding command function,
     4223- * called from do_cscope and do_scscope
     4224+ * Find the command, print help if invalid, and then call the corresponding
     4225+ * command function.
     4226  */
     4227     static void
     4228 do_cscope_general(eap, make_split)
     4229@@ -659,6 +764,7 @@
     4230 {
     4231     char *cmd;
     4232     short search;
     4233+    char *pat;
     4234 
     4235     switch (csoption[0])
     4236     {
     4237@@ -692,10 +798,17 @@
     4238        return NULL;
     4239     }
     4240 
     4241-    if ((cmd = (char *)alloc((unsigned)(strlen(pattern) + 2))) == NULL)
     4242+    /* Skip white space before the patter, except for text and pattern search,
     4243+     * they may want to use the leading white space. */
     4244+    pat = pattern;
     4245+    if (search != 4 && search != 6)
     4246+       while vim_iswhite(*pat)
     4247+           ++pat;
     4248+
     4249+    if ((cmd = (char *)alloc((unsigned)(strlen(pat) + 2))) == NULL)
     4250        return NULL;
     4251 
     4252-    (void)sprintf(cmd, "%d%s", search, pattern);
     4253+    (void)sprintf(cmd, "%d%s", search, pat);
     4254 
     4255     return cmd;
     4256 } /* cs_create_cmd */
     4257@@ -1177,10 +1290,27 @@
    40044258     (void)MSG_PUTS(_("cscope commands:\n"));
    40054259     while (cmdp->name != NULL)
    … …  
    40344288diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
    40354289--- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
    4036 +++ vim72/src/if_cscope.h       2009-03-12 11:54:28.876748429 -0700
     4290+++ vim72/src/if_cscope.h       2009-03-22 21:27:04.882391674 -0700
    40374291@@ -42,17 +42,6 @@
    40384292  * f 7name     Find this file
    … …  
    40554309diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
    40564310--- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
    4057 +++ vim72/src/if_perl.xs        2009-03-12 11:54:50.278119291 -0700
     4311+++ vim72/src/if_perl.xs        2009-03-22 21:29:34.075951949 -0700
    40584312@@ -136,6 +136,9 @@
    40594313 #  define Perl_newXS_flags dll_Perl_newXS_flags
    … …  
    41064360diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
    41074361--- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
    4108 +++ vim72/src/if_python.c       2009-03-12 11:54:59.902735857 -0700
     4362+++ vim72/src/if_python.c       2009-03-22 21:30:25.899274200 -0700
    41094363@@ -531,6 +531,12 @@
    41104364        if (PythonMod_Init())
    … …  
    42084462diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
    42094463--- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
    4210 +++ vim72/src/if_xcmdsrv.c      2009-03-12 11:54:43.269670345 -0700
     4464+++ vim72/src/if_xcmdsrv.c      2009-03-22 21:28:30.191858640 -0700
    42114465@@ -736,7 +736,7 @@
    42124466                + serverReply.ga_len;
    … …  
    42384492diff -Naur vim72.orig/src/macros.h vim72/src/macros.h
    42394493--- vim72.orig/src/macros.h     2007-08-04 04:44:18.000000000 -0700
    4240 +++ vim72/src/macros.h  2009-03-12 11:55:13.411601900 -0700
     4494+++ vim72/src/macros.h  2009-03-22 21:31:27.235204917 -0700
    42414495@@ -127,15 +127,31 @@
    42424496 #ifdef FEAT_LANGMAP
    … …  
    42784532diff -Naur vim72.orig/src/main.c vim72/src/main.c
    42794533--- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
    4280 +++ vim72/src/main.c    2009-03-12 11:54:50.142110910 -0700
     4534+++ vim72/src/main.c    2009-03-22 21:29:14.046670485 -0700
    42814535@@ -645,11 +645,12 @@
    42824536 
    … …  
    43404594diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
    43414595--- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
    4342 +++ vim72/src/mark.c    2009-03-12 11:54:40.549496299 -0700
     4596+++ vim72/src/mark.c    2009-03-22 21:28:12.902752340 -0700
    43434597@@ -1627,15 +1627,17 @@
    43444598 
    … …  
    44094663diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
    44104664--- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
    4411 +++ vim72/src/mbyte.c   2009-03-12 11:54:50.142110910 -0700
     4665+++ vim72/src/mbyte.c   2009-03-22 21:29:14.046670485 -0700
    44124666@@ -717,7 +717,7 @@
    44134667                     * where mblen() returns 0 for invalid character.
    … …  
    44914745diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
    44924746--- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
    4493 +++ vim72/src/menu.c    2009-03-12 11:54:28.852745635 -0700
     4747+++ vim72/src/menu.c    2009-03-22 21:27:00.030081016 -0700
    44944748@@ -1120,6 +1120,7 @@
    44954749        parent = menu;
    … …  
    45024756diff -Naur vim72.orig/src/message.c vim72/src/message.c
    45034757--- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
    4504 +++ vim72/src/message.c 2009-03-12 11:55:13.623615309 -0700
     4758+++ vim72/src/message.c 2009-03-22 21:32:11.106013969 -0700
    45054759@@ -976,7 +976,7 @@
    45064760                    }
    … …  
    46644918diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
    46654919--- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
    4666 +++ vim72/src/misc1.c   2009-03-12 11:54:40.553496578 -0700
    4667 @@ -3245,9 +3245,9 @@
     4920+++ vim72/src/misc1.c   2009-03-22 21:32:58.837074452 -0700
     4921@@ -2955,6 +2955,8 @@
     4922     int            col;                /* column for message; non-zero when in insert
     4923                                   mode and 'showmode' is on */
     4924 {
     4925+    static char *w_readonly = N_("W10: Warning: Changing a readonly file");
     4926+
     4927     if (curbuf->b_did_warn == FALSE
     4928            && curbufIsChanged() == 0
     4929 #ifdef FEAT_AUTOCMD
     4930@@ -2977,8 +2979,10 @@
     4931        if (msg_row == Rows - 1)
     4932            msg_col = col;
     4933        msg_source(hl_attr(HLF_W));
     4934-       MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"),
     4935-                                                  hl_attr(HLF_W) | MSG_HIST);
     4936+       MSG_PUTS_ATTR(_(w_readonly), hl_attr(HLF_W) | MSG_HIST);
     4937+#ifdef FEAT_EVAL
     4938+       set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1);
     4939+#endif
     4940        msg_clr_eos();
     4941        (void)msg_end();
     4942        if (msg_silent == 0 && !silent_mode)
     4943@@ -3245,9 +3249,9 @@
    46684944 
    46694945     /* When using ":silent" assume that <CR> was entered. */
    … …  
    46794955diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
    46804956--- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
    4681 +++ vim72/src/misc2.c   2009-03-12 11:55:33.688900964 -0700
     4957+++ vim72/src/misc2.c   2009-03-22 21:32:41.367955022 -0700
    46824958@@ -496,7 +496,8 @@
    46834959 {
    … …  
    48055081diff -Naur vim72.orig/src/move.c vim72/src/move.c
    48065082--- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
    4807 +++ vim72/src/move.c    2009-03-12 11:54:46.913903059 -0700
     5083+++ vim72/src/move.c    2009-03-22 21:28:40.376510966 -0700
    48085084@@ -280,18 +280,20 @@
    48095085 
    … …  
    48555131diff -Naur vim72.orig/src/nbdebug.c vim72/src/nbdebug.c
    48565132--- vim72.orig/src/nbdebug.c    2008-06-22 08:38:58.000000000 -0700
    4857 +++ vim72/src/nbdebug.c 2009-03-12 11:55:13.487606370 -0700
     5133+++ vim72/src/nbdebug.c 2009-03-22 21:31:41.800136053 -0700
    48585134@@ -33,7 +33,6 @@
    48595135 u_int           nb_dlevel = 0;         /* nb_debug verbosity level */
    … …  
    49165192diff -Naur vim72.orig/src/nbdebug.h vim72/src/nbdebug.h
    49175193--- vim72.orig/src/nbdebug.h    2008-06-22 07:31:50.000000000 -0700
    4918 +++ vim72/src/nbdebug.h 2009-03-12 11:55:13.487606370 -0700
     5194+++ vim72/src/nbdebug.h 2009-03-22 21:31:41.800136053 -0700
    49195195@@ -43,8 +43,6 @@
    49205196 
    … …  
    49485224diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
    49495225--- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
    4950 +++ vim72/src/netbeans.c        2009-03-12 11:55:13.479606090 -0700
     5226+++ vim72/src/netbeans.c        2009-03-22 21:31:39.383983238 -0700
    49515227@@ -1043,7 +1043,7 @@
    49525228        nbdebug(("EVT: %s", buf));
    … …  
    50645340diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
    50655341--- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
    5066 +++ vim72/src/normal.c  2009-03-12 11:55:13.415602459 -0700
     5342+++ vim72/src/normal.c  2009-03-22 21:31:27.235204917 -0700
    50675343@@ -183,6 +183,8 @@
    50685344 static void    nv_cursorhold __ARGS((cmdarg_T *cap));
    … …  
    53425618diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
    53435619--- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
    5344 +++ vim72/src/ops.c     2009-03-12 11:55:27.544506216 -0700
     5620+++ vim72/src/ops.c     2009-03-22 21:32:36.451638218 -0700
    53455621@@ -72,11 +72,11 @@
    53465622  */
    … …  
    55505826diff -Naur vim72.orig/src/option.c vim72/src/option.c
    55515827--- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
    5552 +++ vim72/src/option.c  2009-03-12 11:55:13.683619779 -0700
     5828+++ vim72/src/option.c  2009-03-22 21:32:58.841075011 -0700
    55535829@@ -2593,13 +2593,13 @@
    55545830 #ifdef FEAT_VIMINFO
    … …  
    56925968            /* update flag in swap file */
    56935969            ml_setflags(curbuf);
    5694 @@ -6055,6 +6100,7 @@
     5970@@ -5977,15 +6022,23 @@
     5971        /* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */
     5972        if (varp == &T_CCO)
     5973        {
     5974-           t_colors = atoi((char *)T_CCO);
     5975-           if (t_colors <= 1)
     5976+           int colors = atoi((char *)T_CCO);
     5977+
     5978+           /* Only reinitialize colors if t_Co value has really changed to
     5979+            * avoid expensive reload of colorscheme if t_Co is set to the
     5980+            * same value multiple times. */
     5981+           if (colors != t_colors)
     5982            {
     5983-               if (new_value_alloced)
     5984-                   vim_free(T_CCO);
     5985-               T_CCO = empty_option;
     5986+               t_colors = colors;
     5987+               if (t_colors <= 1)
     5988+               {
     5989+                   if (new_value_alloced)
     5990+                       vim_free(T_CCO);
     5991+                   T_CCO = empty_option;
     5992+               }
     5993+               /* We now have a different color setup, initialize it again. */
     5994+               init_highlight(TRUE, FALSE);
     5995            }
     5996-           /* We now have a different color setup, initialize it again. */
     5997-           init_highlight(TRUE, FALSE);
     5998        }
     5999        ttest(FALSE);
     6000        if (varp == &T_ME)
     6001@@ -6055,6 +6108,7 @@
    56956002                    errmsg = (char_u *)N_("E596: Invalid font(s)");
    56966003            }
    … …  
    57006007 # ifdef FEAT_XFONTSET
    57016008     else if (varp == &p_guifontset)
    5702 @@ -6063,6 +6109,7 @@
     6009@@ -6063,6 +6117,7 @@
    57036010            errmsg = (char_u *)N_("E597: can't select fontset");
    57046011        else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
    … …  
    57086015 # endif
    57096016 # ifdef FEAT_MBYTE
    5710 @@ -6072,6 +6119,7 @@
     6017@@ -6072,6 +6127,7 @@
    57116018            errmsg = (char_u *)N_("E533: can't select wide font");
    57126019        else if (gui_get_wide_font() == FAIL)
    … …  
    57166023 # endif
    57176024 #endif
    5718 @@ -6133,13 +6181,24 @@
     6025@@ -6133,13 +6189,24 @@
    57196026 #ifdef FEAT_GUI
    57206027     /* 'guioptions' */
    … …  
    57416048 
    57426049 #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
    5743 @@ -6717,7 +6776,11 @@
     6050@@ -6717,7 +6784,11 @@
    57446051 
    57456052     if (curwin->w_curswant != MAXCOL)
    … …  
    57546061     return errmsg;
    57556062 }
    5756 @@ -7105,22 +7168,28 @@
     6063@@ -7105,22 +7176,28 @@
    57576064            curbuf->b_did_warn = FALSE;
    57586065 
    … …  
    57906097 
    57916098     /* when 'bin' is set also set some other options */
    5792 @@ -7128,7 +7197,7 @@
     6099@@ -7128,7 +7205,7 @@
    57936100     {
    57946101        set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
    … …  
    57996106     }
    58006107 
    5801 @@ -7279,7 +7348,7 @@
     6108@@ -7279,7 +7356,7 @@
    58026109        if (!value)
    58036110            save_file_ff(curbuf);       /* Buffer is unchanged */
    … …  
    58086115 #ifdef FEAT_AUTOCMD
    58096116        modified_was_set = value;
    5810 @@ -7714,7 +7783,7 @@
     6117@@ -7486,9 +7563,13 @@
     6118             * set. */
     6119            if (STRCMP(p_enc, "utf-8") != 0)
     6120            {
     6121+               static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
     6122+
     6123                msg_source(hl_attr(HLF_W));
     6124-               MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"),
     6125-                       hl_attr(HLF_W));
     6126+               MSG_ATTR(_(w_arabic), hl_attr(HLF_W));
     6127+#ifdef FEAT_EVAL
     6128+               set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1);
     6129+#endif
     6130            }
     6131 
     6132 # ifdef FEAT_MBYTE
     6133@@ -7714,7 +7795,7 @@
    58116134        newFoldLevel();
    58126135     }
    … …  
    58176140     {
    58186141        foldUpdateAll(curwin);
    5819 @@ -7974,6 +8043,11 @@
     6142@@ -7974,6 +8055,11 @@
    58206143        else /* curwin->w_p_scr > curwin->w_height */
    58216144            curwin->w_p_scr = curwin->w_height;
    … …  
    58296152     {
    58306153        errmsg = e_positive;
    5831 @@ -8227,13 +8301,13 @@
     6154@@ -8227,13 +8313,13 @@
    58326155            {
    58336156                if (number == 0 && string != NULL)
    … …  
    58466169                        /* There's another character after zeros or the string
    58476170                         * is empty.  In both cases, we are trying to set a
    5848 @@ -8323,7 +8397,7 @@
     6171@@ -8323,7 +8409,7 @@
    58496172     {
    58506173        --arg;                      /* put arg at the '<' */
    … …  
    58556178            key = 0;
    58566179     }
    5857 @@ -10093,25 +10167,110 @@
     6180@@ -10093,25 +10179,110 @@
    58586181 
    58596182 #ifdef FEAT_LANGMAP
    … …  
    58736196+ * langmap_entry_T.  This does the same as langmap_mapchar[] for characters >=
    58746197+ * 256.
    5875   */
     6198+ */
    58766199+# ifdef FEAT_MBYTE
    58776200+/*
    58786201+ * With multi-byte support use growarray for 'langmap' chars >= 256
    5879 + */
     6202  */
    58806203+typedef struct
    58816204+{
    … …  
    59756298 
    59766299 /*
    5977 @@ -10125,7 +10284,10 @@
     6300@@ -10125,7 +10296,10 @@
    59786301     char_u  *p2;
    59796302     int            from, to;
    … …  
    59876310     for (p = p_langmap; p[0] != NUL; )
    59886311     {
    5989 @@ -10175,7 +10337,13 @@
     6312@@ -10175,7 +10349,13 @@
    59906313                                                             transchar(from));
    59916314                return;
    … …  
    60046327diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
    60056328--- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
    6006 +++ vim72/src/os_unix.c 2009-03-12 11:55:13.671618662 -0700
     6329+++ vim72/src/os_unix.c 2009-03-22 21:32:18.750505657 -0700
    60076330@@ -181,7 +181,8 @@
    60086331        && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
    … …  
    63606683diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
    63616684--- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
    6362 +++ vim72/src/proto/eval.pro    2009-03-12 11:54:47.005909205 -0700
     6685+++ vim72/src/proto/eval.pro    2009-03-22 21:28:55.169458863 -0700
    63636686@@ -17,7 +17,7 @@
    63646687 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
    … …  
    64026725diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
    64036726--- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
    6404 +++ vim72/src/proto/ex_cmds.pro 2009-03-12 11:55:13.611614471 -0700
     6727+++ vim72/src/proto/ex_cmds.pro 2009-03-22 21:32:08.697861154 -0700
    64056728@@ -11,7 +11,7 @@
    64066729 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
    … …  
    64226745diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
    64236746--- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
    6424 +++ vim72/src/proto/ex_getln.pro        2009-03-12 11:55:13.703620617 -0700
     6747+++ vim72/src/proto/ex_getln.pro        2009-03-22 21:32:23.786828608 -0700
    64256748@@ -4,6 +4,7 @@
    64266749 int text_locked __ARGS((void));
    … …  
    64406763 int get_histtype __ARGS((char_u *name));
    64416764 void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
     6765diff -Naur vim72.orig/src/proto/if_cscope.pro vim72/src/proto/if_cscope.pro
     6766--- vim72.orig/src/proto/if_cscope.pro  2008-08-09 07:31:33.000000000 -0700
     6767+++ vim72/src/proto/if_cscope.pro       2009-03-22 21:32:51.512605113 -0700
     6768@@ -1,4 +1,6 @@
     6769 /* if_cscope.c */
     6770+char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
     6771+void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg));
     6772 void do_cscope __ARGS((exarg_T *eap));
     6773 void do_scscope __ARGS((exarg_T *eap));
     6774 void do_cstag __ARGS((exarg_T *eap));
    64426775diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
    64436776--- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
    6444 +++ vim72/src/proto/mark.pro    2009-03-12 11:54:40.553496578 -0700
     6777+++ vim72/src/proto/mark.pro    2009-03-22 21:28:12.902752340 -0700
    64456778@@ -26,5 +26,5 @@
    64466779 void write_viminfo_filemarks __ARGS((FILE *fp));
    … …  
    64526785diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
    64536786--- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
    6454 +++ vim72/src/proto/misc2.pro   2009-03-12 11:54:56.454515435 -0700
     6787+++ vim72/src/proto/misc2.pro   2009-03-22 21:29:58.829540160 -0700
    64556788@@ -59,7 +59,7 @@
    64566789 int handle_x_keys __ARGS((int key));
    … …  
    64646797diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
    64656798--- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
    6466 +++ vim72/src/proto/netbeans.pro        2009-03-12 11:54:59.854733063 -0700
     6799+++ vim72/src/proto/netbeans.pro        2009-03-22 21:30:13.578485264 -0700
    64676800@@ -11,7 +11,7 @@
    64686801 void netbeans_frame_moved __ARGS((int new_x, int new_y));
    … …  
    64766809diff -Naur vim72.orig/src/proto/option.pro vim72/src/proto/option.pro
    64776810--- vim72.orig/src/proto/option.pro     2008-08-09 07:31:43.000000000 -0700
    6478 +++ vim72/src/proto/option.pro  2009-03-12 11:55:13.419602459 -0700
     6811+++ vim72/src/proto/option.pro  2009-03-22 21:31:27.239205476 -0700
    64796812@@ -44,6 +44,7 @@
    64806813 void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags));
    … …  
    64876820diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
    64886821--- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
    6489 +++ vim72/src/pty.c     2009-03-12 11:54:28.844744238 -0700
     6822+++ vim72/src/pty.c     2009-03-22 21:26:57.485917865 -0700
    64906823@@ -270,9 +270,10 @@
    64916824 }
    … …  
    65036836diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c
    65046837--- vim72.orig/src/quickfix.c   2008-07-18 05:53:02.000000000 -0700
    6505 +++ vim72/src/quickfix.c        2009-03-12 11:55:13.547610560 -0700
     6838+++ vim72/src/quickfix.c        2009-03-22 21:31:54.128927784 -0700
    65066839@@ -1419,6 +1419,7 @@
    65076840     int                        opened_window = FALSE;
    … …  
    66006933diff -Naur vim72.orig/src/regexp.c vim72/src/regexp.c
    66016934--- vim72.orig/src/regexp.c     2008-08-07 12:58:50.000000000 -0700
    6602 +++ vim72/src/regexp.c  2009-03-12 11:55:13.471605532 -0700
     6935+++ vim72/src/regexp.c  2009-03-22 21:31:36.967828468 -0700
    66036936@@ -4532,7 +4532,7 @@
    66046937                cleanup_subexpr();
    … …  
    66376970diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
    66386971--- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
    6639 +++ vim72/src/screen.c  2009-03-12 11:55:39.893297947 -0700
     6972+++ vim72/src/screen.c  2009-03-22 21:33:03.705385948 -0700
    66406973@@ -2439,9 +2439,17 @@
    66416974 
    … …  
    66797012                fromcol = wp->w_old_cursor_fcol;
    66807013                tocol = wp->w_old_cursor_lcol;
    6681 @@ -3412,6 +3422,7 @@
     7014@@ -2879,8 +2889,9 @@
     7015        }
     7016        else
     7017            tocol = MAXCOL;
     7018-       if (fromcol == tocol)           /* do at least one character */
     7019-           tocol = fromcol + 1;        /* happens when past end of line */
     7020+       /* do at least one character; happens when past end of line */
     7021+       if (fromcol == tocol)
     7022+           tocol = fromcol + 1;
     7023        area_highlighting = TRUE;
     7024        attr = hl_attr(HLF_I);
     7025     }
     7026@@ -3412,6 +3423,7 @@
    66827027                        && (*mb_ptr2cells)(ptr) > 1)
    66837028 #endif
    … …  
    66877032                area_attr = attr;               /* start highlighting */
    66887033            else if (area_attr != 0
    6689 @@ -3544,7 +3555,8 @@
     7034@@ -3544,7 +3556,8 @@
    66907035                /* Use line_attr when not in the Visual or 'incsearch' area
    66917036                 * (area_attr may be 0 when "noinvcur" is set). */
    … …  
    66977042 #endif
    66987043            else
    6699 @@ -4549,7 +4561,8 @@
     7044@@ -4106,6 +4119,7 @@
     7045 # endif
     7046                                    (col < W_WIDTH(wp)))
     7047                                && !(noinvcur
     7048+                                   && lnum == wp->w_cursor.lnum
     7049                                    && (colnr_T)vcol == wp->w_virtcol)))
     7050                        && lcs_eol_one >= 0)
     7051                {
     7052@@ -4247,7 +4261,7 @@
     7053         * preedit_changed and commit.  Thus Vim can't set "im_is_active", use
     7054         * im_is_preediting() here. */
     7055        if (xic != NULL
     7056-               && lnum == curwin->w_cursor.lnum
     7057+               && lnum == wp->w_cursor.lnum
     7058                && (State & INSERT)
     7059                && !p_imdisable
     7060                && im_is_preediting()
     7061@@ -4256,7 +4270,7 @@
     7062            colnr_T tcol;
     7063 
     7064            if (preedit_end_col == MAXCOL)
     7065-               getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL);
     7066+               getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL);
     7067            else
     7068                tcol = preedit_end_col;
     7069            if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
     7070@@ -4353,7 +4367,13 @@
     7071            }
     7072 #endif
     7073            if (lcs_eol == lcs_eol_one
     7074-                   && ((area_attr != 0 && vcol == fromcol && c == NUL)
     7075+                   && ((area_attr != 0 && vcol == fromcol
     7076+#ifdef FEAT_VISUAL
     7077+                           && (VIsual_mode != Ctrl_V
     7078+                               || lnum == VIsual.lnum
     7079+                               || lnum == curwin->w_cursor.lnum)
     7080+#endif
     7081+                           && c == NUL)
     7082 #ifdef FEAT_SEARCH_EXTRA
     7083                        /* highlight 'hlsearch' match at end of line */
     7084                        || (prevcol_hl_flag == TRUE
     7085@@ -4447,7 +4467,8 @@
     7086        if (c == NUL)
     7087        {
     7088 #ifdef FEAT_SYN_HL
     7089-           if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol)
     7090+           if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol
     7091+                   && lnum == wp->w_cursor.lnum)
     7092            {
     7093                /* highlight last char after line */
     7094                --col;
     7095@@ -4549,7 +4570,8 @@
    67007096         * highlight the cursor position itself. */
    67017097        if (wp->w_p_cuc && vcol == (long)wp->w_virtcol
    … …  
    67077103            vcol_save_attr = char_attr;
    67087104            char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC));
    6709 @@ -5119,8 +5132,8 @@
     7105@@ -4652,7 +4674,7 @@
     7106            --n_skip;
     7107 
     7108        /* Only advance the "vcol" when after the 'number' column. */
     7109-       if (draw_state >= WL_SBR
     7110+       if (draw_state > WL_NR
     7111 #ifdef FEAT_DIFF
     7112                && filler_todo <= 0
     7113 #endif
     7114@@ -5119,8 +5141,8 @@
    67107115 #endif
    67117116 
    … …  
    67187123             * and for some xterms. */
    67197124            if (
    6720 @@ -6263,9 +6276,15 @@
     7125@@ -6263,9 +6285,15 @@
    67217126     int                pcc[MAX_MCO];
    67227127 # endif
    … …  
    67347139 #ifdef FEAT_MBYTE
    67357140     /* When drawing over the right halve of a double-wide char clear out the
    6736 @@ -6275,10 +6294,21 @@
     7141@@ -6275,10 +6303,21 @@
    67377142            && !gui.in_use
    67387143 # endif
    … …  
    67587163     max_off = LineOffset[row] + screen_Columns;
    67597164 #endif
    6760 @@ -6342,7 +6372,12 @@
     7165@@ -6342,7 +6381,12 @@
    67617166        }
    67627167 #endif
    … …  
    67727177                || (mbyte_cells == 2
    67737178                    && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0))
    6774 @@ -6350,24 +6385,24 @@
     7179@@ -6350,24 +6394,24 @@
    67757180                    && c == 0x8e
    67767181                    && ScreenLines2[off] != ptr[1])
    … …  
    68067211                    gui.in_use
    68077212 # endif
    6808 @@ -6377,23 +6412,14 @@
     7213@@ -6377,23 +6421,14 @@
    68097214 # ifdef UNIX
    68107215                    term_is_xterm
    … …  
    68367241 #endif
    68377242 #ifdef FEAT_MBYTE
    6838 @@ -6480,6 +6506,20 @@
     7243@@ -6480,6 +6515,20 @@
    68397244            ++ptr;
    68407245        }
    … …  
    68577262 
    68587263 #ifdef FEAT_SEARCH_EXTRA
    6859 @@ -7356,7 +7396,11 @@
     7264@@ -7356,7 +7405,11 @@
    68607265 #endif
    68617266     static int     entered = FALSE;            /* avoid recursiveness */
    … …  
    68697274      * Allocation of the screen buffers is done only when the size changes and
    68707275      * when Rows and Columns have been set and we have started doing full
    6871 @@ -7440,10 +7484,13 @@
     7276@@ -7440,10 +7493,13 @@
    68727277        {
    68737278            outofmem = TRUE;
    … …  
    68847289 #ifdef FEAT_MBYTE
    68857290     for (i = 0; i < p_mco; ++i)
    6886 @@ -7628,8 +7675,17 @@
     7291@@ -7628,8 +7684,17 @@
    68877292     --RedrawingDisabled;
    68887293 
    … …  
    69057310diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
    69067311--- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
    6907 +++ vim72/src/spell.c   2009-03-12 11:55:13.363596871 -0700
     7312+++ vim72/src/spell.c   2009-03-22 21:31:19.602716022 -0700
    69087313@@ -77,7 +77,7 @@
    69097314 
    … …  
    77768181diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
    77778182--- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
    7778 +++ vim72/src/structs.h 2009-03-12 11:54:46.913903059 -0700
     8183+++ vim72/src/structs.h 2009-03-22 21:28:40.380513201 -0700
    77798184@@ -459,7 +459,7 @@
    77808185 typedef struct
    … …  
    78058210diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
    78068211--- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
    7807 +++ vim72/src/tag.c     2009-03-12 11:55:13.591613075 -0700
     8212+++ vim72/src/tag.c     2009-03-22 21:32:03.853549379 -0700
    78088213@@ -515,7 +515,7 @@
    78098214             * If a count is supplied to the ":tag <name>" command, then
    … …  
    79368341diff -Naur vim72.orig/src/term.c vim72/src/term.c
    79378342--- vim72.orig/src/term.c       2008-07-27 04:48:06.000000000 -0700
    7938 +++ vim72/src/term.c    2009-03-12 11:54:59.914737254 -0700
     8343+++ vim72/src/term.c    2009-03-22 21:30:28.311427015 -0700
    79398344@@ -4920,7 +4920,15 @@
    79408345        key_name[0] = KEY2TERMCAP0(key);
    … …  
    79568361diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
    79578362--- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
    7958 +++ vim72/src/testdir/Makefile  2009-03-12 11:55:27.544506216 -0700
     8363+++ vim72/src/testdir/Makefile  2009-03-22 21:32:36.451638218 -0700
    79598364@@ -20,21 +20,23 @@
    79608365                test48.out test49.out test51.out test52.out test53.out \
    … …  
    79978402diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
    79988403--- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
    7999 +++ vim72/src/testdir/Make_ming.mak     2009-03-12 11:54:40.397486521 -0700
     8404+++ vim72/src/testdir/Make_ming.mak     2009-03-22 21:27:50.249298785 -0700
    80008405@@ -0,0 +1,91 @@
    80018406+# Makefile to run tests for Vim, on Dos-like machines
    … …  
    80928497diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
    80938498--- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
    8094 +++ vim72/src/testdir/test42.ok 2009-03-12 11:54:40.601499372 -0700
     8499+++ vim72/src/testdir/test42.ok 2009-03-22 21:28:17.791064674 -0700
    80958500@@ -20,7 +20,7 @@
    80968501 ucs-2
    … …  
    81048509diff -Naur vim72.orig/src/testdir/test66.in vim72/src/testdir/test66.in
    81058510--- vim72.orig/src/testdir/test66.in    1969-12-31 16:00:00.000000000 -0800
    8106 +++ vim72/src/testdir/test66.in 2009-03-12 11:55:27.544506216 -0700
     8511+++ vim72/src/testdir/test66.in 2009-03-22 21:32:36.451638218 -0700
    81078512@@ -0,0 +1,25 @@
    81088513+
    … …  
    81338538diff -Naur vim72.orig/src/testdir/test66.ok vim72/src/testdir/test66.ok
    81348539--- vim72.orig/src/testdir/test66.ok    1969-12-31 16:00:00.000000000 -0800
    8135 +++ vim72/src/testdir/test66.ok 2009-03-12 11:55:27.544506216 -0700
     8540+++ vim72/src/testdir/test66.ok 2009-03-22 21:32:36.451638218 -0700
    81368541@@ -0,0 +1,10 @@
    81378542+    abcdefghijklmnopqrstuvwxyz
    … …  
    81478552diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
    81488553--- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
    8149 +++ vim72/src/ui.c      2009-03-12 11:54:50.158111748 -0700
     8554+++ vim72/src/ui.c      2009-03-22 21:29:14.058671044 -0700
    81508555@@ -1820,7 +1820,7 @@
    81518556 #ifdef HAVE_DUP
    … …  
    82558660diff -Naur vim72.orig/src/version.c vim72/src/version.c
    82568661--- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
    8257 +++ vim72/src/version.c 2009-03-12 11:55:39.893297947 -0700
    8258 @@ -677,9 +677,280 @@
     8662+++ vim72/src/version.c 2009-03-22 21:33:03.705385948 -0700
     8663@@ -677,9 +677,294 @@
    82598664 static int included_patches[] =
    82608665 {   /* Add new patch number below this line */
    82618666 /**/
     8667+    148,
     8668+/**/
     8669+    147,
     8670+/**/
     8671+    146,
     8672+/**/
     8673+    145,
     8674+/**/
     8675+    144,
     8676+/**/
     8677+    143,
     8678+/**/
     8679+    142,
     8680+/**/
    82628681+    141,
    82638682+/**/
    … …  
    85378956 highest_patch()
    85388957 {
    8539 @@ -786,7 +1057,7 @@
     8958@@ -786,7 +1071,7 @@
    85408959     MSG_PUTS(_("\nRISC OS version"));
    85418960 #endif
    … …  
    85468965     if (*compiled_arch != NUL)
    85478966     {
    8548 @@ -825,6 +1096,19 @@
     8967@@ -825,6 +1110,19 @@
    85498968        }
    85508969     }
    … …  
    85688987diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
    85698988--- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
    8570 +++ vim72/src/vim.h     2009-03-12 11:55:13.547610560 -0700
     8989+++ vim72/src/vim.h     2009-03-22 21:32:51.512605113 -0700
    85718990@@ -341,8 +341,14 @@
    85728991 #ifdef BACKSLASH_IN_FILENAME
    … …  
    85959014 typedef unsigned long __w64    long_u;
    85969015 typedef                 long __w64     long_i;
    8597 @@ -1051,6 +1057,7 @@
     9016@@ -702,6 +708,7 @@
     9017 #define EXPAND_USER_DEFINED    30
     9018 #define EXPAND_USER_LIST       31
     9019 #define EXPAND_SHELLCMD                32
     9020+#define EXPAND_CSCOPE          33
     9021 
     9022 /* Values for exmode_active (0 is no exmode) */
     9023 #define EXMODE_NORMAL          1
     9024@@ -1051,6 +1058,7 @@
    85989025 #define WSP_HELP       16      /* creating the help window */
    85999026 #define WSP_BELOW      32      /* put new window below/right */
    … …  
    86039030 /*
    86049031  * arguments for gui_set_shellsize()
    8605 @@ -1728,7 +1735,8 @@
     9032@@ -1728,7 +1736,8 @@
    86069033 #define VV_MOUSE_COL   51
    86079034 #define VV_OP          52
    … …  
    86139040 #ifdef FEAT_CLIPBOARD
    86149041 
    8615 @@ -1979,6 +1987,9 @@
     9042@@ -1979,6 +1988,9 @@
    86169043 # endif
    86179044 #endif
    … …  
    86239050 # include "nbdebug.h"
    86249051 #else
    8625 @@ -2054,4 +2065,10 @@
     9052@@ -2054,4 +2066,10 @@
    86269053 #define DOSO_VIMRC     1       /* loading vimrc file */
    86279054 #define DOSO_GVIMRC    2       /* loading gvimrc file */
    … …  
    86369063diff -Naur vim72.orig/src/window.c vim72/src/window.c
    86379064--- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
    8638 +++ vim72/src/window.c  2009-03-12 11:55:13.547610560 -0700
     9065+++ vim72/src/window.c  2009-03-22 21:31:54.132928342 -0700
    86399066@@ -12,7 +12,7 @@
    86409067 static int path_is_url __ARGS((char_u *p));
    … …  
    87279154diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
    87289155--- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
    8729 +++ vim72/src/workshop.c        2009-03-12 11:54:50.062104763 -0700
     9156+++ vim72/src/workshop.c        2009-03-22 21:29:08.534315407 -0700
    87309157@@ -1121,8 +1121,12 @@
    87319158                                      ? (char *)curbuf->b_sfname : "<None>");
Note: See TracChangeset for help on using the changeset viewer.