Changeset 1970967 in clfs-sysroot for patches


Ignore:
Timestamp:
Mar 15, 2009, 2:41:38 PM (16 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
676d923
Parents:
875332a
Message:

Update Patches.

File:
1 moved

Legend:

Unmodified
Added
Removed

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

    r875332a r1970967  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 01-27-2009
     2Date: 02-28-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-20090124.
     7             rechecked periodically. This patch covers up to 5.7-20090228.
    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-01-27 16:45:03.668729990 -0800
     11+++ ncurses-5.7/aclocal.m4      2009-02-28 20:38:54.327061041 -0800
    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.482 2009/01/17 21:10:05 tom Exp $
     24+dnl $Id: aclocal.m4,v 1.483 2009/02/07 19:12:17 tom Exp $
    2525 dnl Macros used in NCURSES auto-configuration script.
    2626 dnl
    2727 dnl These macros are maintained separately from NCURSES.  The copyright on
     28@@ -86,7 +86,7 @@
     29 AC_SUBST(ACPPFLAGS)
     30 ])dnl
     31 dnl ---------------------------------------------------------------------------
     32-dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30
     33+dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30
     34 dnl -------------
     35 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
     36 dnl The second parameter if given makes this macro verbose.
     37@@ -156,7 +156,7 @@
     38 
     39 if test -n "$cf_new_cppflags" ; then
     40        ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
     41-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     42+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     43 fi
     44 
     45 if test -n "$cf_new_extra_cppflags" ; then
    2846@@ -168,7 +168,7 @@
    2947 
    … …  
    3149 dnl ---------------------------------------------------------------------------
    3250-dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
    33 +dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
     51+dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47
    3452 dnl -------------
    3553 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
    … …  
    4462                        then
    4563                          cf_save_CPPFLAGS=$CPPFLAGS
    46 @@ -213,9 +213,9 @@
     64@@ -211,11 +211,11 @@
     65 
     66                if test "$cf_have_incdir" = no ; then
    4767                  CF_VERBOSE(adding $cf_add_incdir to include-path)
    48                   ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
     68-                 ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
     69+                 ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir"
    4970 
    5071-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
    … …  
    5778                  break
    5879                fi
     80@@ -225,7 +225,7 @@
     81 fi
     82 ])dnl
     83 dnl ---------------------------------------------------------------------------
     84-dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
     85+dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08
     86 dnl -------------
     87 dnl    Adds to the library-path
     88 dnl
     89@@ -254,7 +254,7 @@
     90       fi
     91       if test "$cf_have_libdir" = no ; then
     92         CF_VERBOSE(adding $cf_add_libdir to library-path)
     93-        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
     94+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"
     95       fi
     96     fi
     97   done
    5998@@ -353,7 +353,41 @@
    6099 fi
    … …  
    62101 dnl ---------------------------------------------------------------------------
    63102-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
    64 +dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
     103+dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23
    65104+dnl -----------
    66105+dnl Check for suitable "ar" (archiver) options for updating an archive.
    … …  
    92131+       rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
    93132+])
    94 +
     133+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
    95134+AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
    96135+])
    … …  
    193232 dnl ---------------------------------------------------------------------------
    194233 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
     234@@ -2026,7 +2082,7 @@
     235 [AC_DIVERT_HELP([$1])dnl
     236 ])dnl
     237 dnl ---------------------------------------------------------------------------
     238-dnl CF_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15
     239+dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
     240 dnl ---------------
     241 dnl Construct the list of include-options according to whether we're building
     242 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
     243@@ -2034,9 +2090,9 @@
     244 dnl since that usually breaks gcc's shadow-includes.
     245 AC_DEFUN([CF_INCLUDE_DIRS],
     246 [
     247-CPPFLAGS="-I. -I../include $CPPFLAGS"
     248+CPPFLAGS="$CPPFLAGS -I. -I../include"
     249 if test "$srcdir" != "."; then
     250-       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
     251+       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
     252 fi
     253 if test "$GCC" != yes; then
     254        CPPFLAGS="$CPPFLAGS -I\${includedir}"
    195255@@ -2143,7 +2199,7 @@
    196256 ])
    … …  
    404464        rm -f conftest.$ac_ext func.o
    405465        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
     466@@ -2956,7 +3049,7 @@
     467 AC_SUBST(MAKE_LOWER_TAGS)
     468 ])dnl
     469 dnl ---------------------------------------------------------------------------
     470-dnl CF_MANPAGE_FORMAT version: 7 updated: 2003/12/20 19:30:34
     471+dnl CF_MANPAGE_FORMAT version: 8 updated: 2009/01/11 20:30:50
     472 dnl -----------------
     473 dnl Option to allow user to override automatic configuration of manpage format.
     474 dnl There are several special cases:
     475@@ -2998,7 +3091,7 @@
     476   cf_catonly=yes
     477   cf_example=date
     478 
     479-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
     480+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
     481   for cf_dir in $MANPATH; do
     482     test -z "$cf_dir" && cf_dir=/usr/man
     483     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 @@
     485        esac
     486 ])dnl
     487 dnl ---------------------------------------------------------------------------
     488-dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53
     489+dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23
     490 dnl ----------
     491 dnl Provide a value for the $PATH and similar separator
     492 AC_DEFUN([CF_PATHSEP],
     493 [
     494        case $cf_cv_system_name in
     495-       os2*)   PATHSEP=';'  ;;
     496-       *)      PATHSEP=':'  ;;
     497+       os2*)   PATH_SEPARATOR=';'  ;;
     498+       *)      PATH_SEPARATOR=':'  ;;
     499        esac
     500-ifelse($1,,,[$1=$PATHSEP])
     501-       AC_SUBST(PATHSEP)
     502+ifelse($1,,,[$1=$PATH_SEPARATOR])
     503+       AC_SUBST(PATH_SEPARATOR)
     504 ])dnl
     505 dnl ---------------------------------------------------------------------------
     506 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
    406507@@ -3737,6 +3830,38 @@
    407508 esac
    408509 ])dnl
    409510 dnl ---------------------------------------------------------------------------
    410 +dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
     511+dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09
    411512+dnl -------------
    412513+dnl Check for the package-config program, unless disabled by command-line.
    … …  
    420521+AC_MSG_RESULT($cf_pkg_config)
    421522+
    422 +case $cf_pkg_config in
    423 +no)
     523+case $cf_pkg_config in #(vi
     524+no) #(vi
    424525+       PKG_CONFIG=none
    425526+       ;;
    426 +yes)
     527+yes) #(vi
    427528+       AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
    428529+       ;;
    … …  
    738839        LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
    739840        LIB_OBJECT='${OBJECTS:.o=.lo}'
     841@@ -5393,7 +5544,7 @@
     842 AC_SUBST($3)dnl
     843 ])dnl
     844 dnl ---------------------------------------------------------------------------
     845-dnl CF_WITH_PATHLIST version: 5 updated: 2001/12/10 01:28:30
     846+dnl CF_WITH_PATHLIST version: 6 updated: 2009/01/11 20:30:23
     847 dnl ----------------
     848 dnl Process an option specifying a list of colon-separated paths.
     849 dnl
     850@@ -5409,7 +5560,7 @@
     851 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
     852 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
     853 
     854-IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
     855+IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
     856 cf_dst_path=
     857 for cf_src_path in $withval
     858 do
    740859@@ -5535,7 +5686,7 @@
    741860        [USE_VALGRIND])
    … …  
    767886diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
    768887--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
    769 +++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-01-27 16:45:02.332643665 -0800
     888+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-28 20:38:50.310805699 -0800
    770889@@ -1,18 +1,47 @@
    771890 #! /bin/sh
    … …  
    841960diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
    842961--- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
    843 +++ ncurses-5.7/Ada95/gen/Makefile.in   2009-01-27 16:45:02.332643665 -0800
     962+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-28 20:38:50.306805140 -0800
    844963@@ -1,5 +1,5 @@
    845964 ##############################################################################
    … …  
    8971016diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    8981017--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    899 +++ ncurses-5.7/Ada95/samples/Makefile.in       2009-01-27 16:45:02.332643665 -0800
     1018+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-28 20:38:50.310805699 -0800
    9001019@@ -1,5 +1,5 @@
    9011020 ##############################################################################
    … …  
    9361055diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
    9371056--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
    938 +++ ncurses-5.7/Ada95/src/Makefile.in   2009-01-27 16:45:02.332643665 -0800
     1057+++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-28 20:38:50.310805699 -0800
    9391058@@ -1,5 +1,5 @@
    9401059 ##############################################################################
    … …  
    10281147diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    10291148--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    1030 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-01-27 16:44:46.507629836 -0800
     1149+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-28 20:38:37.153962564 -0800
    10311150@@ -35,8 +35,8 @@
    10321151 ------------------------------------------------------------------------------
    … …  
    10511170diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    10521171--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    1053 +++ ncurses-5.7/c++/cursesw.cc  2009-01-27 16:44:46.511630953 -0800
     1172+++ ncurses-5.7/c++/cursesw.cc  2009-02-28 20:38:37.161961447 -0800
    10541173@@ -1,6 +1,6 @@
    10551174 // * this is for making emacs happy: -*-Mode: C++;-*-
    … …  
    10881207diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
    10891208--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
    1090 +++ ncurses-5.7/c++/Makefile.in 2009-01-27 16:44:58.008364855 -0800
     1209+++ ncurses-5.7/c++/Makefile.in 2009-02-28 20:38:46.290546165 -0800
    10911210@@ -1,6 +1,6 @@
    10921211-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
    … …  
    11221241diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
    11231242--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
    1124 +++ ncurses-5.7/config.guess    2009-01-27 16:44:58.008364855 -0800
     1243+++ ncurses-5.7/config.guess    2009-02-28 20:38:46.290546165 -0800
    11251244@@ -4,7 +4,7 @@
    11261245 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    11921311diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
    11931312--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
    1194 +++ ncurses-5.7/config.sub      2009-01-27 16:44:58.008364855 -0800
     1313+++ ncurses-5.7/config.sub      2009-02-28 20:38:46.290546165 -0800
    11951314@@ -4,7 +4,7 @@
    11961315 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    12761395diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    12771396--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    1278 +++ ncurses-5.7/configure       2009-01-27 16:45:03.672730548 -0800
     1397+++ ncurses-5.7/configure       2009-02-28 20:38:57.039235088 -0800
    12791398@@ -1,7 +1,7 @@
    12801399 #! /bin/sh
    12811400-# From configure.in Revision: 1.454 .
    1282 +# From configure.in Revision: 1.464 .
     1401+# From configure.in Revision: 1.466 .
    12831402 # Guess values for system-dependent variables and create Makefiles.
    12841403-# Generated by Autoconf 2.52.20080325.
    … …  
    12991418   --with-install-prefix   prefixes actual install-location ($DESTDIR)
    13001419 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
    1301 @@ -870,7 +873,7 @@
     1420@@ -762,6 +765,7 @@
     1421   --with-manpage-tbl      specify manpage processing with tbl
     1422 Extensions:
     1423   --disable-ext-funcs     disable function-extensions
     1424+  --enable-sp-funcs       disable experimental SCREEN-extensions
     1425   --enable-const          compile with extra/non-standard const
     1426   --enable-ext-colors     compile for 256-color support
     1427   --enable-ext-mouse      compile for extended mouse-encoding
     1428@@ -870,7 +874,7 @@
    13021429 running configure, to aid debugging if configure makes a mistake.
    13031430 
    … …  
    13081435   $ $0 $@
    13091436 
    1310 @@ -994,7 +997,7 @@
     1437@@ -994,7 +998,7 @@
    13111438 fi
    13121439 for ac_site_file in $CONFIG_SITE; do
    13131440   if test -r "$ac_site_file"; then
    13141441-    { echo "$as_me:997: loading site script $ac_site_file" >&5
    1315 +    { echo "$as_me:1000: loading site script $ac_site_file" >&5
     1442+    { echo "$as_me:1001: loading site script $ac_site_file" >&5
    13161443 echo "$as_me: loading site script $ac_site_file" >&6;}
    13171444     cat "$ac_site_file" >&5
    13181445     . "$ac_site_file"
    1319 @@ -1005,7 +1008,7 @@
     1446@@ -1005,7 +1009,7 @@
    13201447   # Some versions of bash will fail to source /dev/null (special
    13211448   # files actually), so we avoid doing that.
    13221449   if test -f "$cache_file"; then
    13231450-    { echo "$as_me:1008: loading cache $cache_file" >&5
    1324 +    { echo "$as_me:1011: loading cache $cache_file" >&5
     1451+    { echo "$as_me:1012: loading cache $cache_file" >&5
    13251452 echo "$as_me: loading cache $cache_file" >&6;}
    13261453     case $cache_file in
    13271454       [\\/]* | ?:[\\/]* ) . $cache_file;;
    1328 @@ -1013,7 +1016,7 @@
     1455@@ -1013,7 +1017,7 @@
    13291456     esac
    13301457   fi
    13311458 else
    13321459-  { echo "$as_me:1016: creating cache $cache_file" >&5
    1333 +  { echo "$as_me:1019: creating cache $cache_file" >&5
     1460+  { echo "$as_me:1020: creating cache $cache_file" >&5
    13341461 echo "$as_me: creating cache $cache_file" >&6;}
    13351462   >$cache_file
    13361463 fi
    1337 @@ -1029,21 +1032,21 @@
     1464@@ -1029,21 +1033,21 @@
    13381465   eval ac_new_val="\$ac_env_${ac_var}_value"
    13391466   case $ac_old_set,$ac_new_set in
    13401467     set,)
    13411468-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    1342 +      { echo "$as_me:1035: 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
    13431470 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    13441471       ac_cache_corrupted=: ;;
    13451472     ,set)
    13461473-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
    1347 +      { echo "$as_me:1039: 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
    13481475 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    13491476       ac_cache_corrupted=: ;;
    … …  
    13521479       if test "x$ac_old_val" != "x$ac_new_val"; then
    13531480-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
    1354 +        { echo "$as_me:1045: 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
    13551482 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    13561483-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
    1357 +        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
     1484+        { echo "$as_me:1048:   former value:  $ac_old_val" >&5
    13581485 echo "$as_me:   former value:  $ac_old_val" >&2;}
    13591486-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
    1360 +        { echo "$as_me:1049:   current value: $ac_new_val" >&5
     1487+        { echo "$as_me:1050:   current value: $ac_new_val" >&5
    13611488 echo "$as_me:   current value: $ac_new_val" >&2;}
    13621489         ac_cache_corrupted=:
    13631490       fi;;
    1364 @@ -1062,9 +1065,9 @@
     1491@@ -1062,9 +1066,9 @@
    13651492   fi
    13661493 done
    13671494 if $ac_cache_corrupted; then
    13681495-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
    1369 +  { echo "$as_me:1068: 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
    13701497 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    13711498-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    1372 +  { { echo "$as_me:1070: 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
    13731500 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    13741501    { (exit 1); exit 1; }; }
    13751502 fi
    1376 @@ -1085,10 +1088,10 @@
     1503@@ -1085,10 +1089,10 @@
    13771504 echo "#! $SHELL" >conftest.sh
    13781505 echo  "exit 0"   >>conftest.sh
    13791506 chmod +x conftest.sh
    13801507-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
    1381 +if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
     1508+if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5
    13821509   (PATH=".;."; conftest.sh) 2>&5
    13831510   ac_status=$?
    13841511-  echo "$as_me:1091: \$? = $ac_status" >&5
    1385 +  echo "$as_me:1094: \$? = $ac_status" >&5
     1512+  echo "$as_me:1095: \$? = $ac_status" >&5
    13861513   (exit $ac_status); }; then
    13871514   ac_path_separator=';'
    13881515 else
    1389 @@ -1101,7 +1104,7 @@
     1516@@ -1101,7 +1105,7 @@
    13901517 
    13911518 top_builddir=`pwd`
    13921519 
    13931520-echo "$as_me:1104: checking for egrep" >&5
    1394 +echo "$as_me:1107: checking for egrep" >&5
     1521+echo "$as_me:1108: checking for egrep" >&5
    13951522 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    13961523 if test "${ac_cv_prog_egrep+set}" = set; then
    13971524   echo $ECHO_N "(cached) $ECHO_C" >&6
    1398 @@ -1111,11 +1114,11 @@
     1525@@ -1111,11 +1115,11 @@
    13991526     else ac_cv_prog_egrep='egrep'
    14001527     fi
    14011528 fi
    14021529-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
    1403 +echo "$as_me:1117: result: $ac_cv_prog_egrep" >&5
     1530+echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5
    14041531 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    14051532  EGREP=$ac_cv_prog_egrep
    14061533 
    14071534-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
    1408 +test -z "$EGREP" && { { echo "$as_me:1121: error: No egrep program found" >&5
     1535+test -z "$EGREP" && { { echo "$as_me:1122: error: No egrep program found" >&5
    14091536 echo "$as_me: error: No egrep program found" >&2;}
    14101537    { (exit 1); exit 1; }; }
    14111538 
    1412 @@ -1125,7 +1128,7 @@
     1539@@ -1125,7 +1129,7 @@
    14131540 cf_cv_abi_version=${NCURSES_MAJOR}
    14141541 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
    14151542 cf_cv_timestamp=`date`
    14161543-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    1417 +echo "$as_me:1131: 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
    14181545 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
    14191546 
    14201547 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
    1421 @@ -1133,7 +1136,7 @@
     1548@@ -1133,7 +1137,7 @@
    14221549 # Check whether --with-rel-version or --without-rel-version was given.
    14231550 if test "${with_rel_version+set}" = set; then
    14241551   withval="$with_rel_version"
    14251552-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    1426 +  { echo "$as_me:1139: 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
    14271554 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
    14281555  cf_cv_rel_version=$withval
    14291556 fi;
    1430 @@ -1146,13 +1149,13 @@
     1557@@ -1146,13 +1150,13 @@
    14311558   [0-9]*) #(vi
    14321559        ;;
    14331560   *)
    14341561-       { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    1435 +       { { echo "$as_me:1152: 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
    14361563 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    14371564    { (exit 1); exit 1; }; }
    … …  
    14401567 else
    14411568-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
    1442 +  { { echo "$as_me:1158: error: Release major-version value is empty" >&5
     1569+  { { echo "$as_me:1159: error: Release major-version value is empty" >&5
    14431570 echo "$as_me: error: Release major-version value is empty" >&2;}
    14441571    { (exit 1); exit 1; }; }
    14451572 fi
    1446 @@ -1162,13 +1165,13 @@
     1573@@ -1162,13 +1166,13 @@
    14471574   [0-9]*) #(vi
    14481575        ;;
    14491576   *)
    14501577-       { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    1451 +       { { echo "$as_me:1168: 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
    14521579 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    14531580    { (exit 1); exit 1; }; }
    … …  
    14561583 else
    14571584-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
    1458 +  { { echo "$as_me:1174: error: Release minor-version value is empty" >&5
     1585+  { { echo "$as_me:1175: error: Release minor-version value is empty" >&5
    14591586 echo "$as_me: error: Release minor-version value is empty" >&2;}
    14601587    { (exit 1); exit 1; }; }
    14611588 fi
    1462 @@ -1178,7 +1181,7 @@
     1589@@ -1178,7 +1182,7 @@
    14631590 # Check whether --with-abi-version or --without-abi-version was given.
    14641591 if test "${with_abi_version+set}" = set; then
    14651592   withval="$with_abi_version"
    14661593-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    1467 +  { echo "$as_me:1184: 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
    14681595 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
    14691596  cf_cv_abi_version=$withval
    14701597 fi;
    1471 @@ -1188,13 +1191,13 @@
     1598@@ -1188,13 +1192,13 @@
    14721599   [0-9]*) #(vi
    14731600        ;;
    14741601   *)
    14751602-       { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
    1476 +       { { echo "$as_me:1194: 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
    14771604 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    14781605    { (exit 1); exit 1; }; }
    … …  
    14811608 else
    14821609-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
    1483 +  { { echo "$as_me:1200: error: ABI version value is empty" >&5
     1610+  { { echo "$as_me:1201: error: ABI version value is empty" >&5
    14841611 echo "$as_me: error: ABI version value is empty" >&2;}
    14851612    { (exit 1); exit 1; }; }
    14861613 fi
    1487 @@ -1216,7 +1219,7 @@
     1614@@ -1216,7 +1220,7 @@
    14881615   fi
    14891616 done
    14901617 if test -z "$ac_aux_dir"; then
    14911618-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    1492 +  { { echo "$as_me:1222: 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
    14931620 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    14941621    { (exit 1); exit 1; }; }
    14951622 fi
    1496 @@ -1226,11 +1229,11 @@
     1623@@ -1226,11 +1230,11 @@
    14971624 
    14981625 # Make sure we can run config.sub.
    14991626 $ac_config_sub sun4 >/dev/null 2>&1 ||
    15001627-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
    1501 +  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
     1628+  { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5
    15021629 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    15031630    { (exit 1); exit 1; }; }
    15041631 
    15051632-echo "$as_me:1233: checking build system type" >&5
    1506 +echo "$as_me:1236: checking build system type" >&5
     1633+echo "$as_me:1237: checking build system type" >&5
    15071634 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    15081635 if test "${ac_cv_build+set}" = set; then
    15091636   echo $ECHO_N "(cached) $ECHO_C" >&6
    1510 @@ -1239,23 +1242,23 @@
     1637@@ -1239,23 +1243,23 @@
    15111638 test -z "$ac_cv_build_alias" &&
    15121639   ac_cv_build_alias=`$ac_config_guess`
    15131640 test -z "$ac_cv_build_alias" &&
    15141641-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
    1515 +  { { echo "$as_me:1245: 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
    15161643 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    15171644    { (exit 1); exit 1; }; }
    15181645 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    15191646-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    1520 +  { { echo "$as_me:1249: 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
    15211648 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    15221649    { (exit 1); exit 1; }; }
    … …  
    15241651 fi
    15251652-echo "$as_me:1251: result: $ac_cv_build" >&5
    1526 +echo "$as_me:1254: result: $ac_cv_build" >&5
     1653+echo "$as_me:1255: result: $ac_cv_build" >&5
    15271654 echo "${ECHO_T}$ac_cv_build" >&6
    15281655 build=$ac_cv_build
    … …  
    15321659 
    15331660-echo "$as_me:1258: checking host system type" >&5
    1534 +echo "$as_me:1261: checking host system type" >&5
     1661+echo "$as_me:1262: checking host system type" >&5
    15351662 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    15361663 if test "${ac_cv_host+set}" = set; then
    15371664   echo $ECHO_N "(cached) $ECHO_C" >&6
    1538 @@ -1264,12 +1267,12 @@
     1665@@ -1264,12 +1268,12 @@
    15391666 test -z "$ac_cv_host_alias" &&
    15401667   ac_cv_host_alias=$ac_cv_build_alias
    15411668 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    15421669-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    1543 +  { { echo "$as_me:1270: 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
    15441671 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    15451672    { (exit 1); exit 1; }; }
    … …  
    15471674 fi
    15481675-echo "$as_me:1272: result: $ac_cv_host" >&5
    1549 +echo "$as_me:1275: result: $ac_cv_host" >&5
     1676+echo "$as_me:1276: result: $ac_cv_host" >&5
    15501677 echo "${ECHO_T}$ac_cv_host" >&6
    15511678 host=$ac_cv_host
    15521679 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1553 @@ -1277,7 +1280,7 @@
     1680@@ -1277,7 +1281,7 @@
    15541681 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    15551682 
    15561683 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    15571684-       echo "$as_me:1280: checking target system type" >&5
    1558 +       echo "$as_me:1283: checking target system type" >&5
     1685+       echo "$as_me:1284: checking target system type" >&5
    15591686 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    15601687 if test "${ac_cv_target+set}" = set; then
    15611688   echo $ECHO_N "(cached) $ECHO_C" >&6
    1562 @@ -1286,12 +1289,12 @@
     1689@@ -1286,12 +1290,12 @@
    15631690 test "x$ac_cv_target_alias" = "x" &&
    15641691   ac_cv_target_alias=$ac_cv_host_alias
    15651692 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    15661693-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1567 +  { { echo "$as_me:1292: 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
    15681695 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    15691696    { (exit 1); exit 1; }; }
    … …  
    15711698 fi
    15721699-echo "$as_me:1294: result: $ac_cv_target" >&5
    1573 +echo "$as_me:1297: result: $ac_cv_target" >&5
     1700+echo "$as_me:1298: result: $ac_cv_target" >&5
    15741701 echo "${ECHO_T}$ac_cv_target" >&6
    15751702 target=$ac_cv_target
    15761703 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1577 @@ -1322,13 +1325,13 @@
     1704@@ -1322,13 +1326,13 @@
    15781705 fi
    15791706 
    15801707 test -z "$system_name" && system_name="$cf_cv_system_name"
    15811708-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
    1582 +test -n "$cf_cv_system_name" && echo "$as_me:1328: 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
    15831710 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    15841711 
    15851712 if test ".$system_name" != ".$cf_cv_system_name" ; then
    15861713-       echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1587 +       echo "$as_me:1332: 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
    15881715 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    15891716-       { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
    1590 +       { { echo "$as_me:1334: error: \"Please remove config.cache and try again.\"" >&5
     1717+       { { echo "$as_me:1335: error: \"Please remove config.cache and try again.\"" >&5
    15911718 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    15921719    { (exit 1); exit 1; }; }
    15931720 fi
    1594 @@ -1336,7 +1339,7 @@
     1721@@ -1336,7 +1340,7 @@
    15951722 # Check whether --with-system-type or --without-system-type was given.
    15961723 if test "${with_system_type+set}" = set; then
    15971724   withval="$with_system_type"
    15981725-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
    1599 +  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
     1726+  { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5
    16001727 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    16011728  cf_cv_system_name=$withval
    16021729 fi;
    1603 @@ -1346,7 +1349,7 @@
     1730@@ -1346,7 +1350,7 @@
    16041731 
    16051732 ###    Default install-location
    16061733 
    16071734-echo "$as_me:1349: checking for prefix" >&5
    1608 +echo "$as_me:1352: checking for prefix" >&5
     1735+echo "$as_me:1353: checking for prefix" >&5
    16091736 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    16101737 if test "x$prefix" = "xNONE" ; then
    16111738        case "$cf_cv_system_name" in
    1612 @@ -1358,11 +1361,11 @@
     1739@@ -1358,11 +1362,11 @@
    16131740                ;;
    16141741        esac
    16151742 fi
    16161743-echo "$as_me:1361: result: $prefix" >&5
    1617 +echo "$as_me:1364: result: $prefix" >&5
     1744+echo "$as_me:1365: result: $prefix" >&5
    16181745 echo "${ECHO_T}$prefix" >&6
    16191746 
    16201747 if test "x$prefix" = "xNONE" ; then
    16211748-echo "$as_me:1365: checking for default include-directory" >&5
    1622 +echo "$as_me:1368: checking for default include-directory" >&5
     1749+echo "$as_me:1369: checking for default include-directory" >&5
    16231750 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    16241751 test -n "$verbose" && echo 1>&6
    16251752 for cf_symbol in \
    1626 @@ -1385,7 +1388,7 @@
     1753@@ -1385,7 +1389,7 @@
    16271754        fi
    16281755        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    16291756 done
    16301757-echo "$as_me:1388: result: $includedir" >&5
    1631 +echo "$as_me:1391: result: $includedir" >&5
     1758+echo "$as_me:1392: result: $includedir" >&5
    16321759 echo "${ECHO_T}$includedir" >&6
    16331760 fi
    16341761 
    1635 @@ -1399,7 +1402,7 @@
     1762@@ -1399,7 +1403,7 @@
    16361763 if test -n "$ac_tool_prefix"; then
    16371764   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    16381765 set dummy ${ac_tool_prefix}gcc; ac_word=$2
    16391766-echo "$as_me:1402: checking for $ac_word" >&5
    1640 +echo "$as_me:1405: checking for $ac_word" >&5
     1767+echo "$as_me:1406: checking for $ac_word" >&5
    16411768 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    16421769 if test "${ac_cv_prog_CC+set}" = set; then
    16431770   echo $ECHO_N "(cached) $ECHO_C" >&6
    1644 @@ -1414,7 +1417,7 @@
     1771@@ -1414,7 +1418,7 @@
    16451772   test -z "$ac_dir" && ac_dir=.
    16461773   $as_executable_p "$ac_dir/$ac_word" || continue
    16471774 ac_cv_prog_CC="${ac_tool_prefix}gcc"
    16481775-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
    1649 +echo "$as_me:1420: found $ac_dir/$ac_word" >&5
     1776+echo "$as_me:1421: found $ac_dir/$ac_word" >&5
    16501777 break
    16511778 done
    16521779 
    1653 @@ -1422,10 +1425,10 @@
     1780@@ -1422,10 +1426,10 @@
    16541781 fi
    16551782 CC=$ac_cv_prog_CC
    16561783 if test -n "$CC"; then
    16571784-  echo "$as_me:1425: result: $CC" >&5
    1658 +  echo "$as_me:1428: result: $CC" >&5
     1785+  echo "$as_me:1429: result: $CC" >&5
    16591786 echo "${ECHO_T}$CC" >&6
    16601787 else
    16611788-  echo "$as_me:1428: result: no" >&5
    1662 +  echo "$as_me:1431: result: no" >&5
     1789+  echo "$as_me:1432: result: no" >&5
    16631790 echo "${ECHO_T}no" >&6
    16641791 fi
    16651792 
    1666 @@ -1434,7 +1437,7 @@
     1793@@ -1434,7 +1438,7 @@
    16671794   ac_ct_CC=$CC
    16681795   # Extract the first word of "gcc", so it can be a program name with args.
    16691796 set dummy gcc; ac_word=$2
    16701797-echo "$as_me:1437: checking for $ac_word" >&5
    1671 +echo "$as_me:1440: checking for $ac_word" >&5
     1798+echo "$as_me:1441: checking for $ac_word" >&5
    16721799 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    16731800 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    16741801   echo $ECHO_N "(cached) $ECHO_C" >&6
    1675 @@ -1449,7 +1452,7 @@
     1802@@ -1449,7 +1453,7 @@
    16761803   test -z "$ac_dir" && ac_dir=.
    16771804   $as_executable_p "$ac_dir/$ac_word" || continue
    16781805 ac_cv_prog_ac_ct_CC="gcc"
    16791806-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
    1680 +echo "$as_me:1455: found $ac_dir/$ac_word" >&5
     1807+echo "$as_me:1456: found $ac_dir/$ac_word" >&5
    16811808 break
    16821809 done
    16831810 
    1684 @@ -1457,10 +1460,10 @@
     1811@@ -1457,10 +1461,10 @@
    16851812 fi
    16861813 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    16871814 if test -n "$ac_ct_CC"; then
    16881815-  echo "$as_me:1460: result: $ac_ct_CC" >&5
    1689 +  echo "$as_me:1463: result: $ac_ct_CC" >&5
     1816+  echo "$as_me:1464: result: $ac_ct_CC" >&5
    16901817 echo "${ECHO_T}$ac_ct_CC" >&6
    16911818 else
    16921819-  echo "$as_me:1463: result: no" >&5
    1693 +  echo "$as_me:1466: result: no" >&5
     1820+  echo "$as_me:1467: result: no" >&5
    16941821 echo "${ECHO_T}no" >&6
    16951822 fi
    16961823 
    1697 @@ -1473,7 +1476,7 @@
     1824@@ -1473,7 +1477,7 @@
    16981825   if test -n "$ac_tool_prefix"; then
    16991826   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    17001827 set dummy ${ac_tool_prefix}cc; ac_word=$2
    17011828-echo "$as_me:1476: checking for $ac_word" >&5
    1702 +echo "$as_me:1479: checking for $ac_word" >&5
     1829+echo "$as_me:1480: checking for $ac_word" >&5
    17031830 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17041831 if test "${ac_cv_prog_CC+set}" = set; then
    17051832   echo $ECHO_N "(cached) $ECHO_C" >&6
    1706 @@ -1488,7 +1491,7 @@
     1833@@ -1488,7 +1492,7 @@
    17071834   test -z "$ac_dir" && ac_dir=.
    17081835   $as_executable_p "$ac_dir/$ac_word" || continue
    17091836 ac_cv_prog_CC="${ac_tool_prefix}cc"
    17101837-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
    1711 +echo "$as_me:1494: found $ac_dir/$ac_word" >&5
     1838+echo "$as_me:1495: found $ac_dir/$ac_word" >&5
    17121839 break
    17131840 done
    17141841 
    1715 @@ -1496,10 +1499,10 @@
     1842@@ -1496,10 +1500,10 @@
    17161843 fi
    17171844 CC=$ac_cv_prog_CC
    17181845 if test -n "$CC"; then
    17191846-  echo "$as_me:1499: result: $CC" >&5
    1720 +  echo "$as_me:1502: result: $CC" >&5
     1847+  echo "$as_me:1503: result: $CC" >&5
    17211848 echo "${ECHO_T}$CC" >&6
    17221849 else
    17231850-  echo "$as_me:1502: result: no" >&5
    1724 +  echo "$as_me:1505: result: no" >&5
     1851+  echo "$as_me:1506: result: no" >&5
    17251852 echo "${ECHO_T}no" >&6
    17261853 fi
    17271854 
    1728 @@ -1508,7 +1511,7 @@
     1855@@ -1508,7 +1512,7 @@
    17291856   ac_ct_CC=$CC
    17301857   # Extract the first word of "cc", so it can be a program name with args.
    17311858 set dummy cc; ac_word=$2
    17321859-echo "$as_me:1511: checking for $ac_word" >&5
    1733 +echo "$as_me:1514: checking for $ac_word" >&5
     1860+echo "$as_me:1515: checking for $ac_word" >&5
    17341861 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17351862 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    17361863   echo $ECHO_N "(cached) $ECHO_C" >&6
    1737 @@ -1523,7 +1526,7 @@
     1864@@ -1523,7 +1527,7 @@
    17381865   test -z "$ac_dir" && ac_dir=.
    17391866   $as_executable_p "$ac_dir/$ac_word" || continue
    17401867 ac_cv_prog_ac_ct_CC="cc"
    17411868-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
    1742 +echo "$as_me:1529: found $ac_dir/$ac_word" >&5
     1869+echo "$as_me:1530: found $ac_dir/$ac_word" >&5
    17431870 break
    17441871 done
    17451872 
    1746 @@ -1531,10 +1534,10 @@
     1873@@ -1531,10 +1535,10 @@
    17471874 fi
    17481875 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    17491876 if test -n "$ac_ct_CC"; then
    17501877-  echo "$as_me:1534: result: $ac_ct_CC" >&5
    1751 +  echo "$as_me:1537: result: $ac_ct_CC" >&5
     1878+  echo "$as_me:1538: result: $ac_ct_CC" >&5
    17521879 echo "${ECHO_T}$ac_ct_CC" >&6
    17531880 else
    17541881-  echo "$as_me:1537: result: no" >&5
    1755 +  echo "$as_me:1540: result: no" >&5
     1882+  echo "$as_me:1541: result: no" >&5
    17561883 echo "${ECHO_T}no" >&6
    17571884 fi
    17581885 
    1759 @@ -1547,7 +1550,7 @@
     1886@@ -1547,7 +1551,7 @@
    17601887 if test -z "$CC"; then
    17611888   # Extract the first word of "cc", so it can be a program name with args.
    17621889 set dummy cc; ac_word=$2
    17631890-echo "$as_me:1550: checking for $ac_word" >&5
    1764 +echo "$as_me:1553: checking for $ac_word" >&5
     1891+echo "$as_me:1554: checking for $ac_word" >&5
    17651892 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17661893 if test "${ac_cv_prog_CC+set}" = set; then
    17671894   echo $ECHO_N "(cached) $ECHO_C" >&6
    1768 @@ -1567,7 +1570,7 @@
     1895@@ -1567,7 +1571,7 @@
    17691896   continue
    17701897 fi
    17711898 ac_cv_prog_CC="cc"
    17721899-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
    1773 +echo "$as_me:1573: found $ac_dir/$ac_word" >&5
     1900+echo "$as_me:1574: found $ac_dir/$ac_word" >&5
    17741901 break
    17751902 done
    17761903 
    1777 @@ -1589,10 +1592,10 @@
     1904@@ -1589,10 +1593,10 @@
    17781905 fi
    17791906 CC=$ac_cv_prog_CC
    17801907 if test -n "$CC"; then
    17811908-  echo "$as_me:1592: result: $CC" >&5
    1782 +  echo "$as_me:1595: result: $CC" >&5
     1909+  echo "$as_me:1596: result: $CC" >&5
    17831910 echo "${ECHO_T}$CC" >&6
    17841911 else
    17851912-  echo "$as_me:1595: result: no" >&5
    1786 +  echo "$as_me:1598: result: no" >&5
     1913+  echo "$as_me:1599: result: no" >&5
    17871914 echo "${ECHO_T}no" >&6
    17881915 fi
    17891916 
    1790 @@ -1603,7 +1606,7 @@
     1917@@ -1603,7 +1607,7 @@
    17911918   do
    17921919     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    17931920 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    17941921-echo "$as_me:1606: checking for $ac_word" >&5
    1795 +echo "$as_me:1609: checking for $ac_word" >&5
     1922+echo "$as_me:1610: checking for $ac_word" >&5
    17961923 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17971924 if test "${ac_cv_prog_CC+set}" = set; then
    17981925   echo $ECHO_N "(cached) $ECHO_C" >&6
    1799 @@ -1618,7 +1621,7 @@
     1926@@ -1618,7 +1622,7 @@
    18001927   test -z "$ac_dir" && ac_dir=.
    18011928   $as_executable_p "$ac_dir/$ac_word" || continue
    18021929 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    18031930-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
    1804 +echo "$as_me:1624: found $ac_dir/$ac_word" >&5
     1931+echo "$as_me:1625: found $ac_dir/$ac_word" >&5
    18051932 break
    18061933 done
    18071934 
    1808 @@ -1626,10 +1629,10 @@
     1935@@ -1626,10 +1630,10 @@
    18091936 fi
    18101937 CC=$ac_cv_prog_CC
    18111938 if test -n "$CC"; then
    18121939-  echo "$as_me:1629: result: $CC" >&5
    1813 +  echo "$as_me:1632: result: $CC" >&5
     1940+  echo "$as_me:1633: result: $CC" >&5
    18141941 echo "${ECHO_T}$CC" >&6
    18151942 else
    18161943-  echo "$as_me:1632: result: no" >&5
    1817 +  echo "$as_me:1635: result: no" >&5
     1944+  echo "$as_me:1636: result: no" >&5
    18181945 echo "${ECHO_T}no" >&6
    18191946 fi
    18201947 
    1821 @@ -1642,7 +1645,7 @@
     1948@@ -1642,7 +1646,7 @@
    18221949 do
    18231950   # Extract the first word of "$ac_prog", so it can be a program name with args.
    18241951 set dummy $ac_prog; ac_word=$2
    18251952-echo "$as_me:1645: checking for $ac_word" >&5
    1826 +echo "$as_me:1648: checking for $ac_word" >&5
     1953+echo "$as_me:1649: checking for $ac_word" >&5
    18271954 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18281955 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18291956   echo $ECHO_N "(cached) $ECHO_C" >&6
    1830 @@ -1657,7 +1660,7 @@
     1957@@ -1657,7 +1661,7 @@
    18311958   test -z "$ac_dir" && ac_dir=.
    18321959   $as_executable_p "$ac_dir/$ac_word" || continue
    18331960 ac_cv_prog_ac_ct_CC="$ac_prog"
    18341961-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
    1835 +echo "$as_me:1663: found $ac_dir/$ac_word" >&5
     1962+echo "$as_me:1664: found $ac_dir/$ac_word" >&5
    18361963 break
    18371964 done
    18381965 
    1839 @@ -1665,10 +1668,10 @@
     1966@@ -1665,10 +1669,10 @@
    18401967 fi
    18411968 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18421969 if test -n "$ac_ct_CC"; then
    18431970-  echo "$as_me:1668: result: $ac_ct_CC" >&5
    1844 +  echo "$as_me:1671: result: $ac_ct_CC" >&5
     1971+  echo "$as_me:1672: result: $ac_ct_CC" >&5
    18451972 echo "${ECHO_T}$ac_ct_CC" >&6
    18461973 else
    18471974-  echo "$as_me:1671: result: no" >&5
    1848 +  echo "$as_me:1674: result: no" >&5
     1975+  echo "$as_me:1675: result: no" >&5
    18491976 echo "${ECHO_T}no" >&6
    18501977 fi
    18511978 
    1852 @@ -1680,32 +1683,32 @@
     1979@@ -1680,32 +1684,32 @@
    18531980 
    18541981 fi
    18551982 
    18561983-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
    1857 +test -z "$CC" && { { echo "$as_me:1686: error: no acceptable cc found in \$PATH" >&5
     1984+test -z "$CC" && { { echo "$as_me:1687: error: no acceptable cc found in \$PATH" >&5
    18581985 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    18591986    { (exit 1); exit 1; }; }
    … …  
    18611988 # Provide some information about the compiler.
    18621989-echo "$as_me:1688:" \
    1863 +echo "$as_me:1691:" \
     1990+echo "$as_me:1692:" \
    18641991      "checking for C compiler version" >&5
    18651992 ac_compiler=`set X $ac_compile; echo $2`
    18661993-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
    1867 +{ (eval echo "$as_me:1694: \"$ac_compiler --version </dev/null >&5\"") >&5
     1994+{ (eval echo "$as_me:1695: \"$ac_compiler --version </dev/null >&5\"") >&5
    18681995   (eval $ac_compiler --version </dev/null >&5) 2>&5
    18691996   ac_status=$?
    18701997-  echo "$as_me:1694: \$? = $ac_status" >&5
    1871 +  echo "$as_me:1697: \$? = $ac_status" >&5
     1998+  echo "$as_me:1698: \$? = $ac_status" >&5
    18721999   (exit $ac_status); }
    18732000-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
    1874 +{ (eval echo "$as_me:1699: \"$ac_compiler -v </dev/null >&5\"") >&5
     2001+{ (eval echo "$as_me:1700: \"$ac_compiler -v </dev/null >&5\"") >&5
    18752002   (eval $ac_compiler -v </dev/null >&5) 2>&5
    18762003   ac_status=$?
    18772004-  echo "$as_me:1699: \$? = $ac_status" >&5
    1878 +  echo "$as_me:1702: \$? = $ac_status" >&5
     2005+  echo "$as_me:1703: \$? = $ac_status" >&5
    18792006   (exit $ac_status); }
    18802007-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
    1881 +{ (eval echo "$as_me:1704: \"$ac_compiler -V </dev/null >&5\"") >&5
     2008+{ (eval echo "$as_me:1705: \"$ac_compiler -V </dev/null >&5\"") >&5
    18822009   (eval $ac_compiler -V </dev/null >&5) 2>&5
    18832010   ac_status=$?
    18842011-  echo "$as_me:1704: \$? = $ac_status" >&5
    1885 +  echo "$as_me:1707: \$? = $ac_status" >&5
     2012+  echo "$as_me:1708: \$? = $ac_status" >&5
    18862013   (exit $ac_status); }
    18872014 
    18882015 cat >conftest.$ac_ext <<_ACEOF
    18892016-#line 1708 "configure"
    1890 +#line 1711 "configure"
     2017+#line 1712 "configure"
    18912018 #include "confdefs.h"
    18922019 
    18932020 int
    1894 @@ -1721,13 +1724,13 @@
     2021@@ -1721,13 +1725,13 @@
    18952022 # Try to create an executable without -o first, disregard a.out.
    18962023 # It will help us diagnose broken compilers, and finding out an intuition
    18972024 # of exeext.
    18982025-echo "$as_me:1724: checking for C compiler default output" >&5
    1899 +echo "$as_me:1727: checking for C compiler default output" >&5
     2026+echo "$as_me:1728: checking for C compiler default output" >&5
    19002027 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    19012028 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    19022029-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
    1903 +if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
     2030+if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5
    19042031   (eval $ac_link_default) 2>&5
    19052032   ac_status=$?
    19062033-  echo "$as_me:1730: \$? = $ac_status" >&5
    1907 +  echo "$as_me:1733: \$? = $ac_status" >&5
     2034+  echo "$as_me:1734: \$? = $ac_status" >&5
    19082035   (exit $ac_status); }; then
    19092036   # Find the output, starting from the most likely.  This scheme is
    19102037 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    1911 @@ -1736,7 +1739,7 @@
     2038@@ -1736,7 +1740,7 @@
    19122039                 ls a.out conftest 2>/dev/null;
    19132040                 ls a.* conftest.* 2>/dev/null`; do
    … …  
    19182045             # certainly right.
    19192046             break;;
    1920 @@ -1750,34 +1753,34 @@
     2047@@ -1750,34 +1754,34 @@
    19212048 else
    19222049   echo "$as_me: failed program was:" >&5
    19232050 cat conftest.$ac_ext >&5
    19242051-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
    1925 +{ { echo "$as_me:1756: error: C compiler cannot create executables" >&5
     2052+{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5
    19262053 echo "$as_me: error: C compiler cannot create executables" >&2;}
    19272054    { (exit 77); exit 77; }; }
    … …  
    19302057 ac_exeext=$ac_cv_exeext
    19312058-echo "$as_me:1759: result: $ac_file" >&5
    1932 +echo "$as_me:1762: result: $ac_file" >&5
     2059+echo "$as_me:1763: result: $ac_file" >&5
    19332060 echo "${ECHO_T}$ac_file" >&6
    19342061 
    … …  
    19362063 # the compiler is broken, or we cross compile.
    19372064-echo "$as_me:1764: checking whether the C compiler works" >&5
    1938 +echo "$as_me:1767: checking whether the C compiler works" >&5
     2065+echo "$as_me:1768: checking whether the C compiler works" >&5
    19392066 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    19402067 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
    … …  
    19432070   if { ac_try='./$ac_file'
    19442071-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
    1945 +  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
     2072+  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
    19462073   (eval $ac_try) 2>&5
    19472074   ac_status=$?
    19482075-  echo "$as_me:1773: \$? = $ac_status" >&5
    1949 +  echo "$as_me:1776: \$? = $ac_status" >&5
     2076+  echo "$as_me:1777: \$? = $ac_status" >&5
    19502077   (exit $ac_status); }; }; then
    19512078     cross_compiling=no
    … …  
    19552082     else
    19562083-       { { echo "$as_me:1780: error: cannot run C compiled programs.
    1957 +       { { echo "$as_me:1783: error: cannot run C compiled programs.
     2084+       { { echo "$as_me:1784: error: cannot run C compiled programs.
    19582085 If you meant to cross compile, use \`--host'." >&5
    19592086 echo "$as_me: error: cannot run C compiled programs.
    19602087 If you meant to cross compile, use \`--host'." >&2;}
    1961 @@ -1785,24 +1788,24 @@
     2088@@ -1785,24 +1789,24 @@
    19622089     fi
    19632090   fi
    19642091 fi
    19652092-echo "$as_me:1788: result: yes" >&5
    1966 +echo "$as_me:1791: result: yes" >&5
     2093+echo "$as_me:1792: result: yes" >&5
    19672094 echo "${ECHO_T}yes" >&6
    19682095 
    … …  
    19722099 # the compiler is broken, or we cross compile.
    19732100-echo "$as_me:1795: checking whether we are cross compiling" >&5
    1974 +echo "$as_me:1798: checking whether we are cross compiling" >&5
     2101+echo "$as_me:1799: checking whether we are cross compiling" >&5
    19752102 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    19762103-echo "$as_me:1797: result: $cross_compiling" >&5
    1977 +echo "$as_me:1800: result: $cross_compiling" >&5
     2104+echo "$as_me:1801: result: $cross_compiling" >&5
    19782105 echo "${ECHO_T}$cross_compiling" >&6
    19792106 
    19802107-echo "$as_me:1800: checking for executable suffix" >&5
    1981 +echo "$as_me:1803: checking for executable suffix" >&5
     2108+echo "$as_me:1804: checking for executable suffix" >&5
    19822109 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    19832110-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
    1984 +if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
     2111+if { (eval echo "$as_me:1806: \"$ac_link\"") >&5
    19852112   (eval $ac_link) 2>&5
    19862113   ac_status=$?
    19872114-  echo "$as_me:1805: \$? = $ac_status" >&5
    1988 +  echo "$as_me:1808: \$? = $ac_status" >&5
     2115+  echo "$as_me:1809: \$? = $ac_status" >&5
    19892116   (exit $ac_status); }; then
    19902117   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    19912118 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    1992 @@ -1810,7 +1813,7 @@
     2119@@ -1810,7 +1814,7 @@
    19932120 # `rm'.
    19942121 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
    … …  
    19992126           export ac_cv_exeext
    20002127           break;;
    2001 @@ -1818,25 +1821,25 @@
     2128@@ -1818,25 +1822,25 @@
    20022129   esac
    20032130 done
    20042131 else
    20052132-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
    2006 +  { { echo "$as_me:1824: error: cannot compute EXEEXT: cannot compile and link" >&5
     2133+  { { echo "$as_me:1825: error: cannot compute EXEEXT: cannot compile and link" >&5
    20072134 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    20082135    { (exit 1); exit 1; }; }
    … …  
    20112138 rm -f conftest$ac_cv_exeext
    20122139-echo "$as_me:1827: result: $ac_cv_exeext" >&5
    2013 +echo "$as_me:1830: result: $ac_cv_exeext" >&5
     2140+echo "$as_me:1831: result: $ac_cv_exeext" >&5
    20142141 echo "${ECHO_T}$ac_cv_exeext" >&6
    20152142 
    … …  
    20182145 ac_exeext=$EXEEXT
    20192146-echo "$as_me:1833: checking for object suffix" >&5
    2020 +echo "$as_me:1836: checking for object suffix" >&5
     2147+echo "$as_me:1837: checking for object suffix" >&5
    20212148 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    20222149 if test "${ac_cv_objext+set}" = set; then
    … …  
    20252152   cat >conftest.$ac_ext <<_ACEOF
    20262153-#line 1839 "configure"
    2027 +#line 1842 "configure"
     2154+#line 1843 "configure"
    20282155 #include "confdefs.h"
    20292156 
    20302157 int
    2031 @@ -1848,14 +1851,14 @@
     2158@@ -1848,14 +1852,14 @@
    20322159 }
    20332160 _ACEOF
    20342161 rm -f conftest.o conftest.obj
    20352162-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
    2036 +if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
     2163+if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
    20372164   (eval $ac_compile) 2>&5
    20382165   ac_status=$?
    20392166-  echo "$as_me:1854: \$? = $ac_status" >&5
    2040 +  echo "$as_me:1857: \$? = $ac_status" >&5
     2167+  echo "$as_me:1858: \$? = $ac_status" >&5
    20412168   (exit $ac_status); }; then
    20422169   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    … …  
    20472174        break;;
    20482175   esac
    2049 @@ -1863,24 +1866,24 @@
     2176@@ -1863,24 +1867,24 @@
    20502177 else
    20512178   echo "$as_me: failed program was:" >&5
    20522179 cat conftest.$ac_ext >&5
    20532180-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
    2054 +{ { echo "$as_me:1869: error: cannot compute OBJEXT: cannot compile" >&5
     2181+{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5
    20552182 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    20562183    { (exit 1); exit 1; }; }
    … …  
    20602187 fi
    20612188-echo "$as_me:1873: result: $ac_cv_objext" >&5
    2062 +echo "$as_me:1876: result: $ac_cv_objext" >&5
     2189+echo "$as_me:1877: result: $ac_cv_objext" >&5
    20632190 echo "${ECHO_T}$ac_cv_objext" >&6
    20642191 OBJEXT=$ac_cv_objext
    20652192 ac_objext=$OBJEXT
    20662193-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
    2067 +echo "$as_me:1880: 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
    20682195 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    20692196 if test "${ac_cv_c_compiler_gnu+set}" = set; then
    … …  
    20722199   cat >conftest.$ac_ext <<_ACEOF
    20732200-#line 1883 "configure"
    2074 +#line 1886 "configure"
     2201+#line 1887 "configure"
    20752202 #include "confdefs.h"
    20762203 
    20772204 int
    2078 @@ -1895,16 +1898,16 @@
     2205@@ -1895,16 +1899,16 @@
    20792206 }
    20802207 _ACEOF
    20812208 rm -f conftest.$ac_objext
    20822209-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
    2083 +if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
     2210+if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5
    20842211   (eval $ac_compile) 2>&5
    20852212   ac_status=$?
    20862213-  echo "$as_me:1901: \$? = $ac_status" >&5
    2087 +  echo "$as_me:1904: \$? = $ac_status" >&5
     2214+  echo "$as_me:1905: \$? = $ac_status" >&5
    20882215   (exit $ac_status); } &&
    20892216          { ac_try='test -s conftest.$ac_objext'
    20902217-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
    2091 +  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
     2218+  { (eval echo "$as_me:1908: \"$ac_try\"") >&5
    20922219   (eval $ac_try) 2>&5
    20932220   ac_status=$?
    20942221-  echo "$as_me:1907: \$? = $ac_status" >&5
    2095 +  echo "$as_me:1910: \$? = $ac_status" >&5
     2222+  echo "$as_me:1911: \$? = $ac_status" >&5
    20962223   (exit $ac_status); }; }; then
    20972224   ac_compiler_gnu=yes
    20982225 else
    2099 @@ -1916,19 +1919,19 @@
     2226@@ -1916,19 +1920,19 @@
    21002227 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    21012228 
    21022229 fi
    21032230-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
    2104 +echo "$as_me:1922: result: $ac_cv_c_compiler_gnu" >&5
     2231+echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5
    21052232 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    21062233 GCC=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    21092236 CFLAGS="-g"
    21102237-echo "$as_me:1925: checking whether $CC accepts -g" >&5
    2111 +echo "$as_me:1928: checking whether $CC accepts -g" >&5
     2238+echo "$as_me:1929: checking whether $CC accepts -g" >&5
    21122239 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    21132240 if test "${ac_cv_prog_cc_g+set}" = set; then
    … …  
    21162243   cat >conftest.$ac_ext <<_ACEOF
    21172244-#line 1931 "configure"
    2118 +#line 1934 "configure"
     2245+#line 1935 "configure"
    21192246 #include "confdefs.h"
    21202247 
    21212248 int
    2122 @@ -1940,16 +1943,16 @@
     2249@@ -1940,16 +1944,16 @@
    21232250 }
    21242251 _ACEOF
    21252252 rm -f conftest.$ac_objext
    21262253-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
    2127 +if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
     2254+if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5
    21282255   (eval $ac_compile) 2>&5
    21292256   ac_status=$?
    21302257-  echo "$as_me:1946: \$? = $ac_status" >&5
    2131 +  echo "$as_me:1949: \$? = $ac_status" >&5
     2258+  echo "$as_me:1950: \$? = $ac_status" >&5
    21322259   (exit $ac_status); } &&
    21332260          { ac_try='test -s conftest.$ac_objext'
    21342261-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
    2135 +  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
     2262+  { (eval echo "$as_me:1953: \"$ac_try\"") >&5
    21362263   (eval $ac_try) 2>&5
    21372264   ac_status=$?
    21382265-  echo "$as_me:1952: \$? = $ac_status" >&5
    2139 +  echo "$as_me:1955: \$? = $ac_status" >&5
     2266+  echo "$as_me:1956: \$? = $ac_status" >&5
    21402267   (exit $ac_status); }; }; then
    21412268   ac_cv_prog_cc_g=yes
    21422269 else
    2143 @@ -1959,7 +1962,7 @@
     2270@@ -1959,7 +1963,7 @@
    21442271 fi
    21452272 rm -f conftest.$ac_objext conftest.$ac_ext
    21462273 fi
    21472274-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
    2148 +echo "$as_me:1965: result: $ac_cv_prog_cc_g" >&5
     2275+echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5
    21492276 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    21502277 if test "$ac_test_CFLAGS" = set; then
    21512278   CFLAGS=$ac_save_CFLAGS
    2152 @@ -1986,16 +1989,16 @@
     2279@@ -1986,16 +1990,16 @@
    21532280 #endif
    21542281 _ACEOF
    21552282 rm -f conftest.$ac_objext
    21562283-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
    2157 +if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
     2284+if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5
    21582285   (eval $ac_compile) 2>&5
    21592286   ac_status=$?
    21602287-  echo "$as_me:1992: \$? = $ac_status" >&5
    2161 +  echo "$as_me:1995: \$? = $ac_status" >&5
     2288+  echo "$as_me:1996: \$? = $ac_status" >&5
    21622289   (exit $ac_status); } &&
    21632290          { ac_try='test -s conftest.$ac_objext'
    21642291-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
    2165 +  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
     2292+  { (eval echo "$as_me:1999: \"$ac_try\"") >&5
    21662293   (eval $ac_try) 2>&5
    21672294   ac_status=$?
    21682295-  echo "$as_me:1998: \$? = $ac_status" >&5
    2169 +  echo "$as_me:2001: \$? = $ac_status" >&5
     2296+  echo "$as_me:2002: \$? = $ac_status" >&5
    21702297   (exit $ac_status); }; }; then
    21712298   for ac_declaration in \
    21722299    ''\
    2173 @@ -2007,7 +2010,7 @@
     2300@@ -2007,7 +2011,7 @@
    21742301    'void exit (int);'
    21752302 do
    21762303   cat >conftest.$ac_ext <<_ACEOF
    21772304-#line 2010 "configure"
    2178 +#line 2013 "configure"
     2305+#line 2014 "configure"
    21792306 #include "confdefs.h"
    21802307 #include <stdlib.h>
    21812308 $ac_declaration
    2182 @@ -2020,16 +2023,16 @@
     2309@@ -2020,16 +2024,16 @@
    21832310 }
    21842311 _ACEOF
    21852312 rm -f conftest.$ac_objext
    21862313-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
    2187 +if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
     2314+if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5
    21882315   (eval $ac_compile) 2>&5
    21892316   ac_status=$?
    21902317-  echo "$as_me:2026: \$? = $ac_status" >&5
    2191 +  echo "$as_me:2029: \$? = $ac_status" >&5
     2318+  echo "$as_me:2030: \$? = $ac_status" >&5
    21922319   (exit $ac_status); } &&
    21932320          { ac_try='test -s conftest.$ac_objext'
    21942321-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
    2195 +  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
     2322+  { (eval echo "$as_me:2033: \"$ac_try\"") >&5
    21962323   (eval $ac_try) 2>&5
    21972324   ac_status=$?
    21982325-  echo "$as_me:2032: \$? = $ac_status" >&5
    2199 +  echo "$as_me:2035: \$? = $ac_status" >&5
     2326+  echo "$as_me:2036: \$? = $ac_status" >&5
    22002327   (exit $ac_status); }; }; then
    22012328   :
    22022329 else
    2203 @@ -2039,7 +2042,7 @@
     2330@@ -2039,7 +2043,7 @@
    22042331 fi
    22052332 rm -f conftest.$ac_objext conftest.$ac_ext
    22062333   cat >conftest.$ac_ext <<_ACEOF
    22072334-#line 2042 "configure"
    2208 +#line 2045 "configure"
     2335+#line 2046 "configure"
    22092336 #include "confdefs.h"
    22102337 $ac_declaration
    22112338 int
    2212 @@ -2051,16 +2054,16 @@
     2339@@ -2051,16 +2055,16 @@
    22132340 }
    22142341 _ACEOF
    22152342 rm -f conftest.$ac_objext
    22162343-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
    2217 +if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
     2344+if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5
    22182345   (eval $ac_compile) 2>&5
    22192346   ac_status=$?
    22202347-  echo "$as_me:2057: \$? = $ac_status" >&5
    2221 +  echo "$as_me:2060: \$? = $ac_status" >&5
     2348+  echo "$as_me:2061: \$? = $ac_status" >&5
    22222349   (exit $ac_status); } &&
    22232350          { ac_try='test -s conftest.$ac_objext'
    22242351-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
    2225 +  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
     2352+  { (eval echo "$as_me:2064: \"$ac_try\"") >&5
    22262353   (eval $ac_try) 2>&5
    22272354   ac_status=$?
    22282355-  echo "$as_me:2063: \$? = $ac_status" >&5
    2229 +  echo "$as_me:2066: \$? = $ac_status" >&5
     2356+  echo "$as_me:2067: \$? = $ac_status" >&5
    22302357   (exit $ac_status); }; }; then
    22312358   break
    22322359 else
    2233 @@ -2090,11 +2093,11 @@
     2360@@ -2090,11 +2094,11 @@
    22342361 
    22352362 GCC_VERSION=none
    22362363 if test "$GCC" = yes ; then
    22372364-       echo "$as_me:2093: checking version of $CC" >&5
    2238 +       echo "$as_me:2096: checking version of $CC" >&5
     2365+       echo "$as_me:2097: checking version of $CC" >&5
    22392366 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    22402367        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    22412368        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    22422369-       echo "$as_me:2097: result: $GCC_VERSION" >&5
    2243 +       echo "$as_me:2100: result: $GCC_VERSION" >&5
     2370+       echo "$as_me:2101: result: $GCC_VERSION" >&5
    22442371 echo "${ECHO_T}$GCC_VERSION" >&6
    22452372 fi
    22462373 
    2247 @@ -2104,7 +2107,7 @@
     2374@@ -2104,7 +2108,7 @@
    22482375 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    22492376 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    22502377 ac_main_return=return
    22512378-echo "$as_me:2107: checking how to run the C preprocessor" >&5
    2252 +echo "$as_me:2110: checking how to run the C preprocessor" >&5
     2379+echo "$as_me:2111: checking how to run the C preprocessor" >&5
    22532380 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    22542381 # On Suns, sometimes $CPP names a directory.
    22552382 if test -n "$CPP" && test -d "$CPP"; then
    2256 @@ -2125,18 +2128,18 @@
     2383@@ -2125,18 +2129,18 @@
    22572384   # On the NeXT, cc -E runs the code through the compiler's parser,
    22582385   # not just through cpp. "Syntax error" is here to catch this case.
    22592386   cat >conftest.$ac_ext <<_ACEOF
    22602387-#line 2128 "configure"
    2261 +#line 2131 "configure"
     2388+#line 2132 "configure"
    22622389 #include "confdefs.h"
    22632390 #include <assert.h>
    … …  
    22652392 _ACEOF
    22662393-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
    2267 +if { (eval echo "$as_me:2136: \"$ac_cpp conftest.$ac_ext\"") >&5
     2394+if { (eval echo "$as_me:2137: \"$ac_cpp conftest.$ac_ext\"") >&5
    22682395   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    22692396   ac_status=$?
    … …  
    22722399   cat conftest.err >&5
    22732400-  echo "$as_me:2139: \$? = $ac_status" >&5
    2274 +  echo "$as_me:2142: \$? = $ac_status" >&5
     2401+  echo "$as_me:2143: \$? = $ac_status" >&5
    22752402   (exit $ac_status); } >/dev/null; then
    22762403   if test -s conftest.err; then
    22772404     ac_cpp_err=$ac_c_preproc_warn_flag
    2278 @@ -2159,17 +2162,17 @@
     2405@@ -2159,17 +2163,17 @@
    22792406   # OK, works on sane cases.  Now check whether non-existent headers
    22802407   # can be detected and how.
    22812408   cat >conftest.$ac_ext <<_ACEOF
    22822409-#line 2162 "configure"
    2283 +#line 2165 "configure"
     2410+#line 2166 "configure"
    22842411 #include "confdefs.h"
    22852412 #include <ac_nonexistent.h>
    22862413 _ACEOF
    22872414-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
    2288 +if { (eval echo "$as_me:2169: \"$ac_cpp conftest.$ac_ext\"") >&5
     2415+if { (eval echo "$as_me:2170: \"$ac_cpp conftest.$ac_ext\"") >&5
    22892416   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    22902417   ac_status=$?
    … …  
    22932420   cat conftest.err >&5
    22942421-  echo "$as_me:2172: \$? = $ac_status" >&5
    2295 +  echo "$as_me:2175: \$? = $ac_status" >&5
     2422+  echo "$as_me:2176: \$? = $ac_status" >&5
    22962423   (exit $ac_status); } >/dev/null; then
    22972424   if test -s conftest.err; then
    22982425     ac_cpp_err=$ac_c_preproc_warn_flag
    2299 @@ -2206,7 +2209,7 @@
     2426@@ -2206,7 +2210,7 @@
    23002427 else
    23012428   ac_cv_prog_CPP=$CPP
    23022429 fi
    23032430-echo "$as_me:2209: result: $CPP" >&5
    2304 +echo "$as_me:2212: result: $CPP" >&5
     2431+echo "$as_me:2213: result: $CPP" >&5
    23052432 echo "${ECHO_T}$CPP" >&6
    23062433 ac_preproc_ok=false
    23072434 for ac_c_preproc_warn_flag in '' yes
    2308 @@ -2216,18 +2219,18 @@
     2435@@ -2216,18 +2220,18 @@
    23092436   # On the NeXT, cc -E runs the code through the compiler's parser,
    23102437   # not just through cpp. "Syntax error" is here to catch this case.
    23112438   cat >conftest.$ac_ext <<_ACEOF
    23122439-#line 2219 "configure"
    2313 +#line 2222 "configure"
     2440+#line 2223 "configure"
    23142441 #include "confdefs.h"
    23152442 #include <assert.h>
    … …  
    23172444 _ACEOF
    23182445-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
    2319 +if { (eval echo "$as_me:2227: \"$ac_cpp conftest.$ac_ext\"") >&5
     2446+if { (eval echo "$as_me:2228: \"$ac_cpp conftest.$ac_ext\"") >&5
    23202447   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    23212448   ac_status=$?
    … …  
    23242451   cat conftest.err >&5
    23252452-  echo "$as_me:2230: \$? = $ac_status" >&5
    2326 +  echo "$as_me:2233: \$? = $ac_status" >&5
     2453+  echo "$as_me:2234: \$? = $ac_status" >&5
    23272454   (exit $ac_status); } >/dev/null; then
    23282455   if test -s conftest.err; then
    23292456     ac_cpp_err=$ac_c_preproc_warn_flag
    2330 @@ -2250,17 +2253,17 @@
     2457@@ -2250,17 +2254,17 @@
    23312458   # OK, works on sane cases.  Now check whether non-existent headers
    23322459   # can be detected and how.
    23332460   cat >conftest.$ac_ext <<_ACEOF
    23342461-#line 2253 "configure"
    2335 +#line 2256 "configure"
     2462+#line 2257 "configure"
    23362463 #include "confdefs.h"
    23372464 #include <ac_nonexistent.h>
    23382465 _ACEOF
    23392466-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
    2340 +if { (eval echo "$as_me:2260: \"$ac_cpp conftest.$ac_ext\"") >&5
     2467+if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5
    23412468   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    23422469   ac_status=$?
    … …  
    23452472   cat conftest.err >&5
    23462473-  echo "$as_me:2263: \$? = $ac_status" >&5
    2347 +  echo "$as_me:2266: \$? = $ac_status" >&5
     2474+  echo "$as_me:2267: \$? = $ac_status" >&5
    23482475   (exit $ac_status); } >/dev/null; then
    23492476   if test -s conftest.err; then
    23502477     ac_cpp_err=$ac_c_preproc_warn_flag
    2351 @@ -2288,7 +2291,7 @@
     2478@@ -2288,7 +2292,7 @@
    23522479 if $ac_preproc_ok; then
    23532480   :
    23542481 else
    23552482-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
    2356 +  { { echo "$as_me:2294: error: C preprocessor \"$CPP\" fails sanity check" >&5
     2483+  { { echo "$as_me:2295: error: C preprocessor \"$CPP\" fails sanity check" >&5
    23572484 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    23582485    { (exit 1); exit 1; }; }
    23592486 fi
    2360 @@ -2301,14 +2304,14 @@
     2487@@ -2301,14 +2305,14 @@
    23612488 ac_main_return=return
    23622489 
    23632490 if test $ac_cv_c_compiler_gnu = yes; then
    23642491-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
    2365 +    echo "$as_me:2307: checking whether $CC needs -traditional" >&5
     2492+    echo "$as_me:2308: checking whether $CC needs -traditional" >&5
    23662493 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    23672494 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
    … …  
    23712498   cat >conftest.$ac_ext <<_ACEOF
    23722499-#line 2311 "configure"
    2373 +#line 2314 "configure"
     2500+#line 2315 "configure"
    23742501 #include "confdefs.h"
    23752502 #include <sgtty.h>
    23762503 int Autoconf = TIOCGETP;
    2377 @@ -2323,7 +2326,7 @@
     2504@@ -2323,7 +2327,7 @@
    23782505 
    23792506   if test $ac_cv_prog_gcc_traditional = no; then
    23802507     cat >conftest.$ac_ext <<_ACEOF
    23812508-#line 2326 "configure"
    2382 +#line 2329 "configure"
     2509+#line 2330 "configure"
    23832510 #include "confdefs.h"
    23842511 #include <termio.h>
    23852512 int Autoconf = TCGETA;
    2386 @@ -2336,14 +2339,14 @@
     2513@@ -2336,14 +2340,14 @@
    23872514 
    23882515   fi
    23892516 fi
    23902517-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
    2391 +echo "$as_me:2342: result: $ac_cv_prog_gcc_traditional" >&5
     2518+echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5
    23922519 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    23932520   if test $ac_cv_prog_gcc_traditional = yes; then
    … …  
    23972524 
    23982525-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
    2399 +echo "$as_me:2349: checking whether $CC understands -c and -o together" >&5
     2526+echo "$as_me:2350: checking whether $CC understands -c and -o together" >&5
    24002527 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    24012528 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    24022529   echo $ECHO_N "(cached) $ECHO_C" >&6
    2403 @@ -2359,15 +2362,15 @@
     2530@@ -2359,15 +2363,15 @@
    24042531 # We do the test twice because some compilers refuse to overwrite an
    24052532 # existing .o file with -o, though they will create one.
    24062533 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    24072534-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
    2408 +if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
     2535+if { (eval echo "$as_me:2366: \"$ac_try\"") >&5
    24092536   (eval $ac_try) 2>&5
    24102537   ac_status=$?
    24112538-  echo "$as_me:2365: \$? = $ac_status" >&5
    2412 +  echo "$as_me:2368: \$? = $ac_status" >&5
     2539+  echo "$as_me:2369: \$? = $ac_status" >&5
    24132540   (exit $ac_status); } &&
    24142541-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    2415 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:2370: \"$ac_try\"") >&5
     2542+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2371: \"$ac_try\"") >&5
    24162543   (eval $ac_try) 2>&5
    24172544   ac_status=$?
    24182545-  echo "$as_me:2370: \$? = $ac_status" >&5
    2419 +  echo "$as_me:2373: \$? = $ac_status" >&5
     2546+  echo "$as_me:2374: \$? = $ac_status" >&5
    24202547   (exit $ac_status); };
    24212548 then
    24222549   eval cf_cv_prog_CC_c_o=yes
    2423 @@ -2378,19 +2381,19 @@
     2550@@ -2378,19 +2382,19 @@
    24242551 
    24252552 fi
    24262553 if test $cf_cv_prog_CC_c_o = yes; then
    24272554-  echo "$as_me:2381: result: yes" >&5
    2428 +  echo "$as_me:2384: result: yes" >&5
     2555+  echo "$as_me:2385: result: yes" >&5
    24292556 echo "${ECHO_T}yes" >&6
    24302557 else
    24312558-  echo "$as_me:2384: result: no" >&5
    2432 +  echo "$as_me:2387: result: no" >&5
     2559+  echo "$as_me:2388: result: no" >&5
    24332560 echo "${ECHO_T}no" >&6
    24342561 fi
    24352562 
    24362563-echo "$as_me:2388: checking for POSIXized ISC" >&5
    2437 +echo "$as_me:2391: checking for POSIXized ISC" >&5
     2564+echo "$as_me:2392: checking for POSIXized ISC" >&5
    24382565 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    24392566 if test -d /etc/conf/kconfig.d &&
    … …  
    24412568 then
    24422569-  echo "$as_me:2393: result: yes" >&5
    2443 +  echo "$as_me:2396: result: yes" >&5
     2570+  echo "$as_me:2397: result: yes" >&5
    24442571 echo "${ECHO_T}yes" >&6
    24452572   ISC=yes # If later tests want to check for ISC.
    24462573 
    2447 @@ -2404,12 +2407,12 @@
     2574@@ -2404,12 +2408,12 @@
    24482575     CC="$CC -Xp"
    24492576   fi
    24502577 else
    24512578-  echo "$as_me:2407: result: no" >&5
    2452 +  echo "$as_me:2410: result: no" >&5
     2579+  echo "$as_me:2411: result: no" >&5
    24532580 echo "${ECHO_T}no" >&6
    24542581   ISC=
    … …  
    24562583 
    24572584-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
    2458 +echo "$as_me:2415: 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
    24592586 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
    24602587 if test "${cf_cv_ansi_cc+set}" = set; then
    24612588   echo $ECHO_N "(cached) $ECHO_C" >&6
    2462 @@ -2503,7 +2506,7 @@
     2589@@ -2494,7 +2498,7 @@
     2590 
     2591 if test -n "$cf_new_cppflags" ; then
     2592 
     2593-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     2594+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     2595 fi
     2596 
     2597 if test -n "$cf_new_extra_cppflags" ; then
     2598@@ -2503,7 +2507,7 @@
    24632599 fi
    24642600 
    24652601        cat >conftest.$ac_ext <<_ACEOF
    24662602-#line 2506 "configure"
    2467 +#line 2509 "configure"
     2603+#line 2510 "configure"
    24682604 #include "confdefs.h"
    24692605 
    24702606 #ifndef CC_HAS_PROTOS
    2471 @@ -2524,16 +2527,16 @@
     2607@@ -2524,16 +2528,16 @@
    24722608 }
    24732609 _ACEOF
    24742610 rm -f conftest.$ac_objext
    24752611-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
    2476 +if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
     2612+if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5
    24772613   (eval $ac_compile) 2>&5
    24782614   ac_status=$?
    24792615-  echo "$as_me:2530: \$? = $ac_status" >&5
    2480 +  echo "$as_me:2533: \$? = $ac_status" >&5
     2616+  echo "$as_me:2534: \$? = $ac_status" >&5
    24812617   (exit $ac_status); } &&
    24822618          { ac_try='test -s conftest.$ac_objext'
    24832619-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
    2484 +  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
     2620+  { (eval echo "$as_me:2537: \"$ac_try\"") >&5
    24852621   (eval $ac_try) 2>&5
    24862622   ac_status=$?
    24872623-  echo "$as_me:2536: \$? = $ac_status" >&5
    2488 +  echo "$as_me:2539: \$? = $ac_status" >&5
     2624+  echo "$as_me:2540: \$? = $ac_status" >&5
    24892625   (exit $ac_status); }; }; then
    24902626   cf_cv_ansi_cc="$cf_arg"; break
    24912627 else
    2492 @@ -2546,7 +2549,7 @@
     2628@@ -2546,7 +2550,7 @@
    24932629 CPPFLAGS="$cf_save_CPPFLAGS"
    24942630 
    24952631 fi
    24962632-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
    2497 +echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
     2633+echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5
    24982634 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    24992635 
    25002636 if test "$cf_cv_ansi_cc" != "no"; then
    2501 @@ -2629,7 +2632,7 @@
     2637@@ -2612,7 +2616,7 @@
     2638 
     2639 if test -n "$cf_new_cppflags" ; then
     2640 
     2641-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     2642+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     2643 fi
     2644 
     2645 if test -n "$cf_new_extra_cppflags" ; then
     2646@@ -2629,7 +2633,7 @@
    25022647 fi
    25032648 
    25042649 if test "$cf_cv_ansi_cc" = "no"; then
    25052650-       { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
    2506 +       { { echo "$as_me:2635: error: Your compiler does not appear to recognize prototypes.
     2651+       { { echo "$as_me:2636: error: Your compiler does not appear to recognize prototypes.
    25072652 You have the following choices:
    25082653        a. adjust your compiler options
    25092654        b. get an up-to-date compiler
    2510 @@ -2663,13 +2666,13 @@
     2655@@ -2663,13 +2667,13 @@
    25112656   LDCONFIG=:
    25122657 else
    … …  
    25202665 set dummy ldconfig; ac_word=$2
    25212666-echo "$as_me:2672: checking for $ac_word" >&5
    2522 +echo "$as_me:2675: checking for $ac_word" >&5
     2667+echo "$as_me:2676: checking for $ac_word" >&5
    25232668 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    25242669 if test "${ac_cv_path_LDCONFIG+set}" = set; then
    25252670   echo $ECHO_N "(cached) $ECHO_C" >&6
    2526 @@ -2686,7 +2689,7 @@
     2671@@ -2686,7 +2690,7 @@
    25272672   test -z "$ac_dir" && ac_dir=.
    25282673   if $as_executable_p "$ac_dir/$ac_word"; then
    25292674    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
    25302675-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
    2531 +   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
     2676+   echo "$as_me:2693: found $ac_dir/$ac_word" >&5
    25322677    break
    25332678 fi
    25342679 done
    2535 @@ -2697,10 +2700,10 @@
     2680@@ -2697,10 +2701,10 @@
    25362681 LDCONFIG=$ac_cv_path_LDCONFIG
    25372682 
    25382683 if test -n "$LDCONFIG"; then
    25392684-  echo "$as_me:2700: result: $LDCONFIG" >&5
    2540 +  echo "$as_me:2703: result: $LDCONFIG" >&5
     2685+  echo "$as_me:2704: result: $LDCONFIG" >&5
    25412686 echo "${ECHO_T}$LDCONFIG" >&6
    25422687 else
    25432688-  echo "$as_me:2703: result: no" >&5
    2544 +  echo "$as_me:2706: result: no" >&5
     2689+  echo "$as_me:2707: result: no" >&5
    25452690 echo "${ECHO_T}no" >&6
    25462691 fi
    25472692 
    2548 @@ -2708,7 +2711,7 @@
     2693@@ -2708,7 +2712,7 @@
    25492694 esac
    25502695 fi
    25512696 
    25522697-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
    2553 +echo "$as_me:2714: 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
    25542699 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
    25552700 
    25562701 # Check whether --with-cxx or --without-cxx was given.
    2557 @@ -2718,7 +2721,7 @@
     2702@@ -2718,7 +2722,7 @@
    25582703 else
    25592704   cf_with_cxx=yes
    25602705 fi;
    25612706-echo "$as_me:2721: result: $cf_with_cxx" >&5
    2562 +echo "$as_me:2724: result: $cf_with_cxx" >&5
     2707+echo "$as_me:2725: result: $cf_with_cxx" >&5
    25632708 echo "${ECHO_T}$cf_with_cxx" >&6
    25642709 if test "X$cf_with_cxx" = Xno ; then
    25652710        CXX=""
    2566 @@ -2736,7 +2739,7 @@
     2711@@ -2736,7 +2740,7 @@
    25672712   do
    25682713     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    25692714 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    25702715-echo "$as_me:2739: checking for $ac_word" >&5
    2571 +echo "$as_me:2742: checking for $ac_word" >&5
     2716+echo "$as_me:2743: checking for $ac_word" >&5
    25722717 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    25732718 if test "${ac_cv_prog_CXX+set}" = set; then
    25742719   echo $ECHO_N "(cached) $ECHO_C" >&6
    2575 @@ -2751,7 +2754,7 @@
     2720@@ -2751,7 +2755,7 @@
    25762721   test -z "$ac_dir" && ac_dir=.
    25772722   $as_executable_p "$ac_dir/$ac_word" || continue
    25782723 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    25792724-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
    2580 +echo "$as_me:2757: found $ac_dir/$ac_word" >&5
     2725+echo "$as_me:2758: found $ac_dir/$ac_word" >&5
    25812726 break
    25822727 done
    25832728 
    2584 @@ -2759,10 +2762,10 @@
     2729@@ -2759,10 +2763,10 @@
    25852730 fi
    25862731 CXX=$ac_cv_prog_CXX
    25872732 if test -n "$CXX"; then
    25882733-  echo "$as_me:2762: result: $CXX" >&5
    2589 +  echo "$as_me:2765: result: $CXX" >&5
     2734+  echo "$as_me:2766: result: $CXX" >&5
    25902735 echo "${ECHO_T}$CXX" >&6
    25912736 else
    25922737-  echo "$as_me:2765: result: no" >&5
    2593 +  echo "$as_me:2768: result: no" >&5
     2738+  echo "$as_me:2769: result: no" >&5
    25942739 echo "${ECHO_T}no" >&6
    25952740 fi
    25962741 
    2597 @@ -2775,7 +2778,7 @@
     2742@@ -2775,7 +2779,7 @@
    25982743 do
    25992744   # Extract the first word of "$ac_prog", so it can be a program name with args.
    26002745 set dummy $ac_prog; ac_word=$2
    26012746-echo "$as_me:2778: checking for $ac_word" >&5
    2602 +echo "$as_me:2781: checking for $ac_word" >&5
     2747+echo "$as_me:2782: checking for $ac_word" >&5
    26032748 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26042749 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    26052750   echo $ECHO_N "(cached) $ECHO_C" >&6
    2606 @@ -2790,7 +2793,7 @@
     2751@@ -2790,7 +2794,7 @@
    26072752   test -z "$ac_dir" && ac_dir=.
    26082753   $as_executable_p "$ac_dir/$ac_word" || continue
    26092754 ac_cv_prog_ac_ct_CXX="$ac_prog"
    26102755-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
    2611 +echo "$as_me:2796: found $ac_dir/$ac_word" >&5
     2756+echo "$as_me:2797: found $ac_dir/$ac_word" >&5
    26122757 break
    26132758 done
    26142759 
    2615 @@ -2798,10 +2801,10 @@
     2760@@ -2798,10 +2802,10 @@
    26162761 fi
    26172762 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
    26182763 if test -n "$ac_ct_CXX"; then
    26192764-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
    2620 +  echo "$as_me:2804: result: $ac_ct_CXX" >&5
     2765+  echo "$as_me:2805: result: $ac_ct_CXX" >&5
    26212766 echo "${ECHO_T}$ac_ct_CXX" >&6
    26222767 else
    26232768-  echo "$as_me:2804: result: no" >&5
    2624 +  echo "$as_me:2807: result: no" >&5
     2769+  echo "$as_me:2808: result: no" >&5
    26252770 echo "${ECHO_T}no" >&6
    26262771 fi
    26272772 
    2628 @@ -2813,32 +2816,32 @@
     2773@@ -2813,32 +2817,32 @@
    26292774 fi
    26302775 
    26312776 # Provide some information about the compiler.
    26322777-echo "$as_me:2816:" \
    2633 +echo "$as_me:2819:" \
     2778+echo "$as_me:2820:" \
    26342779      "checking for C++ compiler version" >&5
    26352780 ac_compiler=`set X $ac_compile; echo $2`
    26362781-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
    2637 +{ (eval echo "$as_me:2822: \"$ac_compiler --version </dev/null >&5\"") >&5
     2782+{ (eval echo "$as_me:2823: \"$ac_compiler --version </dev/null >&5\"") >&5
    26382783   (eval $ac_compiler --version </dev/null >&5) 2>&5
    26392784   ac_status=$?
    26402785-  echo "$as_me:2822: \$? = $ac_status" >&5
    2641 +  echo "$as_me:2825: \$? = $ac_status" >&5
     2786+  echo "$as_me:2826: \$? = $ac_status" >&5
    26422787   (exit $ac_status); }
    26432788-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
    2644 +{ (eval echo "$as_me:2827: \"$ac_compiler -v </dev/null >&5\"") >&5
     2789+{ (eval echo "$as_me:2828: \"$ac_compiler -v </dev/null >&5\"") >&5
    26452790   (eval $ac_compiler -v </dev/null >&5) 2>&5
    26462791   ac_status=$?
    26472792-  echo "$as_me:2827: \$? = $ac_status" >&5
    2648 +  echo "$as_me:2830: \$? = $ac_status" >&5
     2793+  echo "$as_me:2831: \$? = $ac_status" >&5
    26492794   (exit $ac_status); }
    26502795-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
    2651 +{ (eval echo "$as_me:2832: \"$ac_compiler -V </dev/null >&5\"") >&5
     2796+{ (eval echo "$as_me:2833: \"$ac_compiler -V </dev/null >&5\"") >&5
    26522797   (eval $ac_compiler -V </dev/null >&5) 2>&5
    26532798   ac_status=$?
    26542799-  echo "$as_me:2832: \$? = $ac_status" >&5
    2655 +  echo "$as_me:2835: \$? = $ac_status" >&5
     2800+  echo "$as_me:2836: \$? = $ac_status" >&5
    26562801   (exit $ac_status); }
    26572802 
    26582803-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
    2659 +echo "$as_me:2838: 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
    26602805 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
    26612806 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    … …  
    26642809   cat >conftest.$ac_ext <<_ACEOF
    26652810-#line 2841 "configure"
    2666 +#line 2844 "configure"
     2811+#line 2845 "configure"
    26672812 #include "confdefs.h"
    26682813 
    26692814 int
    2670 @@ -2853,16 +2856,16 @@
     2815@@ -2853,16 +2857,16 @@
    26712816 }
    26722817 _ACEOF
    26732818 rm -f conftest.$ac_objext
    26742819-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
    2675 +if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
     2820+if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
    26762821   (eval $ac_compile) 2>&5
    26772822   ac_status=$?
    26782823-  echo "$as_me:2859: \$? = $ac_status" >&5
    2679 +  echo "$as_me:2862: \$? = $ac_status" >&5
     2824+  echo "$as_me:2863: \$? = $ac_status" >&5
    26802825   (exit $ac_status); } &&
    26812826          { ac_try='test -s conftest.$ac_objext'
    26822827-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
    2683 +  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
     2828+  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
    26842829   (eval $ac_try) 2>&5
    26852830   ac_status=$?
    26862831-  echo "$as_me:2865: \$? = $ac_status" >&5
    2687 +  echo "$as_me:2868: \$? = $ac_status" >&5
     2832+  echo "$as_me:2869: \$? = $ac_status" >&5
    26882833   (exit $ac_status); }; }; then
    26892834   ac_compiler_gnu=yes
    26902835 else
    2691 @@ -2874,19 +2877,19 @@
     2836@@ -2874,19 +2878,19 @@
    26922837 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
    26932838 
    26942839 fi
    26952840-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
    2696 +echo "$as_me:2880: result: $ac_cv_cxx_compiler_gnu" >&5
     2841+echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5
    26972842 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
    26982843 GXX=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    27012846 CXXFLAGS="-g"
    27022847-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
    2703 +echo "$as_me:2886: checking whether $CXX accepts -g" >&5
     2848+echo "$as_me:2887: checking whether $CXX accepts -g" >&5
    27042849 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
    27052850 if test "${ac_cv_prog_cxx_g+set}" = set; then
    … …  
    27082853   cat >conftest.$ac_ext <<_ACEOF
    27092854-#line 2889 "configure"
    2710 +#line 2892 "configure"
     2855+#line 2893 "configure"
    27112856 #include "confdefs.h"
    27122857 
    27132858 int
    2714 @@ -2898,16 +2901,16 @@
     2859@@ -2898,16 +2902,16 @@
    27152860 }
    27162861 _ACEOF
    27172862 rm -f conftest.$ac_objext
    27182863-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
    2719 +if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
     2864+if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5
    27202865   (eval $ac_compile) 2>&5
    27212866   ac_status=$?
    27222867-  echo "$as_me:2904: \$? = $ac_status" >&5
    2723 +  echo "$as_me:2907: \$? = $ac_status" >&5
     2868+  echo "$as_me:2908: \$? = $ac_status" >&5
    27242869   (exit $ac_status); } &&
    27252870          { ac_try='test -s conftest.$ac_objext'
    27262871-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
    2727 +  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
     2872+  { (eval echo "$as_me:2911: \"$ac_try\"") >&5
    27282873   (eval $ac_try) 2>&5
    27292874   ac_status=$?
    27302875-  echo "$as_me:2910: \$? = $ac_status" >&5
    2731 +  echo "$as_me:2913: \$? = $ac_status" >&5
     2876+  echo "$as_me:2914: \$? = $ac_status" >&5
    27322877   (exit $ac_status); }; }; then
    27332878   ac_cv_prog_cxx_g=yes
    27342879 else
    2735 @@ -2917,7 +2920,7 @@
     2880@@ -2917,7 +2921,7 @@
    27362881 fi
    27372882 rm -f conftest.$ac_objext conftest.$ac_ext
    27382883 fi
    27392884-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
    2740 +echo "$as_me:2923: result: $ac_cv_prog_cxx_g" >&5
     2885+echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5
    27412886 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
    27422887 if test "$ac_test_CXXFLAGS" = set; then
    27432888   CXXFLAGS=$ac_save_CXXFLAGS
    2744 @@ -2944,7 +2947,7 @@
     2889@@ -2944,7 +2948,7 @@
    27452890    'void exit (int);'
    27462891 do
    27472892   cat >conftest.$ac_ext <<_ACEOF
    27482893-#line 2947 "configure"
    2749 +#line 2950 "configure"
     2894+#line 2951 "configure"
    27502895 #include "confdefs.h"
    27512896 #include <stdlib.h>
    27522897 $ac_declaration
    2753 @@ -2957,16 +2960,16 @@
     2898@@ -2957,16 +2961,16 @@
    27542899 }
    27552900 _ACEOF
    27562901 rm -f conftest.$ac_objext
    27572902-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
    2758 +if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
     2903+if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5
    27592904   (eval $ac_compile) 2>&5
    27602905   ac_status=$?
    27612906-  echo "$as_me:2963: \$? = $ac_status" >&5
    2762 +  echo "$as_me:2966: \$? = $ac_status" >&5
     2907+  echo "$as_me:2967: \$? = $ac_status" >&5
    27632908   (exit $ac_status); } &&
    27642909          { ac_try='test -s conftest.$ac_objext'
    27652910-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
    2766 +  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
     2911+  { (eval echo "$as_me:2970: \"$ac_try\"") >&5
    27672912   (eval $ac_try) 2>&5
    27682913   ac_status=$?
    27692914-  echo "$as_me:2969: \$? = $ac_status" >&5
    2770 +  echo "$as_me:2972: \$? = $ac_status" >&5
     2915+  echo "$as_me:2973: \$? = $ac_status" >&5
    27712916   (exit $ac_status); }; }; then
    27722917   :
    27732918 else
    2774 @@ -2976,7 +2979,7 @@
     2919@@ -2976,7 +2980,7 @@
    27752920 fi
    27762921 rm -f conftest.$ac_objext conftest.$ac_ext
    27772922   cat >conftest.$ac_ext <<_ACEOF
    27782923-#line 2979 "configure"
    2779 +#line 2982 "configure"
     2924+#line 2983 "configure"
    27802925 #include "confdefs.h"
    27812926 $ac_declaration
    27822927 int
    2783 @@ -2988,16 +2991,16 @@
     2928@@ -2988,16 +2992,16 @@
    27842929 }
    27852930 _ACEOF
    27862931 rm -f conftest.$ac_objext
    27872932-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
    2788 +if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
     2933+if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
    27892934   (eval $ac_compile) 2>&5
    27902935   ac_status=$?
    27912936-  echo "$as_me:2994: \$? = $ac_status" >&5
    2792 +  echo "$as_me:2997: \$? = $ac_status" >&5
     2937+  echo "$as_me:2998: \$? = $ac_status" >&5
    27932938   (exit $ac_status); } &&
    27942939          { ac_try='test -s conftest.$ac_objext'
    27952940-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
    2796 +  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
     2941+  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
    27972942   (eval $ac_try) 2>&5
    27982943   ac_status=$?
    27992944-  echo "$as_me:3000: \$? = $ac_status" >&5
    2800 +  echo "$as_me:3003: \$? = $ac_status" >&5
     2945+  echo "$as_me:3004: \$? = $ac_status" >&5
    28012946   (exit $ac_status); }; }; then
    28022947   break
    28032948 else
    2804 @@ -3024,7 +3027,7 @@
     2949@@ -3024,7 +3028,7 @@
    28052950        if test "$CXX" = "g++" ; then
    28062951                # Extract the first word of "g++", so it can be a program name with args.
    28072952 set dummy g++; ac_word=$2
    28082953-echo "$as_me:3027: checking for $ac_word" >&5
    2809 +echo "$as_me:3030: checking for $ac_word" >&5
     2954+echo "$as_me:3031: checking for $ac_word" >&5
    28102955 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    28112956 if test "${ac_cv_path_CXX+set}" = set; then
    28122957   echo $ECHO_N "(cached) $ECHO_C" >&6
    2813 @@ -3041,7 +3044,7 @@
     2958@@ -3041,7 +3045,7 @@
    28142959   test -z "$ac_dir" && ac_dir=.
    28152960   if $as_executable_p "$ac_dir/$ac_word"; then
    28162961    ac_cv_path_CXX="$ac_dir/$ac_word"
    28172962-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
    2818 +   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
     2963+   echo "$as_me:3048: found $ac_dir/$ac_word" >&5
    28192964    break
    28202965 fi
    28212966 done
    2822 @@ -3052,16 +3055,16 @@
     2967@@ -3052,16 +3056,16 @@
    28232968 CXX=$ac_cv_path_CXX
    28242969 
    28252970 if test -n "$CXX"; then
    28262971-  echo "$as_me:3055: result: $CXX" >&5
    2827 +  echo "$as_me:3058: result: $CXX" >&5
     2972+  echo "$as_me:3059: result: $CXX" >&5
    28282973 echo "${ECHO_T}$CXX" >&6
    28292974 else
    28302975-  echo "$as_me:3058: result: no" >&5
    2831 +  echo "$as_me:3061: result: no" >&5
     2976+  echo "$as_me:3062: result: no" >&5
    28322977 echo "${ECHO_T}no" >&6
    28332978 fi
    … …  
    28362981        if test "$CXX" = "g++" ; then
    28372982-               { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
    2838 +               { echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
     2983+               { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5
    28392984 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
    28402985                cf_with_cxx=no; CXX=""; GXX="";
    28412986        fi
    2842 @@ -3069,11 +3072,11 @@
     2987@@ -3069,11 +3073,11 @@
    28432988 
    28442989 GXX_VERSION=none
    28452990 if test "$GXX" = yes; then
    28462991-       echo "$as_me:3072: checking version of g++" >&5
    2847 +       echo "$as_me:3075: checking version of g++" >&5
     2992+       echo "$as_me:3076: checking version of g++" >&5
    28482993 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
    28492994        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    28502995        test -z "$GXX_VERSION" && GXX_VERSION=unknown
    28512996-       echo "$as_me:3076: result: $GXX_VERSION" >&5
    2852 +       echo "$as_me:3079: result: $GXX_VERSION" >&5
     2997+       echo "$as_me:3080: result: $GXX_VERSION" >&5
    28532998 echo "${ECHO_T}$GXX_VERSION" >&6
    28542999 fi
    28553000 
    2856 @@ -3081,12 +3084,12 @@
     3001@@ -3081,12 +3085,12 @@
    28573002 1*|2.[0-6]*)
    28583003        # GXX=""; CXX=""; ac_cv_prog_gxx=no
    28593004        # cf_cxx_library=no
    28603005-       { echo "$as_me:3084: WARNING: templates do not work" >&5
    2861 +       { echo "$as_me:3087: WARNING: templates do not work" >&5
     3006+       { echo "$as_me:3088: WARNING: templates do not work" >&5
    28623007 echo "$as_me: WARNING: templates do not work" >&2;}
    28633008        ;;
    … …  
    28653010 
    28663011-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
    2867 +echo "$as_me:3092: 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
    28683013 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
    28693014 
    28703015 # Check whether --with-cxx-binding or --without-cxx-binding was given.
    2871 @@ -3096,10 +3099,10 @@
     3016@@ -3096,10 +3100,10 @@
    28723017 else
    28733018   cf_with_cxx_binding=$cf_with_cxx
    28743019 fi;
    28753020-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
    2876 +echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
     3021+echo "$as_me:3103: result: $cf_with_cxx_binding" >&5
    28773022 echo "${ECHO_T}$cf_with_cxx_binding" >&6
    28783023 
    28793024-echo "$as_me:3102: checking if you want to build with Ada95" >&5
    2880 +echo "$as_me:3105: checking if you want to build with Ada95" >&5
     3025+echo "$as_me:3106: checking if you want to build with Ada95" >&5
    28813026 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
    28823027 
    28833028 # Check whether --with-ada or --without-ada was given.
    2884 @@ -3109,10 +3112,23 @@
     3029@@ -3109,10 +3113,23 @@
    28853030 else
    28863031   cf_with_ada=yes
    28873032 fi;
    28883033-echo "$as_me:3112: result: $cf_with_ada" >&5
    2889 +echo "$as_me:3115: result: $cf_with_ada" >&5
     3034+echo "$as_me:3116: result: $cf_with_ada" >&5
    28903035 echo "${ECHO_T}$cf_with_ada" >&6
    28913036 
    28923037-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
    2893 +echo "$as_me:3118: checking if you want to install manpages" >&5
     3038+echo "$as_me:3119: checking if you want to install manpages" >&5
    28943039+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
    28953040+
    … …  
    29013046+  cf_with_manpages=yes
    29023047+fi;
    2903 +echo "$as_me:3128: result: $cf_with_manpages" >&5
     3048+echo "$as_me:3129: result: $cf_with_manpages" >&5
    29043049+echo "${ECHO_T}$cf_with_manpages" >&6
    29053050+
    2906 +echo "$as_me:3131: checking if you want to build programs such as tic" >&5
     3051+echo "$as_me:3132: checking if you want to build programs such as tic" >&5
    29073052 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
    29083053 
    29093054 # Check whether --with-progs or --without-progs was given.
    2910 @@ -3122,10 +3138,10 @@
     3055@@ -3122,10 +3139,10 @@
    29113056 else
    29123057   cf_with_progs=yes
    29133058 fi;
    29143059-echo "$as_me:3125: result: $cf_with_progs" >&5
    2915 +echo "$as_me:3141: result: $cf_with_progs" >&5
     3060+echo "$as_me:3142: result: $cf_with_progs" >&5
    29163061 echo "${ECHO_T}$cf_with_progs" >&6
    29173062 
    29183063-echo "$as_me:3128: checking if you wish to install curses.h" >&5
    2919 +echo "$as_me:3144: checking if you wish to install curses.h" >&5
     3064+echo "$as_me:3145: checking if you wish to install curses.h" >&5
    29203065 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
    29213066 
    29223067 # Check whether --with-curses-h or --without-curses-h was given.
    2923 @@ -3135,7 +3151,7 @@
     3068@@ -3135,7 +3152,7 @@
    29243069 else
    29253070   with_curses_h=yes
    29263071 fi;
    29273072-echo "$as_me:3138: result: $with_curses_h" >&5
    2928 +echo "$as_me:3154: result: $with_curses_h" >&5
     3073+echo "$as_me:3155: result: $with_curses_h" >&5
    29293074 echo "${ECHO_T}$with_curses_h" >&6
    29303075 
    29313076 modules_to_build="ncurses"
    2932 @@ -3161,7 +3177,7 @@
     3077@@ -3161,7 +3178,7 @@
    29333078 do
    29343079   # Extract the first word of "$ac_prog", so it can be a program name with args.
    29353080 set dummy $ac_prog; ac_word=$2
    29363081-echo "$as_me:3164: checking for $ac_word" >&5
    2937 +echo "$as_me:3180: checking for $ac_word" >&5
     3082+echo "$as_me:3181: checking for $ac_word" >&5
    29383083 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29393084 if test "${ac_cv_prog_AWK+set}" = set; then
    29403085   echo $ECHO_N "(cached) $ECHO_C" >&6
    2941 @@ -3176,7 +3192,7 @@
     3086@@ -3176,7 +3193,7 @@
    29423087   test -z "$ac_dir" && ac_dir=.
    29433088   $as_executable_p "$ac_dir/$ac_word" || continue
    29443089 ac_cv_prog_AWK="$ac_prog"
    29453090-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    2946 +echo "$as_me:3195: found $ac_dir/$ac_word" >&5
     3091+echo "$as_me:3196: found $ac_dir/$ac_word" >&5
    29473092 break
    29483093 done
    29493094 
    2950 @@ -3184,21 +3200,21 @@
     3095@@ -3184,21 +3201,21 @@
    29513096 fi
    29523097 AWK=$ac_cv_prog_AWK
    29533098 if test -n "$AWK"; then
    29543099-  echo "$as_me:3187: result: $AWK" >&5
    2955 +  echo "$as_me:3203: result: $AWK" >&5
     3100+  echo "$as_me:3204: result: $AWK" >&5
    29563101 echo "${ECHO_T}$AWK" >&6
    29573102 else
    29583103-  echo "$as_me:3190: result: no" >&5
    2959 +  echo "$as_me:3206: result: no" >&5
     3104+  echo "$as_me:3207: result: no" >&5
    29603105 echo "${ECHO_T}no" >&6
    29613106 fi
    … …  
    29653110 
    29663111-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
    2967 +test -z "$AWK" && { { echo "$as_me:3213: error: No awk program found" >&5
     3112+test -z "$AWK" && { { echo "$as_me:3214: error: No awk program found" >&5
    29683113 echo "$as_me: error: No awk program found" >&2;}
    29693114    { (exit 1); exit 1; }; }
    29703115 
    29713116-echo "$as_me:3201: checking for egrep" >&5
    2972 +echo "$as_me:3217: checking for egrep" >&5
     3117+echo "$as_me:3218: checking for egrep" >&5
    29733118 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    29743119 if test "${ac_cv_prog_egrep+set}" = set; then
    29753120   echo $ECHO_N "(cached) $ECHO_C" >&6
    2976 @@ -3208,11 +3224,11 @@
     3121@@ -3208,11 +3225,11 @@
    29773122     else ac_cv_prog_egrep='egrep'
    29783123     fi
    29793124 fi
    29803125-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
    2981 +echo "$as_me:3227: result: $ac_cv_prog_egrep" >&5
     3126+echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5
    29823127 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    29833128  EGREP=$ac_cv_prog_egrep
    29843129 
    29853130-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
    2986 +test -z "$EGREP" && { { echo "$as_me:3231: error: No egrep program found" >&5
     3131+test -z "$EGREP" && { { echo "$as_me:3232: error: No egrep program found" >&5
    29873132 echo "$as_me: error: No egrep program found" >&2;}
    29883133    { (exit 1); exit 1; }; }
    29893134 
    2990 @@ -3228,7 +3244,7 @@
     3135@@ -3228,7 +3245,7 @@
    29913136 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    29923137 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    29933138 # ./install, which can be erroneously created by make from ./install.sh.
    29943139-echo "$as_me:3231: checking for a BSD compatible install" >&5
    2995 +echo "$as_me:3247: checking for a BSD compatible install" >&5
     3140+echo "$as_me:3248: checking for a BSD compatible install" >&5
    29963141 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    29973142 if test -z "$INSTALL"; then
    29983143 if test "${ac_cv_path_install+set}" = set; then
    2999 @@ -3277,7 +3293,7 @@
     3144@@ -3277,7 +3294,7 @@
    30003145     INSTALL=$ac_install_sh
    30013146   fi
    30023147 fi
    30033148-echo "$as_me:3280: result: $INSTALL" >&5
    3004 +echo "$as_me:3296: result: $INSTALL" >&5
     3149+echo "$as_me:3297: result: $INSTALL" >&5
    30053150 echo "${ECHO_T}$INSTALL" >&6
    30063151 
    30073152 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    3008 @@ -3302,7 +3318,7 @@
     3153@@ -3302,7 +3319,7 @@
    30093154 do
    30103155   # Extract the first word of "$ac_prog", so it can be a program name with args.
    30113156 set dummy $ac_prog; ac_word=$2
    30123157-echo "$as_me:3305: checking for $ac_word" >&5
    3013 +echo "$as_me:3321: checking for $ac_word" >&5
     3158+echo "$as_me:3322: checking for $ac_word" >&5
    30143159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    30153160 if test "${ac_cv_prog_LINT+set}" = set; then
    30163161   echo $ECHO_N "(cached) $ECHO_C" >&6
    3017 @@ -3317,7 +3333,7 @@
     3162@@ -3317,7 +3334,7 @@
    30183163   test -z "$ac_dir" && ac_dir=.
    30193164   $as_executable_p "$ac_dir/$ac_word" || continue
    30203165 ac_cv_prog_LINT="$ac_prog"
    30213166-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
    3022 +echo "$as_me:3336: found $ac_dir/$ac_word" >&5
     3167+echo "$as_me:3337: found $ac_dir/$ac_word" >&5
    30233168 break
    30243169 done
    30253170 
    3026 @@ -3325,28 +3341,28 @@
     3171@@ -3325,28 +3342,28 @@
    30273172 fi
    30283173 LINT=$ac_cv_prog_LINT
    30293174 if test -n "$LINT"; then
    30303175-  echo "$as_me:3328: result: $LINT" >&5
    3031 +  echo "$as_me:3344: result: $LINT" >&5
     3176+  echo "$as_me:3345: result: $LINT" >&5
    30323177 echo "${ECHO_T}$LINT" >&6
    30333178 else
    30343179-  echo "$as_me:3331: result: no" >&5
    3035 +  echo "$as_me:3347: result: no" >&5
     3180+  echo "$as_me:3348: result: no" >&5
    30363181 echo "${ECHO_T}no" >&6
    30373182 fi
    … …  
    30413186 
    30423187-echo "$as_me:3338: checking whether ln -s works" >&5
    3043 +echo "$as_me:3354: checking whether ln -s works" >&5
     3188+echo "$as_me:3355: checking whether ln -s works" >&5
    30443189 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    30453190 LN_S=$as_ln_s
    30463191 if test "$LN_S" = "ln -s"; then
    30473192-  echo "$as_me:3342: result: yes" >&5
    3048 +  echo "$as_me:3358: result: yes" >&5
     3193+  echo "$as_me:3359: result: yes" >&5
    30493194 echo "${ECHO_T}yes" >&6
    30503195 else
    30513196-  echo "$as_me:3345: result: no, using $LN_S" >&5
    3052 +  echo "$as_me:3361: result: no, using $LN_S" >&5
     3197+  echo "$as_me:3362: result: no, using $LN_S" >&5
    30533198 echo "${ECHO_T}no, using $LN_S" >&6
    30543199 fi
    30553200 
    30563201-echo "$as_me:3349: checking for long file names" >&5
    3057 +echo "$as_me:3365: checking for long file names" >&5
     3202+echo "$as_me:3366: checking for long file names" >&5
    30583203 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    30593204 if test "${ac_cv_sys_long_file_names+set}" = set; then
    30603205   echo $ECHO_N "(cached) $ECHO_C" >&6
    3061 @@ -3385,7 +3401,7 @@
     3206@@ -3385,7 +3402,7 @@
    30623207   rm -rf $ac_xdir 2>/dev/null
    30633208 done
    30643209 fi
    30653210-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
    3066 +echo "$as_me:3404: result: $ac_cv_sys_long_file_names" >&5
     3211+echo "$as_me:3405: result: $ac_cv_sys_long_file_names" >&5
    30673212 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    30683213 if test $ac_cv_sys_long_file_names = yes; then
    30693214 
    3070 @@ -3395,7 +3411,136 @@
     3215@@ -3395,7 +3412,136 @@
    30713216 
    30723217 fi
    … …  
    30753220+# if we find pkg-config, check if we should install the ".pc" files.
    30763221+
    3077 +echo "$as_me:3416: checking if you want to use pkg-config" >&5
     3222+echo "$as_me:3417: checking if you want to use pkg-config" >&5
    30783223+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
    30793224+
    … …  
    30853230+  cf_pkg_config=yes
    30863231+fi;
    3087 +echo "$as_me:3426: result: $cf_pkg_config" >&5
     3232+echo "$as_me:3427: result: $cf_pkg_config" >&5
    30883233+echo "${ECHO_T}$cf_pkg_config" >&6
    30893234+
    3090 +case $cf_pkg_config in
    3091 +no)
     3235+case $cf_pkg_config in #(vi
     3236+no) #(vi
    30923237+       PKG_CONFIG=none
    30933238+       ;;
    3094 +yes)
     3239+yes) #(vi
    30953240+       # Extract the first word of "pkg-config", so it can be a program name with args.
    30963241+set dummy pkg-config; ac_word=$2
    3097 +echo "$as_me:3436: checking for $ac_word" >&5
     3242+echo "$as_me:3437: checking for $ac_word" >&5
    30983243+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    30993244+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    … …  
    31123257+  if $as_executable_p "$ac_dir/$ac_word"; then
    31133258+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    3114 +   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
     3259+   echo "$as_me:3454: found $ac_dir/$ac_word" >&5
    31153260+   break
    31163261+fi
    … …  
    31243269+
    31253270+if test -n "$PKG_CONFIG"; then
    3126 +  echo "$as_me:3465: result: $PKG_CONFIG" >&5
     3271+  echo "$as_me:3466: result: $PKG_CONFIG" >&5
    31273272+echo "${ECHO_T}$PKG_CONFIG" >&6
    31283273+else
    3129 +  echo "$as_me:3468: result: no" >&5
     3274+  echo "$as_me:3469: result: no" >&5
    31303275+echo "${ECHO_T}no" >&6
    31313276+fi
    … …  
    31653310+  ;;
    31663311+*)
    3167 +  { { echo "$as_me:3506: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     3312+  { { echo "$as_me:3507: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    31683313+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    31693314+   { (exit 1); exit 1; }; }
    … …  
    31743319+
    31753320+if test "$PKG_CONFIG" != no ; then
    3176 +       echo "$as_me:3515: checking if we should install .pc files for $PKG_CONFIG" >&5
     3321+       echo "$as_me:3516: checking if we should install .pc files for $PKG_CONFIG" >&5
    31773322+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    31783323+
    … …  
    31913336+  enable_pc_files=no
    31923337+fi;
    3193 +               echo "$as_me:3532: result: $enable_pc_files" >&5
     3338+               echo "$as_me:3533: result: $enable_pc_files" >&5
    31943339+echo "${ECHO_T}$enable_pc_files" >&6
    31953340+       else
    3196 +               echo "$as_me:3535: result: no" >&5
     3341+               echo "$as_me:3536: result: no" >&5
    31973342+echo "${ECHO_T}no" >&6
    3198 +               { echo "$as_me:3537: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
     3343+               { echo "$as_me:3538: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
    31993344+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
    32003345+               enable_pc_files=no
    … …  
    32023347+fi
    32033348+
    3204 +echo "$as_me:3543: checking if we should assume mixed-case filenames" >&5
     3349+echo "$as_me:3544: checking if we should assume mixed-case filenames" >&5
    32053350 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    32063351 
    32073352 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    3208 @@ -3405,11 +3550,11 @@
     3353@@ -3405,11 +3551,11 @@
    32093354 else
    32103355   enable_mixedcase=auto
    32113356 fi;
    32123357-echo "$as_me:3408: result: $enable_mixedcase" >&5
    3213 +echo "$as_me:3553: result: $enable_mixedcase" >&5
     3358+echo "$as_me:3554: result: $enable_mixedcase" >&5
    32143359 echo "${ECHO_T}$enable_mixedcase" >&6
    32153360 if test "$enable_mixedcase" = "auto" ; then
    32163361 
    32173362-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
    3218 +echo "$as_me:3557: checking if filesystem supports mixed-case filenames" >&5
     3363+echo "$as_me:3558: checking if filesystem supports mixed-case filenames" >&5
    32193364 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    32203365 if test "${cf_cv_mixedcase+set}" = set; then
    32213366   echo $ECHO_N "(cached) $ECHO_C" >&6
    3222 @@ -3436,7 +3581,7 @@
     3367@@ -3436,7 +3582,7 @@
    32233368 fi
    32243369 
    32253370 fi
    32263371-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
    3227 +echo "$as_me:3584: result: $cf_cv_mixedcase" >&5
     3372+echo "$as_me:3585: result: $cf_cv_mixedcase" >&5
    32283373 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    32293374 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    32303375 #define MIXEDCASE_FILENAMES 1
    3231 @@ -3453,7 +3598,7 @@
     3376@@ -3453,7 +3599,7 @@
    32323377 fi
    32333378 
    32343379 # do this after mixed-case option (tags/TAGS is not as important as tic).
    32353380-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3236 +echo "$as_me:3601: checking whether ${MAKE-make} sets \${MAKE}" >&5
     3381+echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5
    32373382 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    32383383 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    32393384 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    3240 @@ -3473,18 +3618,18 @@
     3385@@ -3473,18 +3619,18 @@
    32413386 rm -f conftest.make
    32423387 fi
    32433388 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    32443389-  echo "$as_me:3476: result: yes" >&5
    3245 +  echo "$as_me:3621: result: yes" >&5
     3390+  echo "$as_me:3622: result: yes" >&5
    32463391 echo "${ECHO_T}yes" >&6
    32473392   SET_MAKE=
    32483393 else
    32493394-  echo "$as_me:3480: result: no" >&5
    3250 +  echo "$as_me:3625: result: no" >&5
     3395+  echo "$as_me:3626: result: no" >&5
    32513396 echo "${ECHO_T}no" >&6
    32523397   SET_MAKE="MAKE=${MAKE-make}"
    … …  
    32563401 set dummy ctags; ac_word=$2
    32573402-echo "$as_me:3487: checking for $ac_word" >&5
    3258 +echo "$as_me:3632: checking for $ac_word" >&5
     3403+echo "$as_me:3633: checking for $ac_word" >&5
    32593404 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    32603405 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    32613406   echo $ECHO_N "(cached) $ECHO_C" >&6
    3262 @@ -3499,7 +3644,7 @@
     3407@@ -3499,7 +3645,7 @@
    32633408   test -z "$ac_dir" && ac_dir=.
    32643409   $as_executable_p "$ac_dir/$ac_word" || continue
    32653410 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    32663411-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
    3267 +echo "$as_me:3647: found $ac_dir/$ac_word" >&5
     3412+echo "$as_me:3648: found $ac_dir/$ac_word" >&5
    32683413 break
    32693414 done
    32703415 
    3271 @@ -3508,17 +3653,17 @@
     3416@@ -3508,17 +3654,17 @@
    32723417 fi
    32733418 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    32743419 if test -n "$MAKE_LOWER_TAGS"; then
    32753420-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
    3276 +  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
     3421+  echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5
    32773422 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    32783423 else
    32793424-  echo "$as_me:3514: result: no" >&5
    3280 +  echo "$as_me:3659: result: no" >&5
     3425+  echo "$as_me:3660: result: no" >&5
    32813426 echo "${ECHO_T}no" >&6
    32823427 fi
    … …  
    32863431 set dummy etags; ac_word=$2
    32873432-echo "$as_me:3521: checking for $ac_word" >&5
    3288 +echo "$as_me:3666: checking for $ac_word" >&5
     3433+echo "$as_me:3667: checking for $ac_word" >&5
    32893434 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    32903435 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    32913436   echo $ECHO_N "(cached) $ECHO_C" >&6
    3292 @@ -3533,7 +3678,7 @@
     3437@@ -3533,7 +3679,7 @@
    32933438   test -z "$ac_dir" && ac_dir=.
    32943439   $as_executable_p "$ac_dir/$ac_word" || continue
    32953440 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    32963441-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
    3297 +echo "$as_me:3681: found $ac_dir/$ac_word" >&5
     3442+echo "$as_me:3682: found $ac_dir/$ac_word" >&5
    32983443 break
    32993444 done
    33003445 
    3301 @@ -3542,10 +3687,10 @@
     3446@@ -3542,10 +3688,10 @@
    33023447 fi
    33033448 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    33043449 if test -n "$MAKE_UPPER_TAGS"; then
    33053450-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
    3306 +  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
     3451+  echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5
    33073452 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    33083453 else
    33093454-  echo "$as_me:3548: result: no" >&5
    3310 +  echo "$as_me:3693: result: no" >&5
     3455+  echo "$as_me:3694: result: no" >&5
    33113456 echo "${ECHO_T}no" >&6
    33123457 fi
    33133458 
    3314 @@ -3565,7 +3710,7 @@
     3459@@ -3565,7 +3711,7 @@
    33153460        MAKE_LOWER_TAGS="#"
    33163461 fi
    33173462 
    33183463-echo "$as_me:3568: checking for makeflags variable" >&5
    3319 +echo "$as_me:3713: checking for makeflags variable" >&5
     3464+echo "$as_me:3714: checking for makeflags variable" >&5
    33203465 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    33213466 if test "${cf_cv_makeflags+set}" = set; then
    33223467   echo $ECHO_N "(cached) $ECHO_C" >&6
    3323 @@ -3599,13 +3744,13 @@
     3468@@ -3599,13 +3745,13 @@
    33243469        rm -f cf_makeflags.tmp
    33253470 
    33263471 fi
    33273472-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
    3328 +echo "$as_me:3747: result: $cf_cv_makeflags" >&5
     3473+echo "$as_me:3748: result: $cf_cv_makeflags" >&5
    33293474 echo "${ECHO_T}$cf_cv_makeflags" >&6
    33303475 
    … …  
    33333478 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    33343479-echo "$as_me:3608: checking for $ac_word" >&5
    3335 +echo "$as_me:3753: checking for $ac_word" >&5
     3480+echo "$as_me:3754: checking for $ac_word" >&5
    33363481 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    33373482 if test "${ac_cv_prog_RANLIB+set}" = set; then
    33383483   echo $ECHO_N "(cached) $ECHO_C" >&6
    3339 @@ -3620,7 +3765,7 @@
     3484@@ -3620,7 +3766,7 @@
    33403485   test -z "$ac_dir" && ac_dir=.
    33413486   $as_executable_p "$ac_dir/$ac_word" || continue
    33423487 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    33433488-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    3344 +echo "$as_me:3768: found $ac_dir/$ac_word" >&5
     3489+echo "$as_me:3769: found $ac_dir/$ac_word" >&5
    33453490 break
    33463491 done
    33473492 
    3348 @@ -3628,10 +3773,10 @@
     3493@@ -3628,10 +3774,10 @@
    33493494 fi
    33503495 RANLIB=$ac_cv_prog_RANLIB
    33513496 if test -n "$RANLIB"; then
    33523497-  echo "$as_me:3631: result: $RANLIB" >&5
    3353 +  echo "$as_me:3776: result: $RANLIB" >&5
     3498+  echo "$as_me:3777: result: $RANLIB" >&5
    33543499 echo "${ECHO_T}$RANLIB" >&6
    33553500 else
    33563501-  echo "$as_me:3634: result: no" >&5
    3357 +  echo "$as_me:3779: result: no" >&5
     3502+  echo "$as_me:3780: result: no" >&5
    33583503 echo "${ECHO_T}no" >&6
    33593504 fi
    33603505 
    3361 @@ -3640,7 +3785,7 @@
     3506@@ -3640,7 +3786,7 @@
    33623507   ac_ct_RANLIB=$RANLIB
    33633508   # Extract the first word of "ranlib", so it can be a program name with args.
    33643509 set dummy ranlib; ac_word=$2
    33653510-echo "$as_me:3643: checking for $ac_word" >&5
    3366 +echo "$as_me:3788: checking for $ac_word" >&5
     3511+echo "$as_me:3789: checking for $ac_word" >&5
    33673512 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    33683513 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    33693514   echo $ECHO_N "(cached) $ECHO_C" >&6
    3370 @@ -3655,7 +3800,7 @@
     3515@@ -3655,7 +3801,7 @@
    33713516   test -z "$ac_dir" && ac_dir=.
    33723517   $as_executable_p "$ac_dir/$ac_word" || continue
    33733518 ac_cv_prog_ac_ct_RANLIB="ranlib"
    33743519-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
    3375 +echo "$as_me:3803: found $ac_dir/$ac_word" >&5
     3520+echo "$as_me:3804: found $ac_dir/$ac_word" >&5
    33763521 break
    33773522 done
    33783523 
    3379 @@ -3664,10 +3809,10 @@
     3524@@ -3664,10 +3810,10 @@
    33803525 fi
    33813526 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    33823527 if test -n "$ac_ct_RANLIB"; then
    33833528-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
    3384 +  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
     3529+  echo "$as_me:3813: result: $ac_ct_RANLIB" >&5
    33853530 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    33863531 else
    33873532-  echo "$as_me:3670: result: no" >&5
    3388 +  echo "$as_me:3815: result: no" >&5
     3533+  echo "$as_me:3816: result: no" >&5
    33893534 echo "${ECHO_T}no" >&6
    33903535 fi
    33913536 
    3392 @@ -3679,7 +3824,7 @@
     3537@@ -3679,7 +3825,7 @@
    33933538 if test -n "$ac_tool_prefix"; then
    33943539   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    33953540 set dummy ${ac_tool_prefix}ld; ac_word=$2
    33963541-echo "$as_me:3682: checking for $ac_word" >&5
    3397 +echo "$as_me:3827: checking for $ac_word" >&5
     3542+echo "$as_me:3828: checking for $ac_word" >&5
    33983543 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    33993544 if test "${ac_cv_prog_LD+set}" = set; then
    34003545   echo $ECHO_N "(cached) $ECHO_C" >&6
    3401 @@ -3694,7 +3839,7 @@
     3546@@ -3694,7 +3840,7 @@
    34023547   test -z "$ac_dir" && ac_dir=.
    34033548   $as_executable_p "$ac_dir/$ac_word" || continue
    34043549 ac_cv_prog_LD="${ac_tool_prefix}ld"
    34053550-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
    3406 +echo "$as_me:3842: found $ac_dir/$ac_word" >&5
     3551+echo "$as_me:3843: found $ac_dir/$ac_word" >&5
    34073552 break
    34083553 done
    34093554 
    3410 @@ -3702,10 +3847,10 @@
     3555@@ -3702,10 +3848,10 @@
    34113556 fi
    34123557 LD=$ac_cv_prog_LD
    34133558 if test -n "$LD"; then
    34143559-  echo "$as_me:3705: result: $LD" >&5
    3415 +  echo "$as_me:3850: result: $LD" >&5
     3560+  echo "$as_me:3851: result: $LD" >&5
    34163561 echo "${ECHO_T}$LD" >&6
    34173562 else
    34183563-  echo "$as_me:3708: result: no" >&5
    3419 +  echo "$as_me:3853: result: no" >&5
     3564+  echo "$as_me:3854: result: no" >&5
    34203565 echo "${ECHO_T}no" >&6
    34213566 fi
    34223567 
    3423 @@ -3714,7 +3859,7 @@
     3568@@ -3714,7 +3860,7 @@
    34243569   ac_ct_LD=$LD
    34253570   # Extract the first word of "ld", so it can be a program name with args.
    34263571 set dummy ld; ac_word=$2
    34273572-echo "$as_me:3717: checking for $ac_word" >&5
    3428 +echo "$as_me:3862: checking for $ac_word" >&5
     3573+echo "$as_me:3863: checking for $ac_word" >&5
    34293574 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34303575 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    34313576   echo $ECHO_N "(cached) $ECHO_C" >&6
    3432 @@ -3729,7 +3874,7 @@
     3577@@ -3729,7 +3875,7 @@
    34333578   test -z "$ac_dir" && ac_dir=.
    34343579   $as_executable_p "$ac_dir/$ac_word" || continue
    34353580 ac_cv_prog_ac_ct_LD="ld"
    34363581-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
    3437 +echo "$as_me:3877: found $ac_dir/$ac_word" >&5
     3582+echo "$as_me:3878: found $ac_dir/$ac_word" >&5
    34383583 break
    34393584 done
    34403585 
    3441 @@ -3738,10 +3883,10 @@
     3586@@ -3738,10 +3884,10 @@
    34423587 fi
    34433588 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    34443589 if test -n "$ac_ct_LD"; then
    34453590-  echo "$as_me:3741: result: $ac_ct_LD" >&5
    3446 +  echo "$as_me:3886: result: $ac_ct_LD" >&5
     3591+  echo "$as_me:3887: result: $ac_ct_LD" >&5
    34473592 echo "${ECHO_T}$ac_ct_LD" >&6
    34483593 else
    34493594-  echo "$as_me:3744: result: no" >&5
    3450 +  echo "$as_me:3889: result: no" >&5
     3595+  echo "$as_me:3890: result: no" >&5
    34513596 echo "${ECHO_T}no" >&6
    34523597 fi
    34533598 
    3454 @@ -3753,7 +3898,7 @@
     3599@@ -3753,7 +3899,7 @@
    34553600 if test -n "$ac_tool_prefix"; then
    34563601   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    34573602 set dummy ${ac_tool_prefix}ar; ac_word=$2
    34583603-echo "$as_me:3756: checking for $ac_word" >&5
    3459 +echo "$as_me:3901: checking for $ac_word" >&5
     3604+echo "$as_me:3902: checking for $ac_word" >&5
    34603605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34613606 if test "${ac_cv_prog_AR+set}" = set; then
    34623607   echo $ECHO_N "(cached) $ECHO_C" >&6
    3463 @@ -3768,7 +3913,7 @@
     3608@@ -3768,7 +3914,7 @@
    34643609   test -z "$ac_dir" && ac_dir=.
    34653610   $as_executable_p "$ac_dir/$ac_word" || continue
    34663611 ac_cv_prog_AR="${ac_tool_prefix}ar"
    34673612-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
    3468 +echo "$as_me:3916: found $ac_dir/$ac_word" >&5
     3613+echo "$as_me:3917: found $ac_dir/$ac_word" >&5
    34693614 break
    34703615 done
    34713616 
    3472 @@ -3776,10 +3921,10 @@
     3617@@ -3776,10 +3922,10 @@
    34733618 fi
    34743619 AR=$ac_cv_prog_AR
    34753620 if test -n "$AR"; then
    34763621-  echo "$as_me:3779: result: $AR" >&5
    3477 +  echo "$as_me:3924: result: $AR" >&5
     3622+  echo "$as_me:3925: result: $AR" >&5
    34783623 echo "${ECHO_T}$AR" >&6
    34793624 else
    34803625-  echo "$as_me:3782: result: no" >&5
    3481 +  echo "$as_me:3927: result: no" >&5
     3626+  echo "$as_me:3928: result: no" >&5
    34823627 echo "${ECHO_T}no" >&6
    34833628 fi
    34843629 
    3485 @@ -3788,7 +3933,7 @@
     3630@@ -3788,7 +3934,7 @@
    34863631   ac_ct_AR=$AR
    34873632   # Extract the first word of "ar", so it can be a program name with args.
    34883633 set dummy ar; ac_word=$2
    34893634-echo "$as_me:3791: checking for $ac_word" >&5
    3490 +echo "$as_me:3936: checking for $ac_word" >&5
     3635+echo "$as_me:3937: checking for $ac_word" >&5
    34913636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34923637 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    34933638   echo $ECHO_N "(cached) $ECHO_C" >&6
    3494 @@ -3803,7 +3948,7 @@
     3639@@ -3803,7 +3949,7 @@
    34953640   test -z "$ac_dir" && ac_dir=.
    34963641   $as_executable_p "$ac_dir/$ac_word" || continue
    34973642 ac_cv_prog_ac_ct_AR="ar"
    34983643-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
    3499 +echo "$as_me:3951: found $ac_dir/$ac_word" >&5
     3644+echo "$as_me:3952: found $ac_dir/$ac_word" >&5
    35003645 break
    35013646 done
    35023647 
    3503 @@ -3812,10 +3957,10 @@
     3648@@ -3812,10 +3958,10 @@
    35043649 fi
    35053650 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    35063651 if test -n "$ac_ct_AR"; then
    35073652-  echo "$as_me:3815: result: $ac_ct_AR" >&5
    3508 +  echo "$as_me:3960: result: $ac_ct_AR" >&5
     3653+  echo "$as_me:3961: result: $ac_ct_AR" >&5
    35093654 echo "${ECHO_T}$ac_ct_AR" >&6
    35103655 else
    35113656-  echo "$as_me:3818: result: no" >&5
    3512 +  echo "$as_me:3963: result: no" >&5
     3657+  echo "$as_me:3964: result: no" >&5
    35133658 echo "${ECHO_T}no" >&6
    35143659 fi
    35153660 
    3516 @@ -3824,25 +3969,123 @@
     3661@@ -3824,25 +3970,123 @@
    35173662   AR="$ac_cv_prog_AR"
    35183663 fi
    … …  
    35223667+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    35233668+set dummy ${ac_tool_prefix}ar; ac_word=$2
    3524 +echo "$as_me:3975: checking for $ac_word" >&5
     3669+echo "$as_me:3976: checking for $ac_word" >&5
    35253670+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35263671+if test "${ac_cv_prog_AR+set}" = set; then
    … …  
    35373682+  $as_executable_p "$ac_dir/$ac_word" || continue
    35383683+ac_cv_prog_AR="${ac_tool_prefix}ar"
    3539 +echo "$as_me:3990: found $ac_dir/$ac_word" >&5
     3684+echo "$as_me:3991: found $ac_dir/$ac_word" >&5
    35403685+break
    35413686+done
    … …  
    35473692+AR=$ac_cv_prog_AR
    35483693+if test -n "$AR"; then
    3549 +  echo "$as_me:3998: result: $AR" >&5
     3694+  echo "$as_me:3999: result: $AR" >&5
    35503695+echo "${ECHO_T}$AR" >&6
    35513696+else
    3552 +  echo "$as_me:4001: result: no" >&5
     3697+  echo "$as_me:4002: result: no" >&5
    35533698+echo "${ECHO_T}no" >&6
    35543699+fi
    … …  
    35613706+  # Extract the first word of "ar", so it can be a program name with args.
    35623707+set dummy ar; ac_word=$2
    3563 +echo "$as_me:4010: checking for $ac_word" >&5
     3708+echo "$as_me:4011: checking for $ac_word" >&5
    35643709+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35653710+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    … …  
    35763721+  $as_executable_p "$ac_dir/$ac_word" || continue
    35773722+ac_cv_prog_ac_ct_AR="ar"
    3578 +echo "$as_me:4025: found $ac_dir/$ac_word" >&5
     3723+echo "$as_me:4026: found $ac_dir/$ac_word" >&5
    35793724+break
    35803725+done
    … …  
    35853730+ac_ct_AR=$ac_cv_prog_ac_ct_AR
    35863731+if test -n "$ac_ct_AR"; then
    3587 +  echo "$as_me:4034: result: $ac_ct_AR" >&5
     3732+  echo "$as_me:4035: result: $ac_ct_AR" >&5
    35883733+echo "${ECHO_T}$ac_ct_AR" >&6
    35893734+else
    3590 +  echo "$as_me:4037: result: no" >&5
     3735+  echo "$as_me:4038: result: no" >&5
    35913736+echo "${ECHO_T}no" >&6
    35923737+fi
    … …  
    35973742+fi
    35983743+
    3599 +echo "$as_me:4046: checking for options to update archives" >&5
     3744+echo "$as_me:4047: checking for options to update archives" >&5
    36003745+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
    36013746+if test "${cf_cv_ar_flags+set}" = set; then
    36023747+  echo $ECHO_N "(cached) $ECHO_C" >&6
    36033748+else
    3604 +
     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
    36053753+       cf_cv_ar_flags=unknown
    36063754+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
    … …  
    36103758+
    36113759+               cat >conftest.$ac_ext <<EOF
    3612 +#line 4059 "configure"
     3760+#line 4060 "configure"
    36133761+int    testdata[3] = { 123, 456, 789 };
    36143762+EOF
    3615 +               if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
     3763+               if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5
    36163764+  (eval $ac_compile) 2>&5
    36173765+  ac_status=$?
    3618 +  echo "$as_me:4065: \$? = $ac_status" >&5
     3766+  echo "$as_me:4066: \$? = $ac_status" >&5
    36193767+  (exit $ac_status); } ; then
    36203768+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
    … …  
    36253773+               else
    36263774+                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
    3627  
    3628 -cf_cv_subst_AR_OPTS=$AR_OPTS
    3629 -echo "$as_me:3840: result: $AR_OPTS" >&5
    3630 -echo "${ECHO_T}$AR_OPTS" >&6
    3631 +echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
     3775+
     3776+echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5
    36323777+
    36333778+                       break
    … …  
    36373782 
    36383783 fi
    3639 +echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
     3784+echo "$as_me:4084: result: $cf_cv_ar_flags" >&5
    36403785+echo "${ECHO_T}$cf_cv_ar_flags" >&6
     3786+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
     3787+ARFLAGS=$cf_cv_ar_flags
    36413788 
    36423789-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
    3643 +ARFLAGS=$cf_cv_ar_flags
    3644 +
    3645 +echo "$as_me:4088: checking if you have specified an install-prefix" >&5
     3790+echo "$as_me:4089: checking if you have specified an install-prefix" >&5
    36463791 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    36473792 
    36483793 # Check whether --with-install-prefix or --without-install-prefix was given.
    3649 @@ -3855,7 +4098,7 @@
     3794@@ -3855,7 +4099,7 @@
    36503795                ;;
    36513796        esac
    36523797 fi;
    36533798-echo "$as_me:3858: result: $DESTDIR" >&5
    3654 +echo "$as_me:4101: result: $DESTDIR" >&5
     3799+echo "$as_me:4102: result: $DESTDIR" >&5
    36553800 echo "${ECHO_T}$DESTDIR" >&6
    36563801 
    36573802 ###############################################################################
    3658 @@ -3883,7 +4126,7 @@
     3803@@ -3883,7 +4127,7 @@
    36593804 do
    36603805   # Extract the first word of "$ac_prog", so it can be a program name with args.
    36613806 set dummy $ac_prog; ac_word=$2
    36623807-echo "$as_me:3886: checking for $ac_word" >&5
    3663 +echo "$as_me:4129: checking for $ac_word" >&5
     3808+echo "$as_me:4130: checking for $ac_word" >&5
    36643809 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36653810 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    36663811   echo $ECHO_N "(cached) $ECHO_C" >&6
    3667 @@ -3898,7 +4141,7 @@
     3812@@ -3898,7 +4142,7 @@
    36683813   test -z "$ac_dir" && ac_dir=.
    36693814   $as_executable_p "$ac_dir/$ac_word" || continue
    36703815 ac_cv_prog_BUILD_CC="$ac_prog"
    36713816-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    3672 +echo "$as_me:4144: found $ac_dir/$ac_word" >&5
     3817+echo "$as_me:4145: found $ac_dir/$ac_word" >&5
    36733818 break
    36743819 done
    36753820 
    3676 @@ -3906,10 +4149,10 @@
     3821@@ -3906,10 +4150,10 @@
    36773822 fi
    36783823 BUILD_CC=$ac_cv_prog_BUILD_CC
    36793824 if test -n "$BUILD_CC"; then
    36803825-  echo "$as_me:3909: result: $BUILD_CC" >&5
    3681 +  echo "$as_me:4152: result: $BUILD_CC" >&5
     3826+  echo "$as_me:4153: result: $BUILD_CC" >&5
    36823827 echo "${ECHO_T}$BUILD_CC" >&6
    36833828 else
    36843829-  echo "$as_me:3912: result: no" >&5
    3685 +  echo "$as_me:4155: result: no" >&5
     3830+  echo "$as_me:4156: result: no" >&5
    36863831 echo "${ECHO_T}no" >&6
    36873832 fi
    36883833 
    3689 @@ -3917,12 +4160,12 @@
     3834@@ -3917,12 +4161,12 @@
    36903835 done
    36913836 
    36923837 fi;
    36933838-       echo "$as_me:3920: checking for native build C compiler" >&5
    3694 +       echo "$as_me:4163: checking for native build C compiler" >&5
     3839+       echo "$as_me:4164: checking for native build C compiler" >&5
    36953840 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    36963841-       echo "$as_me:3922: result: $BUILD_CC" >&5
    3697 +       echo "$as_me:4165: result: $BUILD_CC" >&5
     3842+       echo "$as_me:4166: result: $BUILD_CC" >&5
    36983843 echo "${ECHO_T}$BUILD_CC" >&6
    36993844 
    37003845-       echo "$as_me:3925: checking for native build C preprocessor" >&5
    3701 +       echo "$as_me:4168: checking for native build C preprocessor" >&5
     3846+       echo "$as_me:4169: checking for native build C preprocessor" >&5
    37023847 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    37033848 
    37043849 # Check whether --with-build-cpp or --without-build-cpp was given.
    3705 @@ -3932,10 +4175,10 @@
     3850@@ -3932,10 +4176,10 @@
    37063851 else
    37073852   BUILD_CPP='${BUILD_CC} -E'
    37083853 fi;
    37093854-       echo "$as_me:3935: result: $BUILD_CPP" >&5
    3710 +       echo "$as_me:4178: result: $BUILD_CPP" >&5
     3855+       echo "$as_me:4179: result: $BUILD_CPP" >&5
    37113856 echo "${ECHO_T}$BUILD_CPP" >&6
    37123857 
    37133858-       echo "$as_me:3938: checking for native build C flags" >&5
    3714 +       echo "$as_me:4181: checking for native build C flags" >&5
     3859+       echo "$as_me:4182: checking for native build C flags" >&5
    37153860 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    37163861 
    37173862 # Check whether --with-build-cflags or --without-build-cflags was given.
    3718 @@ -3943,10 +4186,10 @@
     3863@@ -3943,10 +4187,10 @@
    37193864   withval="$with_build_cflags"
    37203865   BUILD_CFLAGS="$withval"
    37213866 fi;
    37223867-       echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
    3723 +       echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
     3868+       echo "$as_me:4190: result: $BUILD_CFLAGS" >&5
    37243869 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    37253870 
    37263871-       echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
    3727 +       echo "$as_me:4192: checking for native build C preprocessor-flags" >&5
     3872+       echo "$as_me:4193: checking for native build C preprocessor-flags" >&5
    37283873 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    37293874 
    37303875 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    3731 @@ -3954,10 +4197,10 @@
     3876@@ -3954,10 +4198,10 @@
    37323877   withval="$with_build_cppflags"
    37333878   BUILD_CPPFLAGS="$withval"
    37343879 fi;
    37353880-       echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
    3736 +       echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
     3881+       echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5
    37373882 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    37383883 
    37393884-       echo "$as_me:3960: checking for native build linker-flags" >&5
    3740 +       echo "$as_me:4203: checking for native build linker-flags" >&5
     3885+       echo "$as_me:4204: checking for native build linker-flags" >&5
    37413886 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    37423887 
    37433888 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    3744 @@ -3965,10 +4208,10 @@
     3889@@ -3965,10 +4209,10 @@
    37453890   withval="$with_build_ldflags"
    37463891   BUILD_LDFLAGS="$withval"
    37473892 fi;
    37483893-       echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
    3749 +       echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
     3894+       echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5
    37503895 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    37513896 
    37523897-       echo "$as_me:3971: checking for native build linker-libraries" >&5
    3753 +       echo "$as_me:4214: checking for native build linker-libraries" >&5
     3898+       echo "$as_me:4215: checking for native build linker-libraries" >&5
    37543899 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    37553900 
    37563901 # Check whether --with-build-libs or --without-build-libs was given.
    3757 @@ -3976,7 +4219,7 @@
     3902@@ -3976,7 +4220,7 @@
    37583903   withval="$with_build_libs"
    37593904   BUILD_LIBS="$withval"
    37603905 fi;
    37613906-       echo "$as_me:3979: result: $BUILD_LIBS" >&5
    3762 +       echo "$as_me:4222: result: $BUILD_LIBS" >&5
     3907+       echo "$as_me:4223: result: $BUILD_LIBS" >&5
    37633908 echo "${ECHO_T}$BUILD_LIBS" >&6
    37643909 
    37653910        # this assumes we're on Unix.
    3766 @@ -3986,7 +4229,7 @@
     3911@@ -3986,7 +4230,7 @@
    37673912        : ${BUILD_CC:='${CC}'}
    37683913 
    37693914        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    37703915-               { { echo "$as_me:3989: error: Cross-build requires two compilers.
    3771 +               { { echo "$as_me:4232: error: Cross-build requires two compilers.
     3916+               { { echo "$as_me:4233: error: Cross-build requires two compilers.
    37723917 Use --with-build-cc to specify the native compiler." >&5
    37733918 echo "$as_me: error: Cross-build requires two compilers.
    37743919 Use --with-build-cc to specify the native compiler." >&2;}
    3775 @@ -4027,7 +4270,7 @@
     3920@@ -4027,7 +4271,7 @@
    37763921 LIB_INSTALL=
    37773922 LIB_UNINSTALL=
    37783923 
    37793924-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
    3780 +echo "$as_me:4273: 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
    37813926 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
    37823927 
    37833928 # Check whether --with-libtool or --without-libtool was given.
    3784 @@ -4037,11 +4280,11 @@
     3929@@ -4037,11 +4281,11 @@
    37853930 else
    37863931   with_libtool=no
    37873932 fi;
    37883933-echo "$as_me:4040: result: $with_libtool" >&5
    3789 +echo "$as_me:4283: result: $with_libtool" >&5
     3934+echo "$as_me:4284: result: $with_libtool" >&5
    37903935 echo "${ECHO_T}$with_libtool" >&6
    37913936 if test "$with_libtool" != "no"; then
    … …  
    37963941 if test "x$prefix" != xNONE; then
    37973942   cf_path_syntax="$prefix"
    3798 @@ -4068,7 +4311,7 @@
     3943@@ -4068,7 +4312,7 @@
    37993944   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    38003945   ;;
    38013946 *)
    38023947-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
    3803 +  { { echo "$as_me:4314: error: expected a pathname, not \"$with_libtool\"" >&5
     3948+  { { echo "$as_me:4315: error: expected a pathname, not \"$with_libtool\"" >&5
    38043949 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    38053950    { (exit 1); exit 1; }; }
    38063951   ;;
    3807 @@ -4076,9 +4319,9 @@
     3952@@ -4076,9 +4320,9 @@
    38083953 
    38093954                LIBTOOL=$with_libtool
    … …  
    38133958 set dummy libtool; ac_word=$2
    38143959-echo "$as_me:4081: checking for $ac_word" >&5
    3815 +echo "$as_me:4324: checking for $ac_word" >&5
     3960+echo "$as_me:4325: checking for $ac_word" >&5
    38163961 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    38173962 if test "${ac_cv_path_LIBTOOL+set}" = set; then
    38183963   echo $ECHO_N "(cached) $ECHO_C" >&6
    3819 @@ -4095,7 +4338,7 @@
     3964@@ -4095,7 +4339,7 @@
    38203965   test -z "$ac_dir" && ac_dir=.
    38213966   if $as_executable_p "$ac_dir/$ac_word"; then
    38223967    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
    38233968-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
    3824 +   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
     3969+   echo "$as_me:4342: found $ac_dir/$ac_word" >&5
    38253970    break
    38263971 fi
    38273972 done
    3828 @@ -4106,19 +4349,19 @@
     3973@@ -4106,19 +4350,19 @@
    38293974 LIBTOOL=$ac_cv_path_LIBTOOL
    38303975 
    38313976 if test -n "$LIBTOOL"; then
    38323977-  echo "$as_me:4109: result: $LIBTOOL" >&5
    3833 +  echo "$as_me:4352: result: $LIBTOOL" >&5
     3978+  echo "$as_me:4353: result: $LIBTOOL" >&5
    38343979 echo "${ECHO_T}$LIBTOOL" >&6
    38353980 else
    38363981-  echo "$as_me:4112: result: no" >&5
    3837 +  echo "$as_me:4355: result: no" >&5
     3982+  echo "$as_me:4356: result: no" >&5
    38383983 echo "${ECHO_T}no" >&6
    38393984 fi
    … …  
    38443989+       fi
    38453990+       if test -z "$LIBTOOL" ; then
    3846 +               { { echo "$as_me:4361: error: Cannot find libtool" >&5
     3991+               { { echo "$as_me:4362: error: Cannot find libtool" >&5
    38473992 echo "$as_me: error: Cannot find libtool" >&2;}
    38483993    { (exit 1); exit 1; }; }
    … …  
    38523997        LIB_OBJECT='${OBJECTS:.o=.lo}'
    38533998        LIB_SUFFIX=.la
    3854 @@ -4130,17 +4373,17 @@
     3999@@ -4130,17 +4374,17 @@
    38554000        LIB_PREP=:
    38564001 
    38574002        # Show the version of libtool
    38584003-       echo "$as_me:4133: checking version of libtool" >&5
    3859 +       echo "$as_me:4376: checking version of libtool" >&5
     4004+       echo "$as_me:4377: checking version of libtool" >&5
    38604005 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
    38614006 
    … …  
    38654010        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.].*//'`
    38664011-       echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
    3867 +       echo "$as_me:4383: result: $cf_cv_libtool_version" >&5
     4012+       echo "$as_me:4384: result: $cf_cv_libtool_version" >&5
    38684013 echo "${ECHO_T}$cf_cv_libtool_version" >&6
    38694014        if test -z "$cf_cv_libtool_version" ; then
    38704015-               { { echo "$as_me:4143: error: This is not GNU libtool" >&5
    3871 +               { { echo "$as_me:4386: error: This is not GNU libtool" >&5
     4016+               { { echo "$as_me:4387: error: This is not GNU libtool" >&5
    38724017 echo "$as_me: error: This is not GNU libtool" >&2;}
    38734018    { (exit 1); exit 1; }; }
    38744019        fi
    3875 @@ -4168,7 +4411,7 @@
     4020@@ -4168,7 +4412,7 @@
    38764021 
    38774022 else
    38784023 
    38794024-echo "$as_me:4171: checking if you want to build shared libraries" >&5
    3880 +echo "$as_me:4414: checking if you want to build shared libraries" >&5
     4025+echo "$as_me:4415: checking if you want to build shared libraries" >&5
    38814026 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
    38824027 
    38834028 # Check whether --with-shared or --without-shared was given.
    3884 @@ -4178,11 +4421,11 @@
     4029@@ -4178,11 +4422,11 @@
    38854030 else
    38864031   with_shared=no
    38874032 fi;
    38884033-echo "$as_me:4181: result: $with_shared" >&5
    3889 +echo "$as_me:4424: result: $with_shared" >&5
     4034+echo "$as_me:4425: result: $with_shared" >&5
    38904035 echo "${ECHO_T}$with_shared" >&6
    38914036 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    38924037 
    38934038-echo "$as_me:4185: checking if you want to build static libraries" >&5
    3894 +echo "$as_me:4428: checking if you want to build static libraries" >&5
     4039+echo "$as_me:4429: checking if you want to build static libraries" >&5
    38954040 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
    38964041 
    38974042 # Check whether --with-normal or --without-normal was given.
    3898 @@ -4192,11 +4435,11 @@
     4043@@ -4192,11 +4436,11 @@
    38994044 else
    39004045   with_normal=yes
    39014046 fi;
    39024047-echo "$as_me:4195: result: $with_normal" >&5
    3903 +echo "$as_me:4438: result: $with_normal" >&5
     4048+echo "$as_me:4439: result: $with_normal" >&5
    39044049 echo "${ECHO_T}$with_normal" >&6
    39054050 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
    39064051 
    39074052-echo "$as_me:4199: checking if you want to build debug libraries" >&5
    3908 +echo "$as_me:4442: checking if you want to build debug libraries" >&5
     4053+echo "$as_me:4443: checking if you want to build debug libraries" >&5
    39094054 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
    39104055 
    39114056 # Check whether --with-debug or --without-debug was given.
    3912 @@ -4206,11 +4449,11 @@
     4057@@ -4206,11 +4450,11 @@
    39134058 else
    39144059   with_debug=yes
    39154060 fi;
    39164061-echo "$as_me:4209: result: $with_debug" >&5
    3917 +echo "$as_me:4452: result: $with_debug" >&5
     4062+echo "$as_me:4453: result: $with_debug" >&5
    39184063 echo "${ECHO_T}$with_debug" >&6
    39194064 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
    39204065 
    39214066-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
    3922 +echo "$as_me:4456: checking if you want to build profiling libraries" >&5
     4067+echo "$as_me:4457: checking if you want to build profiling libraries" >&5
    39234068 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
    39244069 
    39254070 # Check whether --with-profile or --without-profile was given.
    3926 @@ -4220,7 +4463,7 @@
     4071@@ -4220,7 +4464,7 @@
    39274072 else
    39284073   with_profile=no
    39294074 fi;
    39304075-echo "$as_me:4223: result: $with_profile" >&5
    3931 +echo "$as_me:4466: result: $with_profile" >&5
     4076+echo "$as_me:4467: result: $with_profile" >&5
    39324077 echo "${ECHO_T}$with_profile" >&6
    39334078 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
    39344079 
    3935 @@ -4228,19 +4471,19 @@
     4080@@ -4228,19 +4472,19 @@
    39364081 
    39374082 ###############################################################################
    39384083 
    39394084-echo "$as_me:4231: checking for specified models" >&5
    3940 +echo "$as_me:4474: checking for specified models" >&5
     4085+echo "$as_me:4475: checking for specified models" >&5
    39414086 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    39424087 test -z "$cf_list_models" && cf_list_models=normal
    39434088 test "$with_libtool" != "no" && cf_list_models=libtool
    39444089-echo "$as_me:4235: result: $cf_list_models" >&5
    3945 +echo "$as_me:4478: result: $cf_list_models" >&5
     4090+echo "$as_me:4479: result: $cf_list_models" >&5
    39464091 echo "${ECHO_T}$cf_list_models" >&6
    39474092 
    … …  
    39494094 ### up test-applications.
    39504095-echo "$as_me:4240: checking for default model" >&5
    3951 +echo "$as_me:4483: checking for default model" >&5
     4096+echo "$as_me:4484: checking for default model" >&5
    39524097 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    39534098 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    39544099-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
    3955 +echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
     4100+echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5
    39564101 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    39574102 
    39584103 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    3959 @@ -4269,7 +4512,7 @@
     4104@@ -4269,7 +4513,7 @@
    39604105 
    39614106 ###############################################################################
    39624107 
    39634108-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
    3964 +echo "$as_me:4515: 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
    39654110 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
    39664111 
    39674112 # Check whether --with-termlib or --without-termlib was given.
    3968 @@ -4279,10 +4522,10 @@
     4113@@ -4279,10 +4523,10 @@
    39694114 else
    39704115   with_termlib=no
    39714116 fi;
    39724117-echo "$as_me:4282: result: $with_termlib" >&5
    3973 +echo "$as_me:4525: result: $with_termlib" >&5
     4118+echo "$as_me:4526: result: $with_termlib" >&5
    39744119 echo "${ECHO_T}$with_termlib" >&6
    39754120 
    39764121-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
    3977 +echo "$as_me:4528: 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
    39784123 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
    39794124 
    39804125 # Check whether --with-ticlib or --without-ticlib was given.
    3981 @@ -4292,13 +4535,13 @@
     4126@@ -4292,13 +4536,13 @@
    39824127 else
    39834128   with_ticlib=no
    39844129 fi;
    39854130-echo "$as_me:4295: result: $with_ticlib" >&5
    3986 +echo "$as_me:4538: result: $with_ticlib" >&5
     4131+echo "$as_me:4539: result: $with_ticlib" >&5
    39874132 echo "${ECHO_T}$with_ticlib" >&6
    39884133 
    … …  
    39914136 
    39924137-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
    3993 +echo "$as_me:4544: 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
    39944139 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
    39954140 
    39964141 # Check whether --with-gpm or --without-gpm was given.
    3997 @@ -4308,27 +4551,27 @@
     4142@@ -4308,27 +4552,27 @@
    39984143 else
    39994144   with_gpm=maybe
    40004145 fi;
    40014146-echo "$as_me:4311: result: $with_gpm" >&5
    4002 +echo "$as_me:4554: result: $with_gpm" >&5
     4147+echo "$as_me:4555: result: $with_gpm" >&5
    40034148 echo "${ECHO_T}$with_gpm" >&6
    40044149 
    40054150 if test "$with_gpm" != no ; then
    40064151-       echo "$as_me:4315: checking for gpm.h" >&5
    4007 +       echo "$as_me:4558: checking for gpm.h" >&5
     4152+       echo "$as_me:4559: checking for gpm.h" >&5
    40084153 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
    40094154 if test "${ac_cv_header_gpm_h+set}" = set; then
    … …  
    40124157   cat >conftest.$ac_ext <<_ACEOF
    40134158-#line 4321 "configure"
    4014 +#line 4564 "configure"
     4159+#line 4565 "configure"
    40154160 #include "confdefs.h"
    40164161 #include <gpm.h>
    40174162 _ACEOF
    40184163-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
    4019 +if { (eval echo "$as_me:4568: \"$ac_cpp conftest.$ac_ext\"") >&5
     4164+if { (eval echo "$as_me:4569: \"$ac_cpp conftest.$ac_ext\"") >&5
    40204165   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    40214166   ac_status=$?
    … …  
    40244169   cat conftest.err >&5
    40254170-  echo "$as_me:4331: \$? = $ac_status" >&5
    4026 +  echo "$as_me:4574: \$? = $ac_status" >&5
     4171+  echo "$as_me:4575: \$? = $ac_status" >&5
    40274172   (exit $ac_status); } >/dev/null; then
    40284173   if test -s conftest.err; then
    40294174     ac_cpp_err=$ac_c_preproc_warn_flag
    4030 @@ -4347,7 +4590,7 @@
     4175@@ -4347,7 +4591,7 @@
    40314176 fi
    40324177 rm -f conftest.err conftest.$ac_ext
    40334178 fi
    40344179-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
    4035 +echo "$as_me:4593: result: $ac_cv_header_gpm_h" >&5
     4180+echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5
    40364181 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
    40374182 if test $ac_cv_header_gpm_h = yes; then
    40384183 
    4039 @@ -4358,14 +4601,14 @@
     4184@@ -4358,14 +4602,14 @@
    40404185                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
    40414186                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
    40424187 
    40434188-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
    4044 +echo "${as_me-configure}:4604: testing assuming we really have GPM library ..." 1>&5
     4189+echo "${as_me-configure}:4605: testing assuming we really have GPM library ..." 1>&5
    40454190 
    40464191                        cat >>confdefs.h <<\EOF
    … …  
    40504195                else
    40514196-                       echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
    4052 +                       echo "$as_me:4611: checking for Gpm_Open in -lgpm" >&5
     4197+                       echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5
    40534198 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    40544199 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    40554200   echo $ECHO_N "(cached) $ECHO_C" >&6
    4056 @@ -4373,7 +4616,7 @@
     4201@@ -4373,7 +4617,7 @@
    40574202   ac_check_lib_save_LIBS=$LIBS
    40584203 LIBS="-lgpm  $LIBS"
    40594204 cat >conftest.$ac_ext <<_ACEOF
    40604205-#line 4376 "configure"
    4061 +#line 4619 "configure"
     4206+#line 4620 "configure"
    40624207 #include "confdefs.h"
    40634208 
    40644209 /* Override any gcc2 internal prototype to avoid an error.  */
    4065 @@ -4392,16 +4635,16 @@
     4210@@ -4392,16 +4636,16 @@
    40664211 }
    40674212 _ACEOF
    40684213 rm -f conftest.$ac_objext conftest$ac_exeext
    40694214-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
    4070 +if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
     4215+if { (eval echo "$as_me:4639: \"$ac_link\"") >&5
    40714216   (eval $ac_link) 2>&5
    40724217   ac_status=$?
    40734218-  echo "$as_me:4398: \$? = $ac_status" >&5
    4074 +  echo "$as_me:4641: \$? = $ac_status" >&5
     4219+  echo "$as_me:4642: \$? = $ac_status" >&5
    40754220   (exit $ac_status); } &&
    40764221          { ac_try='test -s conftest$ac_exeext'
    40774222-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
    4078 +  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
     4223+  { (eval echo "$as_me:4645: \"$ac_try\"") >&5
    40794224   (eval $ac_try) 2>&5
    40804225   ac_status=$?
    40814226-  echo "$as_me:4404: \$? = $ac_status" >&5
    4082 +  echo "$as_me:4647: \$? = $ac_status" >&5
     4227+  echo "$as_me:4648: \$? = $ac_status" >&5
    40834228   (exit $ac_status); }; }; then
    40844229   ac_cv_lib_gpm_Gpm_Open=yes
    40854230 else
    4086 @@ -4412,13 +4655,13 @@
     4231@@ -4412,13 +4656,13 @@
    40874232 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    40884233 LIBS=$ac_check_lib_save_LIBS
    40894234 fi
    40904235-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    4091 +echo "$as_me:4658: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     4236+echo "$as_me:4659: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    40924237 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    40934238 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    … …  
    40964241 
    40974242-                               { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
    4098 +                               { { echo "$as_me:4664: error: Cannot link with GPM library" >&5
     4243+                               { { echo "$as_me:4665: error: Cannot link with GPM library" >&5
    40994244 echo "$as_me: error: Cannot link with GPM library" >&2;}
    41004245    { (exit 1); exit 1; }; }
    41014246                fi
    4102 @@ -4428,7 +4671,7 @@
     4247@@ -4428,7 +4672,7 @@
    41034248 
    41044249 else
    41054250 
    41064251-               test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
    4107 +               test "$with_gpm" != maybe && { echo "$as_me:4674: WARNING: Cannot find GPM header" >&5
     4252+               test "$with_gpm" != maybe && { echo "$as_me:4675: WARNING: Cannot find GPM header" >&5
    41084253 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
    41094254                with_gpm=no
    41104255 
    4111 @@ -4437,7 +4680,7 @@
     4256@@ -4437,7 +4681,7 @@
    41124257 fi
    41134258 
    41144259 if test "$with_gpm" != no ; then
    41154260-       echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
    4116 +       echo "$as_me:4683: checking if you want to load GPM dynamically" >&5
     4261+       echo "$as_me:4684: checking if you want to load GPM dynamically" >&5
    41174262 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
    41184263 
    41194264 # Check whether --with-dlsym or --without-dlsym was given.
    4120 @@ -4447,18 +4690,18 @@
     4265@@ -4447,18 +4691,18 @@
    41214266 else
    41224267   with_dlsym=yes
    41234268 fi;
    41244269-       echo "$as_me:4450: result: $with_dlsym" >&5
    4125 +       echo "$as_me:4693: result: $with_dlsym" >&5
     4270+       echo "$as_me:4694: result: $with_dlsym" >&5
    41264271 echo "${ECHO_T}$with_dlsym" >&6
    41274272        if test "$with_dlsym" = yes ; then
    … …  
    41294274 cf_have_dlsym=no
    41304275-echo "$as_me:4455: checking for dlsym" >&5
    4131 +echo "$as_me:4698: checking for dlsym" >&5
     4276+echo "$as_me:4699: checking for dlsym" >&5
    41324277 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
    41334278 if test "${ac_cv_func_dlsym+set}" = set; then
    … …  
    41364281   cat >conftest.$ac_ext <<_ACEOF
    41374282-#line 4461 "configure"
    4138 +#line 4704 "configure"
     4283+#line 4705 "configure"
    41394284 #include "confdefs.h"
    41404285 /* System header to define __stub macros and hopefully few prototypes,
    41414286     which can conflict with char dlsym (); below.  */
    4142 @@ -4489,16 +4732,16 @@
     4287@@ -4489,16 +4733,16 @@
    41434288 }
    41444289 _ACEOF
    41454290 rm -f conftest.$ac_objext conftest$ac_exeext
    41464291-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
    4147 +if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
     4292+if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
    41484293   (eval $ac_link) 2>&5
    41494294   ac_status=$?
    41504295-  echo "$as_me:4495: \$? = $ac_status" >&5
    4151 +  echo "$as_me:4738: \$? = $ac_status" >&5
     4296+  echo "$as_me:4739: \$? = $ac_status" >&5
    41524297   (exit $ac_status); } &&
    41534298          { ac_try='test -s conftest$ac_exeext'
    41544299-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
    4155 +  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
     4300+  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
    41564301   (eval $ac_try) 2>&5
    41574302   ac_status=$?
    41584303-  echo "$as_me:4501: \$? = $ac_status" >&5
    4159 +  echo "$as_me:4744: \$? = $ac_status" >&5
     4304+  echo "$as_me:4745: \$? = $ac_status" >&5
    41604305   (exit $ac_status); }; }; then
    41614306   ac_cv_func_dlsym=yes
    41624307 else
    4163 @@ -4508,14 +4751,14 @@
     4308@@ -4508,14 +4752,14 @@
    41644309 fi
    41654310 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    41664311 fi
    41674312-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
    4168 +echo "$as_me:4754: result: $ac_cv_func_dlsym" >&5
     4313+echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5
    41694314 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
    41704315 if test $ac_cv_func_dlsym = yes; then
    … …  
    41744319 cf_have_libdl=no
    41754320-echo "$as_me:4518: checking for dlsym in -ldl" >&5
    4176 +echo "$as_me:4761: checking for dlsym in -ldl" >&5
     4321+echo "$as_me:4762: checking for dlsym in -ldl" >&5
    41774322 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
    41784323 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    41794324   echo $ECHO_N "(cached) $ECHO_C" >&6
    4180 @@ -4523,7 +4766,7 @@
     4325@@ -4523,7 +4767,7 @@
    41814326   ac_check_lib_save_LIBS=$LIBS
    41824327 LIBS="-ldl  $LIBS"
    41834328 cat >conftest.$ac_ext <<_ACEOF
    41844329-#line 4526 "configure"
    4185 +#line 4769 "configure"
     4330+#line 4770 "configure"
    41864331 #include "confdefs.h"
    41874332 
    41884333 /* Override any gcc2 internal prototype to avoid an error.  */
    4189 @@ -4542,16 +4785,16 @@
     4334@@ -4542,16 +4786,16 @@
    41904335 }
    41914336 _ACEOF
    41924337 rm -f conftest.$ac_objext conftest$ac_exeext
    41934338-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
    4194 +if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
     4339+if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
    41954340   (eval $ac_link) 2>&5
    41964341   ac_status=$?
    41974342-  echo "$as_me:4548: \$? = $ac_status" >&5
    4198 +  echo "$as_me:4791: \$? = $ac_status" >&5
     4343+  echo "$as_me:4792: \$? = $ac_status" >&5
    41994344   (exit $ac_status); } &&
    42004345          { ac_try='test -s conftest$ac_exeext'
    42014346-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
    4202 +  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
     4347+  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
    42034348   (eval $ac_try) 2>&5
    42044349   ac_status=$?
    42054350-  echo "$as_me:4554: \$? = $ac_status" >&5
    4206 +  echo "$as_me:4797: \$? = $ac_status" >&5
     4351+  echo "$as_me:4798: \$? = $ac_status" >&5
    42074352   (exit $ac_status); }; }; then
    42084353   ac_cv_lib_dl_dlsym=yes
    42094354 else
    4210 @@ -4562,7 +4805,7 @@
     4355@@ -4562,7 +4806,7 @@
    42114356 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    42124357 LIBS=$ac_check_lib_save_LIBS
    42134358 fi
    42144359-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
    4215 +echo "$as_me:4808: result: $ac_cv_lib_dl_dlsym" >&5
     4360+echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5
    42164361 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
    42174362 if test $ac_cv_lib_dl_dlsym = yes; then
    42184363 
    4219 @@ -4575,10 +4818,10 @@
     4364@@ -4575,10 +4819,10 @@
    42204365 if test "$cf_have_dlsym" = yes ; then
    42214366        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
    42224367 
    42234368-       echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
    4224 +       echo "$as_me:4821: checking whether able to link to dl*() functions" >&5
     4369+       echo "$as_me:4822: checking whether able to link to dl*() functions" >&5
    42254370 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
    42264371        cat >conftest.$ac_ext <<_ACEOF
    42274372-#line 4581 "configure"
    4228 +#line 4824 "configure"
     4373+#line 4825 "configure"
    42294374 #include "confdefs.h"
    42304375 #include <dlfcn.h>
    42314376 int
    4232 @@ -4596,16 +4839,16 @@
     4377@@ -4596,16 +4840,16 @@
    42334378 }
    42344379 _ACEOF
    42354380 rm -f conftest.$ac_objext conftest$ac_exeext
    42364381-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
    4237 +if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
     4382+if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
    42384383   (eval $ac_link) 2>&5
    42394384   ac_status=$?
    42404385-  echo "$as_me:4602: \$? = $ac_status" >&5
    4241 +  echo "$as_me:4845: \$? = $ac_status" >&5
     4386+  echo "$as_me:4846: \$? = $ac_status" >&5
    42424387   (exit $ac_status); } &&
    42434388          { ac_try='test -s conftest$ac_exeext'
    42444389-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
    4245 +  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
     4390+  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
    42464391   (eval $ac_try) 2>&5
    42474392   ac_status=$?
    42484393-  echo "$as_me:4608: \$? = $ac_status" >&5
    4249 +  echo "$as_me:4851: \$? = $ac_status" >&5
     4394+  echo "$as_me:4852: \$? = $ac_status" >&5
    42504395   (exit $ac_status); }; }; then
    42514396 
    42524397                cat >>confdefs.h <<\EOF
    4253 @@ -4616,15 +4859,15 @@
     4398@@ -4616,15 +4860,15 @@
    42544399   echo "$as_me: failed program was:" >&5
    42554400 cat conftest.$ac_ext >&5
    42564401 
    42574402-               { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
    4258 +               { { echo "$as_me:4862: error: Cannot link test program for libdl" >&5
     4403+               { { echo "$as_me:4863: error: Cannot link test program for libdl" >&5
    42594404 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    42604405    { (exit 1); exit 1; }; }
    … …  
    42624407 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    42634408-       echo "$as_me:4624: result: ok" >&5
    4264 +       echo "$as_me:4867: result: ok" >&5
     4409+       echo "$as_me:4868: result: ok" >&5
    42654410 echo "${ECHO_T}ok" >&6
    42664411 else
    42674412-       { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
    4268 +       { { echo "$as_me:4870: error: Cannot find dlsym function" >&5
     4413+       { { echo "$as_me:4871: error: Cannot find dlsym function" >&5
    42694414 echo "$as_me: error: Cannot find dlsym function" >&2;}
    42704415    { (exit 1); exit 1; }; }
    42714416 fi
    4272 @@ -4632,12 +4875,12 @@
     4417@@ -4632,12 +4876,12 @@
    42734418                if test "$with_gpm" != yes ; then
    42744419                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
    42754420 
    42764421-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
    4277 +echo "${as_me-configure}:4878: 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
    42784423 
    42794424                        cf_cv_gpm_soname="$with_gpm"
    … …  
    42814426 
    42824427-echo "$as_me:4640: checking for soname of gpm library" >&5
    4283 +echo "$as_me:4883: checking for soname of gpm library" >&5
     4428+echo "$as_me:4884: checking for soname of gpm library" >&5
    42844429 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
    42854430 if test "${cf_cv_gpm_soname+set}" = set; then
    42864431   echo $ECHO_N "(cached) $ECHO_C" >&6
    4287 @@ -4655,15 +4898,15 @@
     4432@@ -4655,15 +4899,15 @@
    42884433 CF_EOF
    42894434 cf_save_LIBS="$LIBS"
    42904435        LIBS="-lgpm $LIBS"
    42914436-       if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
    4292 +       if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
     4437+       if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5
    42934438   (eval $ac_compile) 2>&5
    42944439   ac_status=$?
    42954440-  echo "$as_me:4661: \$? = $ac_status" >&5
    4296 +  echo "$as_me:4904: \$? = $ac_status" >&5
     4441+  echo "$as_me:4905: \$? = $ac_status" >&5
    42974442   (exit $ac_status); } ; then
    42984443-               if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
    4299 +               if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
     4444+               if { (eval echo "$as_me:4907: \"$ac_link\"") >&5
    43004445   (eval $ac_link) 2>&5
    43014446   ac_status=$?
    43024447-  echo "$as_me:4666: \$? = $ac_status" >&5
    4303 +  echo "$as_me:4909: \$? = $ac_status" >&5
     4448+  echo "$as_me:4910: \$? = $ac_status" >&5
    43044449   (exit $ac_status); } ; then
    43054450                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
    43064451                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
    4307 @@ -4674,7 +4917,7 @@
     4452@@ -4674,7 +4918,7 @@
    43084453 fi
    43094454 
    43104455 fi
    43114456-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
    4312 +echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
     4457+echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5
    43134458 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
    43144459 
    43154460                fi
    4316 @@ -4690,7 +4933,7 @@
     4461@@ -4690,7 +4934,7 @@
    43174462 #define HAVE_LIBGPM 1
    43184463 EOF
    43194464 
    43204465-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
    4321 +echo "$as_me:4936: checking for Gpm_Wgetch in -lgpm" >&5
     4466+echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5
    43224467 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
    43234468 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    43244469   echo $ECHO_N "(cached) $ECHO_C" >&6
    4325 @@ -4698,7 +4941,7 @@
     4470@@ -4698,7 +4942,7 @@
    43264471   ac_check_lib_save_LIBS=$LIBS
    43274472 LIBS="-lgpm  $LIBS"
    43284473 cat >conftest.$ac_ext <<_ACEOF
    43294474-#line 4701 "configure"
    4330 +#line 4944 "configure"
     4475+#line 4945 "configure"
    43314476 #include "confdefs.h"
    43324477 
    43334478 /* Override any gcc2 internal prototype to avoid an error.  */
    4334 @@ -4717,16 +4960,16 @@
     4479@@ -4717,16 +4961,16 @@
    43354480 }
    43364481 _ACEOF
    43374482 rm -f conftest.$ac_objext conftest$ac_exeext
    43384483-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
    4339 +if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
     4484+if { (eval echo "$as_me:4964: \"$ac_link\"") >&5
    43404485   (eval $ac_link) 2>&5
    43414486   ac_status=$?
    43424487-  echo "$as_me:4723: \$? = $ac_status" >&5
    4343 +  echo "$as_me:4966: \$? = $ac_status" >&5
     4488+  echo "$as_me:4967: \$? = $ac_status" >&5
    43444489   (exit $ac_status); } &&
    43454490          { ac_try='test -s conftest$ac_exeext'
    43464491-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
    4347 +  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
     4492+  { (eval echo "$as_me:4970: \"$ac_try\"") >&5
    43484493   (eval $ac_try) 2>&5
    43494494   ac_status=$?
    43504495-  echo "$as_me:4729: \$? = $ac_status" >&5
    4351 +  echo "$as_me:4972: \$? = $ac_status" >&5
     4496+  echo "$as_me:4973: \$? = $ac_status" >&5
    43524497   (exit $ac_status); }; }; then
    43534498   ac_cv_lib_gpm_Gpm_Wgetch=yes
    43544499 else
    4355 @@ -4737,11 +4980,11 @@
     4500@@ -4737,11 +4981,11 @@
    43564501 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43574502 LIBS=$ac_check_lib_save_LIBS
    43584503 fi
    43594504-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    4360 +echo "$as_me:4983: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
     4505+echo "$as_me:4984: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    43614506 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
    43624507 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
    43634508 
    43644509-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
    4365 +echo "$as_me:4987: 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
    43664511 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
    43674512 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    43684513   echo $ECHO_N "(cached) $ECHO_C" >&6
    4369 @@ -4765,15 +5008,15 @@
     4514@@ -4765,15 +5009,15 @@
    43704515        # to rely on the static library, noting that some packagers may not
    43714516        # include it.
    43724517        LIBS="-static -lgpm -dynamic $LIBS"
    43734518-       if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
    4374 +       if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
     4519+       if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5
    43754520   (eval $ac_compile) 2>&5
    43764521   ac_status=$?
    43774522-  echo "$as_me:4771: \$? = $ac_status" >&5
    4378 +  echo "$as_me:5014: \$? = $ac_status" >&5
     4523+  echo "$as_me:5015: \$? = $ac_status" >&5
    43794524   (exit $ac_status); } ; then
    43804525-               if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
    4381 +               if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
     4526+               if { (eval echo "$as_me:5017: \"$ac_link\"") >&5
    43824527   (eval $ac_link) 2>&5
    43834528   ac_status=$?
    43844529-  echo "$as_me:4776: \$? = $ac_status" >&5
    4385 +  echo "$as_me:5019: \$? = $ac_status" >&5
     4530+  echo "$as_me:5020: \$? = $ac_status" >&5
    43864531   (exit $ac_status); } ; then
    43874532                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
    43884533                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
    4389 @@ -4785,11 +5028,11 @@
     4534@@ -4785,11 +5029,11 @@
    43904535 fi
    43914536 
    43924537 fi
    43934538-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
    4394 +echo "$as_me:5031: result: $cf_cv_check_gpm_wgetch" >&5
     4539+echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5
    43954540 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
    43964541 
    43974542 if test "$cf_cv_check_gpm_wgetch" != yes ; then
    43984543-       { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    4399 +       { echo "$as_me:5035: 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
    44004545 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
    44014546 fi
    44024547 
    4403 @@ -4799,7 +5042,7 @@
     4548@@ -4799,7 +5043,7 @@
    44044549 
    44054550 # not everyone has "test -c"
    44064551 if test -c /dev/sysmouse 2>/dev/null ; then
    44074552-echo "$as_me:4802: checking if you want to use sysmouse" >&5
    4408 +echo "$as_me:5045: checking if you want to use sysmouse" >&5
     4553+echo "$as_me:5046: checking if you want to use sysmouse" >&5
    44094554 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
    44104555 
    44114556 # Check whether --with-sysmouse or --without-sysmouse was given.
    4412 @@ -4811,7 +5054,7 @@
     4557@@ -4811,7 +5055,7 @@
    44134558 fi;
    44144559        if test "$cf_with_sysmouse" != no ; then
    44154560        cat >conftest.$ac_ext <<_ACEOF
    44164561-#line 4814 "configure"
    4417 +#line 5057 "configure"
     4562+#line 5058 "configure"
    44184563 #include "confdefs.h"
    44194564 
    44204565 #include <osreldate.h>
    4421 @@ -4834,16 +5077,16 @@
     4566@@ -4834,16 +5078,16 @@
    44224567 }
    44234568 _ACEOF
    44244569 rm -f conftest.$ac_objext
    44254570-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
    4426 +if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
     4571+if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5
    44274572   (eval $ac_compile) 2>&5
    44284573   ac_status=$?
    44294574-  echo "$as_me:4840: \$? = $ac_status" >&5
    4430 +  echo "$as_me:5083: \$? = $ac_status" >&5
     4575+  echo "$as_me:5084: \$? = $ac_status" >&5
    44314576   (exit $ac_status); } &&
    44324577          { ac_try='test -s conftest.$ac_objext'
    44334578-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
    4434 +  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
     4579+  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
    44354580   (eval $ac_try) 2>&5
    44364581   ac_status=$?
    44374582-  echo "$as_me:4846: \$? = $ac_status" >&5
    4438 +  echo "$as_me:5089: \$? = $ac_status" >&5
     4583+  echo "$as_me:5090: \$? = $ac_status" >&5
    44394584   (exit $ac_status); }; }; then
    44404585   cf_with_sysmouse=yes
    44414586 else
    4442 @@ -4853,7 +5096,7 @@
     4587@@ -4853,7 +5097,7 @@
    44434588 fi
    44444589 rm -f conftest.$ac_objext conftest.$ac_ext
    44454590        fi
    44464591-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
    4447 +echo "$as_me:5099: result: $cf_with_sysmouse" >&5
     4592+echo "$as_me:5100: result: $cf_with_sysmouse" >&5
    44484593 echo "${ECHO_T}$cf_with_sysmouse" >&6
    44494594 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
    44504595 #define USE_SYSMOUSE 1
    4451 @@ -4871,7 +5114,7 @@
     4596@@ -4871,7 +5115,7 @@
    44524597        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
    44534598 fi
    44544599 
    44554600-echo "$as_me:4874: checking for default loader flags" >&5
    4456 +echo "$as_me:5117: checking for default loader flags" >&5
     4601+echo "$as_me:5118: checking for default loader flags" >&5
    44574602 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
    44584603 case $DFT_LWR_MODEL in
    44594604 libtool) LD_MODEL=''   ;;
    4460 @@ -4880,13 +5123,13 @@
     4605@@ -4880,13 +5124,13 @@
    44614606 profile) LD_MODEL='-pg';;
    44624607 shared)  LD_MODEL=''   ;;
    44634608 esac
    44644609-echo "$as_me:4883: result: $LD_MODEL" >&5
    4465 +echo "$as_me:5126: result: $LD_MODEL" >&5
     4610+echo "$as_me:5127: result: $LD_MODEL" >&5
    44664611 echo "${ECHO_T}$LD_MODEL" >&6
    44674612 
    … …  
    44704615 
    44714616-echo "$as_me:4889: checking if rpath option should be used" >&5
    4472 +echo "$as_me:5132: checking if rpath option should be used" >&5
     4617+echo "$as_me:5133: checking if rpath option should be used" >&5
    44734618 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
    44744619 
    44754620 # Check whether --enable-rpath or --disable-rpath was given.
    4476 @@ -4896,10 +5139,10 @@
     4621@@ -4896,10 +5140,10 @@
    44774622 else
    44784623   cf_cv_ld_rpath=no
    44794624 fi;
    44804625-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
    4481 +echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
     4626+echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5
    44824627 echo "${ECHO_T}$cf_cv_ld_rpath" >&6
    44834628 
    44844629-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
    4485 +echo "$as_me:5145: 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
    44864631 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
    44874632 
    44884633 # Check whether --enable-relink or --disable-relink was given.
    4489 @@ -4909,19 +5152,20 @@
     4634@@ -4909,19 +5153,20 @@
    44904635 else
    44914636   cf_cv_do_relink=yes
    44924637 fi;
    44934638-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
    4494 +echo "$as_me:5155: result: $cf_cv_do_relink" >&5
     4639+echo "$as_me:5156: result: $cf_cv_do_relink" >&5
    44954640 echo "${ECHO_T}$cf_cv_do_relink" >&6
    44964641        ;;
    … …  
    45064651 
    45074652-       echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
    4508 +       echo "$as_me:5168: 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
    45094654 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
    45104655 
    45114656 # Check whether --with-shlib-version or --without-shlib-version was given.
    4512 @@ -4936,7 +5180,7 @@
     4657@@ -4936,7 +5181,7 @@
    45134658                cf_cv_shlib_version=$withval
    45144659                ;;
    45154660        *)
    45164661-               { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
    4517 +               { { echo "$as_me:5183: 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
    45184663 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    45194664    { (exit 1); exit 1; }; }
    45204665                ;;
    4521 @@ -4945,7 +5189,7 @@
     4666@@ -4945,7 +5190,7 @@
    45224667 else
    45234668   cf_cv_shlib_version=auto
    45244669 fi;
    45254670-       echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
    4526 +       echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
     4671+       echo "$as_me:5193: result: $cf_cv_shlib_version" >&5
    45274672 echo "${ECHO_T}$cf_cv_shlib_version" >&6
    45284673 
    45294674        cf_cv_rm_so_locs=no
    4530 @@ -4954,14 +5198,14 @@
     4675@@ -4954,14 +5199,14 @@
    45314676        CC_SHARED_OPTS=
    45324677        if test "$GCC" = yes
    45334678        then
    45344679-               echo "$as_me:4957: checking which $CC option to use" >&5
    4535 +               echo "$as_me:5201: checking which $CC option to use" >&5
     4680+               echo "$as_me:5202: checking which $CC option to use" >&5
    45364681 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
    45374682                cf_save_CFLAGS="$CFLAGS"
    … …  
    45414686                        cat >conftest.$ac_ext <<_ACEOF
    45424687-#line 4964 "configure"
    4543 +#line 5208 "configure"
     4688+#line 5209 "configure"
    45444689 #include "confdefs.h"
    45454690 #include <stdio.h>
    45464691 int
    4547 @@ -4973,16 +5217,16 @@
     4692@@ -4973,16 +5218,16 @@
    45484693 }
    45494694 _ACEOF
    45504695 rm -f conftest.$ac_objext
    45514696-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
    4552 +if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
     4697+if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5
    45534698   (eval $ac_compile) 2>&5
    45544699   ac_status=$?
    45554700-  echo "$as_me:4979: \$? = $ac_status" >&5
    4556 +  echo "$as_me:5223: \$? = $ac_status" >&5
     4701+  echo "$as_me:5224: \$? = $ac_status" >&5
    45574702   (exit $ac_status); } &&
    45584703          { ac_try='test -s conftest.$ac_objext'
    45594704-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
    4560 +  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
     4705+  { (eval echo "$as_me:5227: \"$ac_try\"") >&5
    45614706   (eval $ac_try) 2>&5
    45624707   ac_status=$?
    45634708-  echo "$as_me:4985: \$? = $ac_status" >&5
    4564 +  echo "$as_me:5229: \$? = $ac_status" >&5
     4709+  echo "$as_me:5230: \$? = $ac_status" >&5
    45654710   (exit $ac_status); }; }; then
    45664711   break
    45674712 else
    4568 @@ -4991,7 +5235,7 @@
     4713@@ -4991,7 +5236,7 @@
    45694714 fi
    45704715 rm -f conftest.$ac_objext conftest.$ac_ext
    45714716                done
    45724717-               echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
    4573 +               echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
     4718+               echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5
    45744719 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
    45754720                CFLAGS="$cf_save_CFLAGS"
    45764721        fi
    4577 @@ -4999,6 +5243,12 @@
     4722@@ -4999,6 +5244,12 @@
    45784723        cf_cv_shlib_version_infix=no
    45794724 
    … …  
    45884733                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
    45894734                ;;
    4590 @@ -5027,7 +5277,7 @@
     4735@@ -5027,7 +5278,7 @@
    45914736                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    45924737                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    45934738                cf_cv_shlib_version_infix=yes
    45944739-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    4595 +               echo "$as_me:5280: checking if ld -search_paths_first works" >&5
     4740+               echo "$as_me:5281: checking if ld -search_paths_first works" >&5
    45964741 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    45974742 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    45984743   echo $ECHO_N "(cached) $ECHO_C" >&6
    4599 @@ -5036,7 +5286,7 @@
     4744@@ -5036,7 +5287,7 @@
    46004745                        cf_save_LDFLAGS=$LDFLAGS
    46014746                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    46024747                        cat >conftest.$ac_ext <<_ACEOF
    46034748-#line 5039 "configure"
    4604 +#line 5289 "configure"
     4749+#line 5290 "configure"
    46054750 #include "confdefs.h"
    46064751 
    46074752 int
    4608 @@ -5048,16 +5298,16 @@
     4753@@ -5048,16 +5299,16 @@
    46094754 }
    46104755 _ACEOF
    46114756 rm -f conftest.$ac_objext conftest$ac_exeext
    46124757-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    4613 +if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
     4758+if { (eval echo "$as_me:5302: \"$ac_link\"") >&5
    46144759   (eval $ac_link) 2>&5
    46154760   ac_status=$?
    46164761-  echo "$as_me:5054: \$? = $ac_status" >&5
    4617 +  echo "$as_me:5304: \$? = $ac_status" >&5
     4762+  echo "$as_me:5305: \$? = $ac_status" >&5
    46184763   (exit $ac_status); } &&
    46194764          { ac_try='test -s conftest$ac_exeext'
    46204765-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    4621 +  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
     4766+  { (eval echo "$as_me:5308: \"$ac_try\"") >&5
    46224767   (eval $ac_try) 2>&5
    46234768   ac_status=$?
    46244769-  echo "$as_me:5060: \$? = $ac_status" >&5
    4625 +  echo "$as_me:5310: \$? = $ac_status" >&5
     4770+  echo "$as_me:5311: \$? = $ac_status" >&5
    46264771   (exit $ac_status); }; }; then
    46274772   cf_cv_ldflags_search_paths_first=yes
    46284773 else
    4629 @@ -5068,7 +5318,7 @@
     4774@@ -5068,7 +5319,7 @@
    46304775 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    46314776                                LDFLAGS=$cf_save_LDFLAGS
    46324777 fi
    46334778-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    4634 +echo "$as_me:5321: result: $cf_cv_ldflags_search_paths_first" >&5
     4779+echo "$as_me:5322: result: $cf_cv_ldflags_search_paths_first" >&5
    46354780 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    46364781                if test $cf_cv_ldflags_search_paths_first = yes; then
    46374782                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    4638 @@ -5090,10 +5340,10 @@
     4783@@ -5090,10 +5341,10 @@
    46394784        irix*)
    46404785                if test "$cf_cv_ld_rpath" = yes ; then
    … …  
    46494794                        fi
    46504795                fi
    4651 @@ -5112,7 +5362,7 @@
     4796@@ -5112,7 +5363,7 @@
    46524797                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    46534798                fi
    … …  
    46584803                fi
    46594804 
    4660 @@ -5131,7 +5381,7 @@
     4805@@ -5131,7 +5382,7 @@
    46614806                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    46624807                fi
    … …  
    46674812                fi
    46684813                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4669 @@ -5143,7 +5393,7 @@
     4814@@ -5143,7 +5394,7 @@
    46704815                cf_cv_shared_soname='`basename $@`'
    46714816        fi
    … …  
    46764821        nto-qnx*|openbsd*|freebsd[12].*)
    46774822                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4678 @@ -5155,7 +5405,7 @@
     4823@@ -5155,7 +5406,7 @@
    46794824                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    46804825                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
    … …  
    46854830                fi
    46864831 
    4687 @@ -5166,11 +5416,11 @@
     4832@@ -5166,11 +5417,11 @@
    46884833                cf_cv_shared_soname='`basename $@`'
    46894834        fi
    … …  
    46994844                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    47004845                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    4701 @@ -5192,7 +5442,7 @@
     4846@@ -5192,7 +5443,7 @@
    47024847 
    47034848                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
    … …  
    47084853                ;;
    47094854        osf*|mls+*)
    4710 @@ -5211,7 +5461,7 @@
     4855@@ -5211,7 +5462,7 @@
    47114856                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47124857                fi
    … …  
    47174862                fi
    47184863                cf_cv_rm_so_locs=yes
    4719 @@ -5246,7 +5496,7 @@
     4864@@ -5246,7 +5497,7 @@
    47204865                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47214866                fi
    … …  
    47264871                fi
    47274872 
    4728 @@ -5258,7 +5508,43 @@
     4873@@ -5258,7 +5509,43 @@
    47294874        fi
    47304875 
    … …  
    47364881+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
    47374882+                               cat >conftest.$ac_ext <<_ACEOF
    4738 +#line 5516 "configure"
     4883+#line 5517 "configure"
    47394884+#include "confdefs.h"
    47404885+#include <stdio.h>
    … …  
    47484893+_ACEOF
    47494894+rm -f conftest.$ac_objext
    4750 +if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
     4895+if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5
    47514896+  (eval $ac_compile) 2>&5
    47524897+  ac_status=$?
    4753 +  echo "$as_me:5531: \$? = $ac_status" >&5
     4898+  echo "$as_me:5532: \$? = $ac_status" >&5
    47544899+  (exit $ac_status); } &&
    47554900+         { ac_try='test -s conftest.$ac_objext'
    4756 +  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
     4901+  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
    47574902+  (eval $ac_try) 2>&5
    47584903+  ac_status=$?
    4759 +  echo "$as_me:5537: \$? = $ac_status" >&5
     4904+  echo "$as_me:5538: \$? = $ac_status" >&5
    47604905+  (exit $ac_status); }; }; then
    47614906+  break
    … …  
    47714916                else
    47724917                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
    4773 @@ -5285,20 +5571,20 @@
     4918@@ -5285,20 +5572,20 @@
    47744919                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    47754920                        ;;
    47764921                *)
    47774922-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    4778 +                       { echo "$as_me:5574: WARNING: ignored --with-shlib-version" >&5
     4923+                       { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5
    47794924 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    47804925                        ;;
    … …  
    47864931-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    47874932+       if test -n "$LD_RPATH_OPT" ; then
    4788 +               echo "$as_me:5582: checking if we need a space after rpath option" >&5
     4933+               echo "$as_me:5583: checking if we need a space after rpath option" >&5
    47894934 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    47904935                cf_save_LIBS="$LIBS"
    … …  
    47934938                cat >conftest.$ac_ext <<_ACEOF
    47944939-#line 5301 "configure"
    4795 +#line 5587 "configure"
     4940+#line 5588 "configure"
    47964941 #include "confdefs.h"
    47974942 
    47984943 int
    4799 @@ -5310,16 +5596,16 @@
     4944@@ -5310,16 +5597,16 @@
    48004945 }
    48014946 _ACEOF
    48024947 rm -f conftest.$ac_objext conftest$ac_exeext
    48034948-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    4804 +if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
     4949+if { (eval echo "$as_me:5600: \"$ac_link\"") >&5
    48054950   (eval $ac_link) 2>&5
    48064951   ac_status=$?
    48074952-  echo "$as_me:5316: \$? = $ac_status" >&5
    4808 +  echo "$as_me:5602: \$? = $ac_status" >&5
     4953+  echo "$as_me:5603: \$? = $ac_status" >&5
    48094954   (exit $ac_status); } &&
    48104955          { ac_try='test -s conftest$ac_exeext'
    48114956-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    4812 +  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
     4957+  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    48134958   (eval $ac_try) 2>&5
    48144959   ac_status=$?
    48154960-  echo "$as_me:5322: \$? = $ac_status" >&5
    4816 +  echo "$as_me:5608: \$? = $ac_status" >&5
     4961+  echo "$as_me:5609: \$? = $ac_status" >&5
    48174962   (exit $ac_status); }; }; then
    48184963   cf_rpath_space=no
    48194964 else
    4820 @@ -5329,16 +5615,16 @@
     4965@@ -5329,16 +5616,16 @@
    48214966 fi
    48224967 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    48234968                LIBS="$cf_save_LIBS"
    48244969-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    4825 +               echo "$as_me:5618: result: $cf_rpath_space" >&5
     4970+               echo "$as_me:5619: result: $cf_rpath_space" >&5
    48264971 echo "${ECHO_T}$cf_rpath_space" >&6
    48274972-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
    … …  
    48354980                if test "$model" = "shared"; then
    48364981-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    4837 +                       { { echo "$as_me:5627: 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
    48384983 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    48394984    { (exit 1); exit 1; }; }
    48404985                fi
    4841 @@ -5348,7 +5634,7 @@
     4986@@ -5348,7 +5635,7 @@
    48424987 ###############################################################################
    48434988 
    48444989 ###    use option --disable-overwrite to leave out the link to -lcurses
    48454990-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    4846 +echo "$as_me:5637: 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
    48474992 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    48484993 
    48494994 # Check whether --enable-overwrite or --disable-overwrite was given.
    4850 @@ -5358,10 +5644,10 @@
     4995@@ -5358,10 +5645,10 @@
    48514996 else
    48524997   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    48534998 fi;
    48544999-echo "$as_me:5361: result: $with_overwrite" >&5
    4855 +echo "$as_me:5647: result: $with_overwrite" >&5
     5000+echo "$as_me:5648: result: $with_overwrite" >&5
    48565001 echo "${ECHO_T}$with_overwrite" >&6
    48575002 
    48585003-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    4859 +echo "$as_me:5650: checking if external terminfo-database is used" >&5
     5004+echo "$as_me:5651: checking if external terminfo-database is used" >&5
    48605005 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    48615006 
    48625007 # Check whether --enable-database or --disable-database was given.
    4863 @@ -5371,7 +5657,7 @@
     5008@@ -5371,7 +5658,7 @@
    48645009 else
    48655010   use_database=yes
    48665011 fi;
    48675012-echo "$as_me:5374: result: $use_database" >&5
    4868 +echo "$as_me:5660: result: $use_database" >&5
     5013+echo "$as_me:5661: result: $use_database" >&5
    48695014 echo "${ECHO_T}$use_database" >&6
    48705015 
    48715016 case $host_os in #(vi
    4872 @@ -5393,7 +5679,7 @@
     5017@@ -5384,8 +5671,8 @@
     5018 esac
     5019 
     5020        case $cf_cv_system_name in
     5021-       os2*)   PATHSEP=';'  ;;
     5022-       *)      PATHSEP=':'  ;;
     5023+       os2*)   PATH_SEPARATOR=';'  ;;
     5024+       *)      PATH_SEPARATOR=':'  ;;
     5025        esac
     5026 
     5027 if test "$use_database" != no ; then
     5028@@ -5393,7 +5680,7 @@
    48735029 #define USE_DATABASE 1
    48745030 EOF
    48755031 
    48765032-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    4877 +       echo "$as_me:5682: checking which terminfo source-file will be installed" >&5
     5033+       echo "$as_me:5683: checking which terminfo source-file will be installed" >&5
    48785034 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    48795035 
    48805036 # Check whether --enable-database or --disable-database was given.
    4881 @@ -5401,10 +5687,10 @@
     5037@@ -5401,10 +5688,10 @@
    48825038   enableval="$enable_database"
    48835039   TERMINFO_SRC=$withval
    48845040 fi;
    48855041-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    4886 +       echo "$as_me:5690: result: $TERMINFO_SRC" >&5
     5042+       echo "$as_me:5691: result: $TERMINFO_SRC" >&5
    48875043 echo "${ECHO_T}$TERMINFO_SRC" >&6
    48885044 
    48895045-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    4890 +       echo "$as_me:5693: 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
    48915047 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    48925048 
    48935049 # Check whether --with-hashed-db or --without-hashed-db was given.
    4894 @@ -5414,13 +5700,13 @@
     5050@@ -5414,13 +5701,13 @@
    48955051 else
    48965052   with_hashed_db=no
    48975053 fi;
    48985054-       echo "$as_me:5417: result: $with_hashed_db" >&5
    4899 +       echo "$as_me:5703: result: $with_hashed_db" >&5
     5055+       echo "$as_me:5704: result: $with_hashed_db" >&5
    49005056 echo "${ECHO_T}$with_hashed_db" >&6
    49015057 else
    … …  
    49045060 
    49055061-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    4906 +echo "$as_me:5709: checking for list of fallback descriptions" >&5
     5062+echo "$as_me:5710: checking for list of fallback descriptions" >&5
    49075063 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    49085064 
    49095065 # Check whether --with-fallbacks or --without-fallbacks was given.
    4910 @@ -5430,11 +5716,11 @@
     5066@@ -5430,11 +5717,11 @@
    49115067 else
    49125068   with_fallback=
    49135069 fi;
    49145070-echo "$as_me:5433: result: $with_fallback" >&5
    4915 +echo "$as_me:5719: result: $with_fallback" >&5
     5071+echo "$as_me:5720: result: $with_fallback" >&5
    49165072 echo "${ECHO_T}$with_fallback" >&6
    49175073 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    49185074 
    49195075-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    4920 +echo "$as_me:5723: checking if you want modern xterm or antique" >&5
     5076+echo "$as_me:5724: checking if you want modern xterm or antique" >&5
    49215077 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    49225078 
    49235079 # Check whether --with-xterm-new or --without-xterm-new was given.
    4924 @@ -5448,7 +5734,7 @@
     5080@@ -5448,7 +5735,7 @@
    49255081 no)    with_xterm_new=xterm-old;;
    49265082 *)     with_xterm_new=xterm-new;;
    49275083 esac
    49285084-echo "$as_me:5451: result: $with_xterm_new" >&5
    4929 +echo "$as_me:5737: result: $with_xterm_new" >&5
     5085+echo "$as_me:5738: result: $with_xterm_new" >&5
    49305086 echo "${ECHO_T}$with_xterm_new" >&6
    49315087 WHICH_XTERM=$with_xterm_new
    49325088 
    4933 @@ -5458,7 +5744,7 @@
     5089@@ -5458,7 +5745,7 @@
    49345090        MAKE_TERMINFO="#"
    49355091 else
    49365092 
    49375093-echo "$as_me:5461: checking for list of terminfo directories" >&5
    4938 +echo "$as_me:5747: checking for list of terminfo directories" >&5
     5094+echo "$as_me:5748: checking for list of terminfo directories" >&5
    49395095 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    49405096 
    49415097 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    4942 @@ -5498,7 +5784,7 @@
     5098@@ -5468,7 +5755,7 @@
     5099 else
     5100   withval=${TERMINFO_DIRS-${datadir}/terminfo}
     5101 fi;
     5102-IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
     5103+IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
     5104 cf_dst_path=
     5105 for cf_src_path in $withval
     5106 do
     5107@@ -5498,7 +5785,7 @@
    49435108   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    49445109   ;;
    49455110 *)
    49465111-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    4947 +  { { echo "$as_me:5787: error: expected a pathname, not \"$cf_src_path\"" >&5
     5112+  { { echo "$as_me:5788: error: expected a pathname, not \"$cf_src_path\"" >&5
    49485113 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    49495114    { (exit 1); exit 1; }; }
    49505115   ;;
    4951 @@ -5511,13 +5797,13 @@
     5116@@ -5511,13 +5798,13 @@
    49525117 
    49535118 eval 'TERMINFO_DIRS="$cf_dst_path"'
    49545119 
    49555120-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    4956 +echo "$as_me:5800: result: $TERMINFO_DIRS" >&5
     5121+echo "$as_me:5801: result: $TERMINFO_DIRS" >&5
    49575122 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    49585123 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
    … …  
    49615126 
    49625127-echo "$as_me:5520: checking for default terminfo directory" >&5
    4963 +echo "$as_me:5806: checking for default terminfo directory" >&5
     5128+echo "$as_me:5807: checking for default terminfo directory" >&5
    49645129 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    49655130 
    49665131 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    4967 @@ -5553,7 +5839,7 @@
     5132@@ -5553,7 +5840,7 @@
    49685133   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    49695134   ;;
    49705135 *)
    49715136-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    4972 +  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
     5137+  { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5
    49735138 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    49745139    { (exit 1); exit 1; }; }
    49755140   ;;
    4976 @@ -5562,7 +5848,7 @@
     5141@@ -5562,7 +5849,7 @@
    49775142 fi
    49785143 TERMINFO="$withval"
    49795144 
    49805145-echo "$as_me:5565: result: $TERMINFO" >&5
    4981 +echo "$as_me:5851: result: $TERMINFO" >&5
     5146+echo "$as_me:5852: result: $TERMINFO" >&5
    49825147 echo "${ECHO_T}$TERMINFO" >&6
    49835148 cat >>confdefs.h <<EOF
    49845149 #define TERMINFO "$TERMINFO"
    4985 @@ -5572,7 +5858,7 @@
     5150@@ -5572,7 +5859,7 @@
    49865151 
    49875152 ###    use option --disable-big-core to make tic run on small machines
    49885153 ###    We need 4Mb, check if we can allocate 50% more than that.
    49895154-echo "$as_me:5575: checking if big-core option selected" >&5
    4990 +echo "$as_me:5861: checking if big-core option selected" >&5
     5155+echo "$as_me:5862: checking if big-core option selected" >&5
    49915156 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    49925157 
    49935158 # Check whether --enable-big-core or --disable-big-core was given.
    4994 @@ -5584,7 +5870,7 @@
     5159@@ -5584,7 +5871,7 @@
    49955160   with_big_core=no
    49965161 else
    49975162   cat >conftest.$ac_ext <<_ACEOF
    49985163-#line 5587 "configure"
    4999 +#line 5873 "configure"
     5164+#line 5874 "configure"
    50005165 #include "confdefs.h"
    50015166 
    50025167 #include <stdlib.h>
    5003 @@ -5598,15 +5884,15 @@
     5168@@ -5598,15 +5885,15 @@
    50045169 }
    50055170 _ACEOF
    50065171 rm -f conftest$ac_exeext
    50075172-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    5008 +if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
     5173+if { (eval echo "$as_me:5888: \"$ac_link\"") >&5
    50095174   (eval $ac_link) 2>&5
    50105175   ac_status=$?
    50115176-  echo "$as_me:5604: \$? = $ac_status" >&5
    5012 +  echo "$as_me:5890: \$? = $ac_status" >&5
     5177+  echo "$as_me:5891: \$? = $ac_status" >&5
    50135178   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    50145179-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    5015 +  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
     5180+  { (eval echo "$as_me:5893: \"$ac_try\"") >&5
    50165181   (eval $ac_try) 2>&5
    50175182   ac_status=$?
    50185183-  echo "$as_me:5609: \$? = $ac_status" >&5
    5019 +  echo "$as_me:5895: \$? = $ac_status" >&5
     5184+  echo "$as_me:5896: \$? = $ac_status" >&5
    50205185   (exit $ac_status); }; }; then
    50215186   with_big_core=yes
    50225187 else
    5023 @@ -5618,7 +5904,7 @@
     5188@@ -5618,7 +5905,7 @@
    50245189 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    50255190 fi
    50265191 fi;
    50275192-echo "$as_me:5621: result: $with_big_core" >&5
    5028 +echo "$as_me:5907: result: $with_big_core" >&5
     5193+echo "$as_me:5908: result: $with_big_core" >&5
    50295194 echo "${ECHO_T}$with_big_core" >&6
    50305195 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    50315196 #define HAVE_BIG_CORE 1
    5032 @@ -5627,7 +5913,7 @@
     5197@@ -5627,7 +5914,7 @@
    50335198 ### ISO C only guarantees 512-char strings, we have tables which load faster
    50345199 ### when constructed using "big" strings.  More than the C compiler, the awk
    50355200 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    50365201-echo "$as_me:5630: checking if big-strings option selected" >&5
    5037 +echo "$as_me:5916: checking if big-strings option selected" >&5
     5202+echo "$as_me:5917: checking if big-strings option selected" >&5
    50385203 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    50395204 
    50405205 # Check whether --enable-big-strings or --disable-big-strings was given.
    5041 @@ -5636,29 +5922,29 @@
     5206@@ -5636,29 +5923,29 @@
    50425207   with_big_strings=$enableval
    50435208 else
    … …  
    50725237 fi;
    50735238-echo "$as_me:5654: result: $with_big_strings" >&5
    5074 +echo "$as_me:5940: result: $with_big_strings" >&5
     5239+echo "$as_me:5941: result: $with_big_strings" >&5
    50755240 echo "${ECHO_T}$with_big_strings" >&6
    50765241 
    … …  
    50805245 ###    use option --enable-termcap to compile in the termcap fallback support
    50815246-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    5082 +echo "$as_me:5947: checking if you want termcap-fallback support" >&5
     5247+echo "$as_me:5948: checking if you want termcap-fallback support" >&5
    50835248 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    50845249 
    50855250 # Check whether --enable-termcap or --disable-termcap was given.
    5086 @@ -5668,13 +5954,13 @@
     5251@@ -5668,13 +5955,13 @@
    50875252 else
    50885253   with_termcap=no
    50895254 fi;
    50905255-echo "$as_me:5671: result: $with_termcap" >&5
    5091 +echo "$as_me:5957: result: $with_termcap" >&5
     5256+echo "$as_me:5958: result: $with_termcap" >&5
    50925257 echo "${ECHO_T}$with_termcap" >&6
    50935258 
    … …  
    50965261                if test -z "$with_fallback" ; then
    50975262-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    5098 +                       { { echo "$as_me:5963: 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
    50995264 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    51005265    { (exit 1); exit 1; }; }
    51015266                fi
    5102 @@ -5686,7 +5972,7 @@
     5267@@ -5686,7 +5973,7 @@
    51035268 else
    51045269 
    51055270 if test "$with_ticlib" != no ; then
    51065271-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    5107 +       { { echo "$as_me:5975: 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
    51085273 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    51095274    { (exit 1); exit 1; }; }
    51105275 fi
    5111 @@ -5695,7 +5981,7 @@
     5276@@ -5695,7 +5982,7 @@
    51125277 #define USE_TERMCAP 1
    51135278 EOF
    51145279 
    51155280-echo "$as_me:5698: checking for list of termcap files" >&5
    5116 +echo "$as_me:5984: checking for list of termcap files" >&5
     5281+echo "$as_me:5985: checking for list of termcap files" >&5
    51175282 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    51185283 
    51195284 # Check whether --with-termpath or --without-termpath was given.
    5120 @@ -5735,7 +6021,7 @@
     5285@@ -5705,7 +5992,7 @@
     5286 else
     5287   withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
     5288 fi;
     5289-IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
     5290+IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
     5291 cf_dst_path=
     5292 for cf_src_path in $withval
     5293 do
     5294@@ -5735,7 +6022,7 @@
    51215295   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    51225296   ;;
    51235297 *)
    51245298-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    5125 +  { { echo "$as_me:6024: error: expected a pathname, not \"$cf_src_path\"" >&5
     5299+  { { echo "$as_me:6025: error: expected a pathname, not \"$cf_src_path\"" >&5
    51265300 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    51275301    { (exit 1); exit 1; }; }
    51285302   ;;
    5129 @@ -5748,14 +6034,14 @@
     5303@@ -5748,14 +6035,14 @@
    51305304 
    51315305 eval 'TERMPATH="$cf_dst_path"'
    51325306 
    51335307-echo "$as_me:5751: result: $TERMPATH" >&5
    5134 +echo "$as_me:6037: result: $TERMPATH" >&5
     5308+echo "$as_me:6038: result: $TERMPATH" >&5
    51355309 echo "${ECHO_T}$TERMPATH" >&6
    51365310 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
    … …  
    51405314 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    51415315-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    5142 +echo "$as_me:6044: checking if fast termcap-loader is needed" >&5
     5316+echo "$as_me:6045: checking if fast termcap-loader is needed" >&5
    51435317 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    51445318 
    51455319 # Check whether --enable-getcap or --disable-getcap was given.
    5146 @@ -5765,13 +6051,13 @@
     5320@@ -5765,13 +6052,13 @@
    51475321 else
    51485322   with_getcap=no
    51495323 fi;
    51505324-echo "$as_me:5768: result: $with_getcap" >&5
    5151 +echo "$as_me:6054: result: $with_getcap" >&5
     5325+echo "$as_me:6055: result: $with_getcap" >&5
    51525326 echo "${ECHO_T}$with_getcap" >&6
    51535327 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    51565330 
    51575331-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    5158 +echo "$as_me:6060: 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
    51595333 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    51605334 
    51615335 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    5162 @@ -5781,7 +6067,7 @@
     5336@@ -5781,7 +6068,7 @@
    51635337 else
    51645338   with_getcap_cache=no
    51655339 fi;
    51665340-echo "$as_me:5784: result: $with_getcap_cache" >&5
    5167 +echo "$as_me:6070: result: $with_getcap_cache" >&5
     5341+echo "$as_me:6071: result: $with_getcap_cache" >&5
    51685342 echo "${ECHO_T}$with_getcap_cache" >&6
    51695343 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    51705344 #define USE_GETCAP_CACHE 1
    5171 @@ -5790,7 +6076,7 @@
     5345@@ -5790,7 +6077,7 @@
    51725346 fi
    51735347 
    51745348 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    51755349-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    5176 +echo "$as_me:6079: checking if ~/.terminfo is wanted" >&5
     5350+echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5
    51775351 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    51785352 
    51795353 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    5180 @@ -5800,13 +6086,13 @@
     5354@@ -5800,13 +6087,13 @@
    51815355 else
    51825356   with_home_terminfo=yes
    51835357 fi;
    51845358-echo "$as_me:5803: result: $with_home_terminfo" >&5
    5185 +echo "$as_me:6089: result: $with_home_terminfo" >&5
     5359+echo "$as_me:6090: result: $with_home_terminfo" >&5
    51865360 echo "${ECHO_T}$with_home_terminfo" >&6
    51875361 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    51905364 
    51915365-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    5192 +echo "$as_me:6095: 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
    51935367 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    51945368 
    51955369 # Check whether --enable-root-environ or --disable-root-environ was given.
    5196 @@ -5816,7 +6102,7 @@
     5370@@ -5816,7 +6103,7 @@
    51975371 else
    51985372   with_root_environ=yes
    51995373 fi;
    52005374-echo "$as_me:5819: result: $with_root_environ" >&5
    5201 +echo "$as_me:6105: result: $with_root_environ" >&5
     5375+echo "$as_me:6106: result: $with_root_environ" >&5
    52025376 echo "${ECHO_T}$with_root_environ" >&6
    52035377 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    52045378 #define USE_ROOT_ENVIRON 1
    5205 @@ -5830,13 +6116,13 @@
     5379@@ -5830,13 +6117,13 @@
    52065380        unlink
    52075381 do
    52085382 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    52095383-echo "$as_me:5833: checking for $ac_func" >&5
    5210 +echo "$as_me:6119: checking for $ac_func" >&5
     5384+echo "$as_me:6120: checking for $ac_func" >&5
    52115385 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    52125386 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    52155389   cat >conftest.$ac_ext <<_ACEOF
    52165390-#line 5839 "configure"
    5217 +#line 6125 "configure"
     5391+#line 6126 "configure"
    52185392 #include "confdefs.h"
    52195393 /* System header to define __stub macros and hopefully few prototypes,
    52205394     which can conflict with char $ac_func (); below.  */
    5221 @@ -5867,16 +6153,16 @@
     5395@@ -5867,16 +6154,16 @@
    52225396 }
    52235397 _ACEOF
    52245398 rm -f conftest.$ac_objext conftest$ac_exeext
    52255399-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    5226 +if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
     5400+if { (eval echo "$as_me:6157: \"$ac_link\"") >&5
    52275401   (eval $ac_link) 2>&5
    52285402   ac_status=$?
    52295403-  echo "$as_me:5873: \$? = $ac_status" >&5
    5230 +  echo "$as_me:6159: \$? = $ac_status" >&5
     5404+  echo "$as_me:6160: \$? = $ac_status" >&5
    52315405   (exit $ac_status); } &&
    52325406          { ac_try='test -s conftest$ac_exeext'
    52335407-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    5234 +  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
     5408+  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
    52355409   (eval $ac_try) 2>&5
    52365410   ac_status=$?
    52375411-  echo "$as_me:5879: \$? = $ac_status" >&5
    5238 +  echo "$as_me:6165: \$? = $ac_status" >&5
     5412+  echo "$as_me:6166: \$? = $ac_status" >&5
    52395413   (exit $ac_status); }; }; then
    52405414   eval "$as_ac_var=yes"
    52415415 else
    5242 @@ -5886,7 +6172,7 @@
     5416@@ -5886,7 +6173,7 @@
    52435417 fi
    52445418 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    52455419 fi
    52465420-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    5247 +echo "$as_me:6175: result: `eval echo '${'$as_ac_var'}'`" >&5
     5421+echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5
    52485422 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    52495423 if test `eval echo '${'$as_ac_var'}'` = yes; then
    52505424   cat >>confdefs.h <<EOF
    5251 @@ -5903,13 +6189,13 @@
     5425@@ -5903,13 +6190,13 @@
    52525426                symlink
    52535427 do
    52545428 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    52555429-echo "$as_me:5906: checking for $ac_func" >&5
    5256 +echo "$as_me:6192: checking for $ac_func" >&5
     5430+echo "$as_me:6193: checking for $ac_func" >&5
    52575431 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    52585432 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    52615435   cat >conftest.$ac_ext <<_ACEOF
    52625436-#line 5912 "configure"
    5263 +#line 6198 "configure"
     5437+#line 6199 "configure"
    52645438 #include "confdefs.h"
    52655439 /* System header to define __stub macros and hopefully few prototypes,
    52665440     which can conflict with char $ac_func (); below.  */
    5267 @@ -5940,16 +6226,16 @@
     5441@@ -5940,16 +6227,16 @@
    52685442 }
    52695443 _ACEOF
    52705444 rm -f conftest.$ac_objext conftest$ac_exeext
    52715445-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    5272 +if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
     5446+if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
    52735447   (eval $ac_link) 2>&5
    52745448   ac_status=$?
    52755449-  echo "$as_me:5946: \$? = $ac_status" >&5
    5276 +  echo "$as_me:6232: \$? = $ac_status" >&5
     5450+  echo "$as_me:6233: \$? = $ac_status" >&5
    52775451   (exit $ac_status); } &&
    52785452          { ac_try='test -s conftest$ac_exeext'
    52795453-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    5280 +  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
     5454+  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
    52815455   (eval $ac_try) 2>&5
    52825456   ac_status=$?
    52835457-  echo "$as_me:5952: \$? = $ac_status" >&5
    5284 +  echo "$as_me:6238: \$? = $ac_status" >&5
     5458+  echo "$as_me:6239: \$? = $ac_status" >&5
    52855459   (exit $ac_status); }; }; then
    52865460   eval "$as_ac_var=yes"
    52875461 else
    5288 @@ -5959,7 +6245,7 @@
     5462@@ -5959,7 +6246,7 @@
    52895463 fi
    52905464 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    52915465 fi
    52925466-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    5293 +echo "$as_me:6248: result: `eval echo '${'$as_ac_var'}'`" >&5
     5467+echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5
    52945468 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    52955469 if test `eval echo '${'$as_ac_var'}'` = yes; then
    52965470   cat >>confdefs.h <<EOF
    5297 @@ -5970,7 +6256,7 @@
     5471@@ -5970,7 +6257,7 @@
    52985472 done
    52995473 
    53005474 else
    53015475-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    5302 +       echo "$as_me:6259: checking if link/symlink functions work" >&5
     5476+       echo "$as_me:6260: checking if link/symlink functions work" >&5
    53035477 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    53045478 if test "${cf_cv_link_funcs+set}" = set; then
    53055479   echo $ECHO_N "(cached) $ECHO_C" >&6
    5306 @@ -5983,7 +6269,7 @@
     5480@@ -5983,7 +6270,7 @@
    53075481                        eval 'ac_cv_func_'$cf_func'=error'
    53085482 else
    53095483   cat >conftest.$ac_ext <<_ACEOF
    53105484-#line 5986 "configure"
    5311 +#line 6272 "configure"
     5485+#line 6273 "configure"
    53125486 #include "confdefs.h"
    53135487 
    53145488 #include <sys/types.h>
    5315 @@ -6013,15 +6299,15 @@
     5489@@ -6013,15 +6300,15 @@
    53165490 
    53175491 _ACEOF
    53185492 rm -f conftest$ac_exeext
    53195493-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    5320 +if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
     5494+if { (eval echo "$as_me:6303: \"$ac_link\"") >&5
    53215495   (eval $ac_link) 2>&5
    53225496   ac_status=$?
    53235497-  echo "$as_me:6019: \$? = $ac_status" >&5
    5324 +  echo "$as_me:6305: \$? = $ac_status" >&5
     5498+  echo "$as_me:6306: \$? = $ac_status" >&5
    53255499   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    53265500-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    5327 +  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
     5501+  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
    53285502   (eval $ac_try) 2>&5
    53295503   ac_status=$?
    53305504-  echo "$as_me:6024: \$? = $ac_status" >&5
    5331 +  echo "$as_me:6310: \$? = $ac_status" >&5
     5505+  echo "$as_me:6311: \$? = $ac_status" >&5
    53325506   (exit $ac_status); }; }; then
    53335507 
    53345508                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    5335 @@ -6039,7 +6325,7 @@
     5509@@ -6039,7 +6326,7 @@
    53365510                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    53375511 
    53385512 fi
    53395513-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    5340 +echo "$as_me:6328: result: $cf_cv_link_funcs" >&5
     5514+echo "$as_me:6329: result: $cf_cv_link_funcs" >&5
    53415515 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    53425516        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    53435517 #define HAVE_LINK 1
    5344 @@ -6057,7 +6343,7 @@
     5518@@ -6057,7 +6344,7 @@
    53455519 # soft links (symbolic links) are useful for some systems where hard links do
    53465520 # not work, or to make it simpler to copy terminfo trees around.
    53475521 if test "$ac_cv_func_symlink" = yes ; then
    53485522-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    5349 +    echo "$as_me:6346: checking if tic should use symbolic links" >&5
     5523+    echo "$as_me:6347: checking if tic should use symbolic links" >&5
    53505524 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    53515525 
    53525526 # Check whether --enable-symlinks or --disable-symlinks was given.
    5353 @@ -6067,21 +6353,21 @@
     5527@@ -6067,21 +6354,21 @@
    53545528 else
    53555529   with_symlinks=no
    53565530 fi;
    53575531-    echo "$as_me:6070: result: $with_symlinks" >&5
    5358 +    echo "$as_me:6356: result: $with_symlinks" >&5
     5532+    echo "$as_me:6357: result: $with_symlinks" >&5
    53595533 echo "${ECHO_T}$with_symlinks" >&6
    53605534 fi
    … …  
    53645538 if test "$with_symlinks" = no ; then
    53655539-    echo "$as_me:6077: checking if tic should use hard links" >&5
    5366 +    echo "$as_me:6363: checking if tic should use hard links" >&5
     5540+    echo "$as_me:6364: checking if tic should use hard links" >&5
    53675541 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    53685542     if test "$ac_cv_func_link" = yes ; then
    … …  
    53725546     fi
    53735547-    echo "$as_me:6084: result: $with_links" >&5
    5374 +    echo "$as_me:6370: result: $with_links" >&5
     5548+    echo "$as_me:6371: result: $with_links" >&5
    53755549 echo "${ECHO_T}$with_links" >&6
    53765550 fi
    53775551 
    5378 @@ -6094,7 +6380,7 @@
     5552@@ -6094,7 +6381,7 @@
    53795553 EOF
    53805554 
    53815555 ###   use option --enable-broken-linker to force on use of broken-linker support
    53825556-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    5383 +echo "$as_me:6383: checking if you want broken-linker support code" >&5
     5557+echo "$as_me:6384: checking if you want broken-linker support code" >&5
    53845558 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    53855559 
    53865560 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    5387 @@ -6104,7 +6390,7 @@
     5561@@ -6104,7 +6391,7 @@
    53885562 else
    53895563   with_broken_linker=${BROKEN_LINKER-no}
    53905564 fi;
    53915565-echo "$as_me:6107: result: $with_broken_linker" >&5
    5392 +echo "$as_me:6393: result: $with_broken_linker" >&5
     5566+echo "$as_me:6394: result: $with_broken_linker" >&5
    53935567 echo "${ECHO_T}$with_broken_linker" >&6
    53945568 
    53955569 BROKEN_LINKER=0
    5396 @@ -6124,14 +6410,14 @@
     5570@@ -6124,14 +6411,14 @@
    53975571                BROKEN_LINKER=1
    53985572                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    53995573 
    54005574-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    5401 +echo "${as_me-configure}:6413: testing cygwin linker is broken anyway ..." 1>&5
     5575+echo "${as_me-configure}:6414: testing cygwin linker is broken anyway ..." 1>&5
    54025576 
    54035577                ;;
    … …  
    54075581 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    54085582-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    5409 +echo "$as_me:6420: 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
    54105584 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    54115585 
    54125586 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    5413 @@ -6141,7 +6427,7 @@
     5587@@ -6141,7 +6428,7 @@
    54145588 else
    54155589   with_bsdpad=no
    54165590 fi;
    54175591-echo "$as_me:6144: result: $with_bsdpad" >&5
    5418 +echo "$as_me:6430: result: $with_bsdpad" >&5
     5592+echo "$as_me:6431: result: $with_bsdpad" >&5
    54195593 echo "${ECHO_T}$with_bsdpad" >&6
    54205594 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    54215595 #define BSD_TPUTS 1
    5422 @@ -6158,7 +6444,7 @@
     5596@@ -6158,7 +6445,7 @@
    54235597 
    54245598 # Check to define _XOPEN_SOURCE "automatically"
    54255599 
    54265600-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    5427 +echo "$as_me:6447: 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
    54285602 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    54295603 if test "${cf_cv_cc_u_d_options+set}" = set; then
    54305604   echo $ECHO_N "(cached) $ECHO_C" >&6
    5431 @@ -6167,7 +6453,7 @@
     5605@@ -6167,7 +6454,7 @@
    54325606        cf_save_CPPFLAGS="$CPPFLAGS"
    54335607        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    54345608        cat >conftest.$ac_ext <<_ACEOF
    54355609-#line 6170 "configure"
    5436 +#line 6456 "configure"
     5610+#line 6457 "configure"
    54375611 #include "confdefs.h"
    54385612 
    54395613 int
    5440 @@ -6186,16 +6472,16 @@
     5614@@ -6186,16 +6473,16 @@
    54415615 }
    54425616 _ACEOF
    54435617 rm -f conftest.$ac_objext
    54445618-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    5445 +if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
     5619+if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5
    54465620   (eval $ac_compile) 2>&5
    54475621   ac_status=$?
    54485622-  echo "$as_me:6192: \$? = $ac_status" >&5
    5449 +  echo "$as_me:6478: \$? = $ac_status" >&5
     5623+  echo "$as_me:6479: \$? = $ac_status" >&5
    54505624   (exit $ac_status); } &&
    54515625          { ac_try='test -s conftest.$ac_objext'
    54525626-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    5453 +  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
     5627+  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
    54545628   (eval $ac_try) 2>&5
    54555629   ac_status=$?
    54565630-  echo "$as_me:6198: \$? = $ac_status" >&5
    5457 +  echo "$as_me:6484: \$? = $ac_status" >&5
     5631+  echo "$as_me:6485: \$? = $ac_status" >&5
    54585632   (exit $ac_status); }; }; then
    54595633 
    54605634        cf_cv_cc_u_d_options=yes
    5461 @@ -6209,14 +6495,14 @@
     5635@@ -6209,14 +6496,14 @@
    54625636        CPPFLAGS="$cf_save_CPPFLAGS"
    54635637 
    54645638 fi
    54655639-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    5466 +echo "$as_me:6498: result: $cf_cv_cc_u_d_options" >&5
     5640+echo "$as_me:6499: result: $cf_cv_cc_u_d_options" >&5
    54675641 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    54685642 
    … …  
    54765650        ;;
    54775651 freebsd*|dragonfly*) #(vi
    5478 @@ -6233,16 +6519,16 @@
     5652@@ -6233,16 +6520,16 @@
    54795653 irix[56].*) #(vi
    54805654        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    54845658 
    54855659-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    5486 +echo "$as_me:6524: checking if we must define _GNU_SOURCE" >&5
     5660+echo "$as_me:6525: checking if we must define _GNU_SOURCE" >&5
    54875661 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    54885662 if test "${cf_cv_gnu_source+set}" = set; then
    … …  
    54925666 cat >conftest.$ac_ext <<_ACEOF
    54935667-#line 6245 "configure"
    5494 +#line 6531 "configure"
     5668+#line 6532 "configure"
    54955669 #include "confdefs.h"
    54965670 #include <sys/types.h>
    54975671 int
    5498 @@ -6257,16 +6543,16 @@
     5672@@ -6257,16 +6544,16 @@
    54995673 }
    55005674 _ACEOF
    55015675 rm -f conftest.$ac_objext
    55025676-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    5503 +if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
     5677+if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5
    55045678   (eval $ac_compile) 2>&5
    55055679   ac_status=$?
    55065680-  echo "$as_me:6263: \$? = $ac_status" >&5
    5507 +  echo "$as_me:6549: \$? = $ac_status" >&5
     5681+  echo "$as_me:6550: \$? = $ac_status" >&5
    55085682   (exit $ac_status); } &&
    55095683          { ac_try='test -s conftest.$ac_objext'
    55105684-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    5511 +  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
     5685+  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
    55125686   (eval $ac_try) 2>&5
    55135687   ac_status=$?
    55145688-  echo "$as_me:6269: \$? = $ac_status" >&5
    5515 +  echo "$as_me:6555: \$? = $ac_status" >&5
     5689+  echo "$as_me:6556: \$? = $ac_status" >&5
    55165690   (exit $ac_status); }; }; then
    55175691   cf_cv_gnu_source=no
    55185692 else
    5519 @@ -6275,7 +6561,7 @@
     5693@@ -6275,7 +6562,7 @@
    55205694 cf_save="$CPPFLAGS"
    55215695         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    55225696         cat >conftest.$ac_ext <<_ACEOF
    55235697-#line 6278 "configure"
    5524 +#line 6564 "configure"
     5698+#line 6565 "configure"
    55255699 #include "confdefs.h"
    55265700 #include <sys/types.h>
    55275701 int
    5528 @@ -6290,16 +6576,16 @@
     5702@@ -6290,16 +6577,16 @@
    55295703 }
    55305704 _ACEOF
    55315705 rm -f conftest.$ac_objext
    55325706-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
    5533 +if { (eval echo "$as_me:6579: \"$ac_compile\"") >&5
     5707+if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5
    55345708   (eval $ac_compile) 2>&5
    55355709   ac_status=$?
    55365710-  echo "$as_me:6296: \$? = $ac_status" >&5
    5537 +  echo "$as_me:6582: \$? = $ac_status" >&5
     5711+  echo "$as_me:6583: \$? = $ac_status" >&5
    55385712   (exit $ac_status); } &&
    55395713          { ac_try='test -s conftest.$ac_objext'
    55405714-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
    5541 +  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
     5715+  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
    55425716   (eval $ac_try) 2>&5
    55435717   ac_status=$?
    55445718-  echo "$as_me:6302: \$? = $ac_status" >&5
    5545 +  echo "$as_me:6588: \$? = $ac_status" >&5
     5719+  echo "$as_me:6589: \$? = $ac_status" >&5
    55465720   (exit $ac_status); }; }; then
    55475721   cf_cv_gnu_source=no
    55485722 else
    5549 @@ -6314,7 +6600,7 @@
     5723@@ -6314,7 +6601,7 @@
    55505724 rm -f conftest.$ac_objext conftest.$ac_ext
    55515725 
    55525726 fi
    55535727-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
    5554 +echo "$as_me:6603: result: $cf_cv_gnu_source" >&5
     5728+echo "$as_me:6604: result: $cf_cv_gnu_source" >&5
    55555729 echo "${ECHO_T}$cf_cv_gnu_source" >&6
    55565730 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    55575731 
    5558 @@ -6341,14 +6627,14 @@
     5732@@ -6341,14 +6628,14 @@
    55595733        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
    55605734        ;;
    55615735 *)
    55625736-       echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
    5563 +       echo "$as_me:6630: checking if we should define _XOPEN_SOURCE" >&5
     5737+       echo "$as_me:6631: checking if we should define _XOPEN_SOURCE" >&5
    55645738 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
    55655739 if test "${cf_cv_xopen_source+set}" = set; then
    … …  
    55695743        cat >conftest.$ac_ext <<_ACEOF
    55705744-#line 6351 "configure"
    5571 +#line 6637 "configure"
     5745+#line 6638 "configure"
    55725746 #include "confdefs.h"
    55735747 #include <sys/types.h>
    55745748 int
    5575 @@ -6363,16 +6649,16 @@
     5749@@ -6363,16 +6650,16 @@
    55765750 }
    55775751 _ACEOF
    55785752 rm -f conftest.$ac_objext
    55795753-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
    5580 +if { (eval echo "$as_me:6652: \"$ac_compile\"") >&5
     5754+if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5
    55815755   (eval $ac_compile) 2>&5
    55825756   ac_status=$?
    55835757-  echo "$as_me:6369: \$? = $ac_status" >&5
    5584 +  echo "$as_me:6655: \$? = $ac_status" >&5
     5758+  echo "$as_me:6656: \$? = $ac_status" >&5
    55855759   (exit $ac_status); } &&
    55865760          { ac_try='test -s conftest.$ac_objext'
    55875761-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
    5588 +  { (eval echo "$as_me:6658: \"$ac_try\"") >&5
     5762+  { (eval echo "$as_me:6659: \"$ac_try\"") >&5
    55895763   (eval $ac_try) 2>&5
    55905764   ac_status=$?
    55915765-  echo "$as_me:6375: \$? = $ac_status" >&5
    5592 +  echo "$as_me:6661: \$? = $ac_status" >&5
     5766+  echo "$as_me:6662: \$? = $ac_status" >&5
    55935767   (exit $ac_status); }; }; then
    55945768   cf_cv_xopen_source=no
    55955769 else
    5596 @@ -6381,7 +6667,7 @@
     5770@@ -6381,7 +6668,7 @@
    55975771 cf_save="$CPPFLAGS"
    55985772         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
    55995773         cat >conftest.$ac_ext <<_ACEOF
    56005774-#line 6384 "configure"
    5601 +#line 6670 "configure"
     5775+#line 6671 "configure"
    56025776 #include "confdefs.h"
    56035777 #include <sys/types.h>
    56045778 int
    5605 @@ -6396,16 +6682,16 @@
     5779@@ -6396,16 +6683,16 @@
    56065780 }
    56075781 _ACEOF
    56085782 rm -f conftest.$ac_objext
    56095783-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
    5610 +if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
     5784+if { (eval echo "$as_me:6686: \"$ac_compile\"") >&5
    56115785   (eval $ac_compile) 2>&5
    56125786   ac_status=$?
    56135787-  echo "$as_me:6402: \$? = $ac_status" >&5
    5614 +  echo "$as_me:6688: \$? = $ac_status" >&5
     5788+  echo "$as_me:6689: \$? = $ac_status" >&5
    56155789   (exit $ac_status); } &&
    56165790          { ac_try='test -s conftest.$ac_objext'
    56175791-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
    5618 +  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
     5792+  { (eval echo "$as_me:6692: \"$ac_try\"") >&5
    56195793   (eval $ac_try) 2>&5
    56205794   ac_status=$?
    56215795-  echo "$as_me:6408: \$? = $ac_status" >&5
    5622 +  echo "$as_me:6694: \$? = $ac_status" >&5
     5796+  echo "$as_me:6695: \$? = $ac_status" >&5
    56235797   (exit $ac_status); }; }; then
    56245798   cf_cv_xopen_source=no
    56255799 else
    5626 @@ -6420,7 +6706,7 @@
     5800@@ -6420,7 +6707,7 @@
    56275801 rm -f conftest.$ac_objext conftest.$ac_ext
    56285802 
    56295803 fi
    56305804-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
    5631 +echo "$as_me:6709: result: $cf_cv_xopen_source" >&5
     5805+echo "$as_me:6710: result: $cf_cv_xopen_source" >&5
    56325806 echo "${ECHO_T}$cf_cv_xopen_source" >&6
    56335807        if test "$cf_cv_xopen_source" != no ; then
    56345808 
    5635 @@ -6454,16 +6740,16 @@
     5809@@ -6454,16 +6741,16 @@
    56365810        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
    56375811                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
    56385812 
    56395813-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
    5640 +echo "$as_me:6743: checking if we should define _POSIX_C_SOURCE" >&5
     5814+echo "$as_me:6744: checking if we should define _POSIX_C_SOURCE" >&5
    56415815 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
    56425816 if test "${cf_cv_posix_c_source+set}" = set; then
    … …  
    56455819 
    56465820-echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
    5647 +echo "${as_me-configure}:6749: 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
    56485822 
    56495823        cat >conftest.$ac_ext <<_ACEOF
    56505824-#line 6466 "configure"
    5651 +#line 6752 "configure"
     5825+#line 6753 "configure"
    56525826 #include "confdefs.h"
    56535827 #include <sys/types.h>
    56545828 int
    5655 @@ -6478,16 +6764,16 @@
     5829@@ -6478,16 +6765,16 @@
    56565830 }
    56575831 _ACEOF
    56585832 rm -f conftest.$ac_objext
    56595833-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
    5660 +if { (eval echo "$as_me:6767: \"$ac_compile\"") >&5
     5834+if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
    56615835   (eval $ac_compile) 2>&5
    56625836   ac_status=$?
    56635837-  echo "$as_me:6484: \$? = $ac_status" >&5
    5664 +  echo "$as_me:6770: \$? = $ac_status" >&5
     5838+  echo "$as_me:6771: \$? = $ac_status" >&5
    56655839   (exit $ac_status); } &&
    56665840          { ac_try='test -s conftest.$ac_objext'
    56675841-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
    5668 +  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
     5842+  { (eval echo "$as_me:6774: \"$ac_try\"") >&5
    56695843   (eval $ac_try) 2>&5
    56705844   ac_status=$?
    56715845-  echo "$as_me:6490: \$? = $ac_status" >&5
    5672 +  echo "$as_me:6776: \$? = $ac_status" >&5
     5846+  echo "$as_me:6777: \$? = $ac_status" >&5
    56735847   (exit $ac_status); }; }; then
    56745848   cf_cv_posix_c_source=no
    56755849 else
    5676 @@ -6508,7 +6794,7 @@
     5850@@ -6508,7 +6795,7 @@
    56775851         esac
    56785852         if test "$cf_want_posix_source" = yes ; then
    56795853                cat >conftest.$ac_ext <<_ACEOF
    56805854-#line 6511 "configure"
    5681 +#line 6797 "configure"
     5855+#line 6798 "configure"
    56825856 #include "confdefs.h"
    56835857 #include <sys/types.h>
    56845858 int
    5685 @@ -6523,16 +6809,16 @@
     5859@@ -6523,16 +6810,16 @@
    56865860 }
    56875861 _ACEOF
    56885862 rm -f conftest.$ac_objext
    56895863-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
    5690 +if { (eval echo "$as_me:6812: \"$ac_compile\"") >&5
     5864+if { (eval echo "$as_me:6813: \"$ac_compile\"") >&5
    56915865   (eval $ac_compile) 2>&5
    56925866   ac_status=$?
    56935867-  echo "$as_me:6529: \$? = $ac_status" >&5
    5694 +  echo "$as_me:6815: \$? = $ac_status" >&5
     5868+  echo "$as_me:6816: \$? = $ac_status" >&5
    56955869   (exit $ac_status); } &&
    56965870          { ac_try='test -s conftest.$ac_objext'
    56975871-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
    5698 +  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
     5872+  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
    56995873   (eval $ac_try) 2>&5
    57005874   ac_status=$?
    57015875-  echo "$as_me:6535: \$? = $ac_status" >&5
    5702 +  echo "$as_me:6821: \$? = $ac_status" >&5
     5876+  echo "$as_me:6822: \$? = $ac_status" >&5
    57035877   (exit $ac_status); }; }; then
    57045878   :
    57055879 else
    5706 @@ -6543,15 +6829,15 @@
     5880@@ -6543,15 +6830,15 @@
    57075881 rm -f conftest.$ac_objext conftest.$ac_ext
    57085882         fi
    57095883 
    57105884-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    5711 +echo "${as_me-configure}:6832: 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
    57125886 
    57135887         CFLAGS="$cf_trim_CFLAGS"
    … …  
    57155889 
    57165890-echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
    5717 +echo "${as_me-configure}:6837: 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
    57185892 
    57195893         cat >conftest.$ac_ext <<_ACEOF
    57205894-#line 6554 "configure"
    5721 +#line 6840 "configure"
     5895+#line 6841 "configure"
    57225896 #include "confdefs.h"
    57235897 #include <sys/types.h>
    57245898 int
    5725 @@ -6566,16 +6852,16 @@
     5899@@ -6566,16 +6853,16 @@
    57265900 }
    57275901 _ACEOF
    57285902 rm -f conftest.$ac_objext
    57295903-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
    5730 +if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
     5904+if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5
    57315905   (eval $ac_compile) 2>&5
    57325906   ac_status=$?
    57335907-  echo "$as_me:6572: \$? = $ac_status" >&5
    5734 +  echo "$as_me:6858: \$? = $ac_status" >&5
     5908+  echo "$as_me:6859: \$? = $ac_status" >&5
    57355909   (exit $ac_status); } &&
    57365910          { ac_try='test -s conftest.$ac_objext'
    57375911-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
    5738 +  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
     5912+  { (eval echo "$as_me:6862: \"$ac_try\"") >&5
    57395913   (eval $ac_try) 2>&5
    57405914   ac_status=$?
    57415915-  echo "$as_me:6578: \$? = $ac_status" >&5
    5742 +  echo "$as_me:6864: \$? = $ac_status" >&5
     5916+  echo "$as_me:6865: \$? = $ac_status" >&5
    57435917   (exit $ac_status); }; }; then
    57445918   :
    57455919 else
    5746 @@ -6591,7 +6877,7 @@
     5920@@ -6591,7 +6878,7 @@
    57475921 rm -f conftest.$ac_objext conftest.$ac_ext
    57485922 
    57495923 fi
    57505924-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
    5751 +echo "$as_me:6880: result: $cf_cv_posix_c_source" >&5
     5925+echo "$as_me:6881: result: $cf_cv_posix_c_source" >&5
    57525926 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
    57535927 
    57545928 if test "$cf_cv_posix_c_source" != no ; then
    5755 @@ -6610,14 +6896,14 @@
     5929@@ -6610,14 +6897,14 @@
    57565930 
    57575931 # Work around breakage on OS X
    57585932 
    57595933-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
    5760 +echo "$as_me:6899: checking if SIGWINCH is defined" >&5
     5934+echo "$as_me:6900: checking if SIGWINCH is defined" >&5
    57615935 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
    57625936 if test "${cf_cv_define_sigwinch+set}" = set; then
    … …  
    57665940        cat >conftest.$ac_ext <<_ACEOF
    57675941-#line 6620 "configure"
    5768 +#line 6906 "configure"
     5942+#line 6907 "configure"
    57695943 #include "confdefs.h"
    57705944 
    57715945 #include <sys/types.h>
    5772 @@ -6632,23 +6918,23 @@
     5946@@ -6632,23 +6919,23 @@
    57735947 }
    57745948 _ACEOF
    57755949 rm -f conftest.$ac_objext
    57765950-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
    5777 +if { (eval echo "$as_me:6921: \"$ac_compile\"") >&5
     5951+if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5
    57785952   (eval $ac_compile) 2>&5
    57795953   ac_status=$?
    57805954-  echo "$as_me:6638: \$? = $ac_status" >&5
    5781 +  echo "$as_me:6924: \$? = $ac_status" >&5
     5955+  echo "$as_me:6925: \$? = $ac_status" >&5
    57825956   (exit $ac_status); } &&
    57835957          { ac_try='test -s conftest.$ac_objext'
    57845958-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
    5785 +  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
     5959+  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
    57865960   (eval $ac_try) 2>&5
    57875961   ac_status=$?
    57885962-  echo "$as_me:6644: \$? = $ac_status" >&5
    5789 +  echo "$as_me:6930: \$? = $ac_status" >&5
     5963+  echo "$as_me:6931: \$? = $ac_status" >&5
    57905964   (exit $ac_status); }; }; then
    57915965   cf_cv_define_sigwinch=yes
    … …  
    57955969 cat >conftest.$ac_ext <<_ACEOF
    57965970-#line 6651 "configure"
    5797 +#line 6937 "configure"
     5971+#line 6938 "configure"
    57985972 #include "confdefs.h"
    57995973 
    58005974 #undef _XOPEN_SOURCE
    5801 @@ -6666,16 +6952,16 @@
     5975@@ -6666,16 +6953,16 @@
    58025976 }
    58035977 _ACEOF
    58045978 rm -f conftest.$ac_objext
    58055979-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
    5806 +if { (eval echo "$as_me:6955: \"$ac_compile\"") >&5
     5980+if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5
    58075981   (eval $ac_compile) 2>&5
    58085982   ac_status=$?
    58095983-  echo "$as_me:6672: \$? = $ac_status" >&5
    5810 +  echo "$as_me:6958: \$? = $ac_status" >&5
     5984+  echo "$as_me:6959: \$? = $ac_status" >&5
    58115985   (exit $ac_status); } &&
    58125986          { ac_try='test -s conftest.$ac_objext'
    58135987-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
    5814 +  { (eval echo "$as_me:6961: \"$ac_try\"") >&5
     5988+  { (eval echo "$as_me:6962: \"$ac_try\"") >&5
    58155989   (eval $ac_try) 2>&5
    58165990   ac_status=$?
    58175991-  echo "$as_me:6678: \$? = $ac_status" >&5
    5818 +  echo "$as_me:6964: \$? = $ac_status" >&5
     5992+  echo "$as_me:6965: \$? = $ac_status" >&5
    58195993   (exit $ac_status); }; }; then
    58205994   cf_cv_define_sigwinch=maybe
    58215995 else
    5822 @@ -6689,11 +6975,11 @@
     5996@@ -6689,11 +6976,11 @@
    58235997 rm -f conftest.$ac_objext conftest.$ac_ext
    58245998 
    58255999 fi
    58266000-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
    5827 +echo "$as_me:6978: result: $cf_cv_define_sigwinch" >&5
     6001+echo "$as_me:6979: result: $cf_cv_define_sigwinch" >&5
    58286002 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
    58296003 
    58306004 if test "$cf_cv_define_sigwinch" = maybe ; then
    58316005-echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
    5832 +echo "$as_me:6982: checking for actual SIGWINCH definition" >&5
     6006+echo "$as_me:6983: checking for actual SIGWINCH definition" >&5
    58336007 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
    58346008 if test "${cf_cv_fixup_sigwinch+set}" = set; then
    58356009   echo $ECHO_N "(cached) $ECHO_C" >&6
    5836 @@ -6704,7 +6990,7 @@
     6010@@ -6704,7 +6991,7 @@
    58376011 while test $cf_sigwinch != 1
    58386012 do
    58396013        cat >conftest.$ac_ext <<_ACEOF
    58406014-#line 6707 "configure"
    5841 +#line 6993 "configure"
     6015+#line 6994 "configure"
    58426016 #include "confdefs.h"
    58436017 
    58446018 #undef _XOPEN_SOURCE
    5845 @@ -6726,16 +7012,16 @@
     6019@@ -6726,16 +7013,16 @@
    58466020 }
    58476021 _ACEOF
    58486022 rm -f conftest.$ac_objext
    58496023-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
    5850 +if { (eval echo "$as_me:7015: \"$ac_compile\"") >&5
     6024+if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5
    58516025   (eval $ac_compile) 2>&5
    58526026   ac_status=$?
    58536027-  echo "$as_me:6732: \$? = $ac_status" >&5
    5854 +  echo "$as_me:7018: \$? = $ac_status" >&5
     6028+  echo "$as_me:7019: \$? = $ac_status" >&5
    58556029   (exit $ac_status); } &&
    58566030          { ac_try='test -s conftest.$ac_objext'
    58576031-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
    5858 +  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
     6032+  { (eval echo "$as_me:7022: \"$ac_try\"") >&5
    58596033   (eval $ac_try) 2>&5
    58606034   ac_status=$?
    58616035-  echo "$as_me:6738: \$? = $ac_status" >&5
    5862 +  echo "$as_me:7024: \$? = $ac_status" >&5
     6036+  echo "$as_me:7025: \$? = $ac_status" >&5
    58636037   (exit $ac_status); }; }; then
    58646038   cf_cv_fixup_sigwinch=$cf_sigwinch
    58656039         break
    5866 @@ -6749,7 +7035,7 @@
     6040@@ -6749,7 +7036,7 @@
    58676041 done
    58686042 
    58696043 fi
    58706044-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
    5871 +echo "$as_me:7038: result: $cf_cv_fixup_sigwinch" >&5
     6045+echo "$as_me:7039: result: $cf_cv_fixup_sigwinch" >&5
    58726046 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
    58736047 
    58746048        if test "$cf_cv_fixup_sigwinch" != unknown ; then
    5875 @@ -6759,13 +7045,13 @@
     6049@@ -6759,13 +7046,13 @@
    58766050 
    58776051 # Checks for CODESET support.
    58786052 
    58796053-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
    5880 +  echo "$as_me:7048: checking for nl_langinfo and CODESET" >&5
     6054+  echo "$as_me:7049: checking for nl_langinfo and CODESET" >&5
    58816055 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
    58826056 if test "${am_cv_langinfo_codeset+set}" = set; then
    … …  
    58856059   cat >conftest.$ac_ext <<_ACEOF
    58866060-#line 6768 "configure"
    5887 +#line 7054 "configure"
     6061+#line 7055 "configure"
    58886062 #include "confdefs.h"
    58896063 #include <langinfo.h>
    58906064 int
    5891 @@ -6777,16 +7063,16 @@
     6065@@ -6777,16 +7064,16 @@
    58926066 }
    58936067 _ACEOF
    58946068 rm -f conftest.$ac_objext conftest$ac_exeext
    58956069-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
    5896 +if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
     6070+if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
    58976071   (eval $ac_link) 2>&5
    58986072   ac_status=$?
    58996073-  echo "$as_me:6783: \$? = $ac_status" >&5
    5900 +  echo "$as_me:7069: \$? = $ac_status" >&5
     6074+  echo "$as_me:7070: \$? = $ac_status" >&5
    59016075   (exit $ac_status); } &&
    59026076          { ac_try='test -s conftest$ac_exeext'
    59036077-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
    5904 +  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
     6078+  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
    59056079   (eval $ac_try) 2>&5
    59066080   ac_status=$?
    59076081-  echo "$as_me:6789: \$? = $ac_status" >&5
    5908 +  echo "$as_me:7075: \$? = $ac_status" >&5
     6082+  echo "$as_me:7076: \$? = $ac_status" >&5
    59096083   (exit $ac_status); }; }; then
    59106084   am_cv_langinfo_codeset=yes
    59116085 else
    5912 @@ -6797,7 +7083,7 @@
     6086@@ -6797,7 +7084,7 @@
    59136087 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    59146088 
    59156089 fi
    59166090-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
    5917 +echo "$as_me:7086: result: $am_cv_langinfo_codeset" >&5
     6091+echo "$as_me:7087: result: $am_cv_langinfo_codeset" >&5
    59186092 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    59196093   if test $am_cv_langinfo_codeset = yes; then
    59206094 
    5921 @@ -6811,7 +7097,7 @@
     6095@@ -6811,7 +7098,7 @@
    59226096 NCURSES_OK_WCHAR_T=
    59236097 NCURSES_OK_WINT_T=
    59246098 
    59256099-echo "$as_me:6814: checking if you want wide-character code" >&5
    5926 +echo "$as_me:7100: checking if you want wide-character code" >&5
     6100+echo "$as_me:7101: checking if you want wide-character code" >&5
    59276101 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
    59286102 
    59296103 # Check whether --enable-widec or --disable-widec was given.
    5930 @@ -6821,7 +7107,7 @@
     6104@@ -6821,7 +7108,7 @@
    59316105 else
    59326106   with_widec=no
    59336107 fi;
    59346108-echo "$as_me:6824: result: $with_widec" >&5
    5935 +echo "$as_me:7110: result: $with_widec" >&5
     6109+echo "$as_me:7111: result: $with_widec" >&5
    59366110 echo "${ECHO_T}$with_widec" >&6
    59376111 if test "$with_widec" = yes ; then
    59386112        LIB_SUFFIX="w${LIB_SUFFIX}"
    5939 @@ -6829,10 +7115,10 @@
     6113@@ -6829,10 +7116,10 @@
    59406114 #define USE_WIDEC_SUPPORT 1
    59416115 EOF
    59426116 
    59436117-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    5944 +echo "$as_me:7118: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
     6118+echo "$as_me:7119: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    59456119 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
    59466120 cat >conftest.$ac_ext <<_ACEOF
    59476121-#line 6835 "configure"
    5948 +#line 7121 "configure"
     6122+#line 7122 "configure"
    59496123 #include "confdefs.h"
    59506124 #include <sys/types.h>
    59516125 
    5952 @@ -6848,16 +7134,16 @@
     6126@@ -6848,16 +7135,16 @@
    59536127 }
    59546128 _ACEOF
    59556129 rm -f conftest.$ac_objext
    59566130-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
    5957 +if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5
     6131+if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5
    59586132   (eval $ac_compile) 2>&5
    59596133   ac_status=$?
    59606134-  echo "$as_me:6854: \$? = $ac_status" >&5
    5961 +  echo "$as_me:7140: \$? = $ac_status" >&5
     6135+  echo "$as_me:7141: \$? = $ac_status" >&5
    59626136   (exit $ac_status); } &&
    59636137          { ac_try='test -s conftest.$ac_objext'
    59646138-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
    5965 +  { (eval echo "$as_me:7143: \"$ac_try\"") >&5
     6139+  { (eval echo "$as_me:7144: \"$ac_try\"") >&5
    59666140   (eval $ac_try) 2>&5
    59676141   ac_status=$?
    59686142-  echo "$as_me:6860: \$? = $ac_status" >&5
    5969 +  echo "$as_me:7146: \$? = $ac_status" >&5
     6143+  echo "$as_me:7147: \$? = $ac_status" >&5
    59706144   (exit $ac_status); }; }; then
    59716145   cf_result=no
    59726146 else
    5973 @@ -6866,16 +7152,16 @@
     6147@@ -6866,16 +7153,16 @@
    59746148 cf_result=yes
    59756149 fi
    59766150 rm -f conftest.$ac_objext conftest.$ac_ext
    59776151-echo "$as_me:6869: result: $cf_result" >&5
    5978 +echo "$as_me:7155: result: $cf_result" >&5
     6152+echo "$as_me:7156: result: $cf_result" >&5
    59796153 echo "${ECHO_T}$cf_result" >&6
    59806154 
    … …  
    59836157 elif test "x" != "x" ; then
    59846158-       echo "$as_me:6875: checking checking for compatible value versus " >&5
    5985 +       echo "$as_me:7161: checking checking for compatible value versus " >&5
     6159+       echo "$as_me:7162: checking checking for compatible value versus " >&5
    59866160 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
    59876161        cat >conftest.$ac_ext <<_ACEOF
    59886162-#line 6878 "configure"
    5989 +#line 7164 "configure"
     6163+#line 7165 "configure"
    59906164 #include "confdefs.h"
    59916165 #include <sys/types.h>
    59926166 
    5993 @@ -6891,16 +7177,16 @@
     6167@@ -6891,16 +7178,16 @@
    59946168 }
    59956169 _ACEOF
    59966170 rm -f conftest.$ac_objext
    59976171-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
    5998 +if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
     6172+if { (eval echo "$as_me:7181: \"$ac_compile\"") >&5
    59996173   (eval $ac_compile) 2>&5
    60006174   ac_status=$?
    60016175-  echo "$as_me:6897: \$? = $ac_status" >&5
    6002 +  echo "$as_me:7183: \$? = $ac_status" >&5
     6176+  echo "$as_me:7184: \$? = $ac_status" >&5
    60036177   (exit $ac_status); } &&
    60046178          { ac_try='test -s conftest.$ac_objext'
    60056179-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
    6006 +  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
     6180+  { (eval echo "$as_me:7187: \"$ac_try\"") >&5
    60076181   (eval $ac_try) 2>&5
    60086182   ac_status=$?
    60096183-  echo "$as_me:6903: \$? = $ac_status" >&5
    6010 +  echo "$as_me:7189: \$? = $ac_status" >&5
     6184+  echo "$as_me:7190: \$? = $ac_status" >&5
    60116185   (exit $ac_status); }; }; then
    60126186   cf_result=yes
    60136187 else
    6014 @@ -6909,7 +7195,7 @@
     6188@@ -6909,7 +7196,7 @@
    60156189 cf_result=no
    60166190 fi
    60176191 rm -f conftest.$ac_objext conftest.$ac_ext
    60186192-       echo "$as_me:6912: result: $cf_result" >&5
    6019 +       echo "$as_me:7198: result: $cf_result" >&5
     6193+       echo "$as_me:7199: result: $cf_result" >&5
    60206194 echo "${ECHO_T}$cf_result" >&6
    60216195        if test "$cf_result" = no ; then
    60226196                # perhaps we can override it - try...
    6023 @@ -6923,13 +7209,13 @@
     6197@@ -6923,13 +7210,13 @@
    60246198 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
    60256199 do
    60266200 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    60276201-echo "$as_me:6926: checking for $ac_func" >&5
    6028 +echo "$as_me:7212: checking for $ac_func" >&5
     6202+echo "$as_me:7213: checking for $ac_func" >&5
    60296203 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    60306204 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    60336207   cat >conftest.$ac_ext <<_ACEOF
    60346208-#line 6932 "configure"
    6035 +#line 7218 "configure"
     6209+#line 7219 "configure"
    60366210 #include "confdefs.h"
    60376211 /* System header to define __stub macros and hopefully few prototypes,
    60386212     which can conflict with char $ac_func (); below.  */
    6039 @@ -6960,16 +7246,16 @@
     6213@@ -6960,16 +7247,16 @@
    60406214 }
    60416215 _ACEOF
    60426216 rm -f conftest.$ac_objext conftest$ac_exeext
    60436217-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
    6044 +if { (eval echo "$as_me:7249: \"$ac_link\"") >&5
     6218+if { (eval echo "$as_me:7250: \"$ac_link\"") >&5
    60456219   (eval $ac_link) 2>&5
    60466220   ac_status=$?
    60476221-  echo "$as_me:6966: \$? = $ac_status" >&5
    6048 +  echo "$as_me:7252: \$? = $ac_status" >&5
     6222+  echo "$as_me:7253: \$? = $ac_status" >&5
    60496223   (exit $ac_status); } &&
    60506224          { ac_try='test -s conftest$ac_exeext'
    60516225-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
    6052 +  { (eval echo "$as_me:7255: \"$ac_try\"") >&5
     6226+  { (eval echo "$as_me:7256: \"$ac_try\"") >&5
    60536227   (eval $ac_try) 2>&5
    60546228   ac_status=$?
    60556229-  echo "$as_me:6972: \$? = $ac_status" >&5
    6056 +  echo "$as_me:7258: \$? = $ac_status" >&5
     6230+  echo "$as_me:7259: \$? = $ac_status" >&5
    60576231   (exit $ac_status); }; }; then
    60586232   eval "$as_ac_var=yes"
    60596233 else
    6060 @@ -6979,7 +7265,7 @@
     6234@@ -6979,7 +7266,7 @@
    60616235 fi
    60626236 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    60636237 fi
    60646238-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
    6065 +echo "$as_me:7268: result: `eval echo '${'$as_ac_var'}'`" >&5
     6239+echo "$as_me:7269: result: `eval echo '${'$as_ac_var'}'`" >&5
    60666240 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    60676241 if test `eval echo '${'$as_ac_var'}'` = yes; then
    60686242   cat >>confdefs.h <<EOF
    6069 @@ -6991,7 +7277,7 @@
     6243@@ -6991,7 +7278,7 @@
    60706244 
    60716245        if test "$ac_cv_func_putwc" != yes ; then
    60726246 
    60736247-echo "$as_me:6994: checking for multibyte character support" >&5
    6074 +echo "$as_me:7280: checking for multibyte character support" >&5
     6248+echo "$as_me:7281: checking for multibyte character support" >&5
    60756249 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
    60766250 if test "${cf_cv_utf8_lib+set}" = set; then
    60776251   echo $ECHO_N "(cached) $ECHO_C" >&6
    6078 @@ -6999,7 +7285,7 @@
     6252@@ -6999,7 +7286,7 @@
    60796253 
    60806254        cf_save_LIBS="$LIBS"
    60816255        cat >conftest.$ac_ext <<_ACEOF
    60826256-#line 7002 "configure"
    6083 +#line 7288 "configure"
     6257+#line 7289 "configure"
    60846258 #include "confdefs.h"
    60856259 
    60866260 #include <stdlib.h>
    6087 @@ -7012,16 +7298,16 @@
     6261@@ -7012,16 +7299,16 @@
    60886262 }
    60896263 _ACEOF
    60906264 rm -f conftest.$ac_objext conftest$ac_exeext
    60916265-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
    6092 +if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
     6266+if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
    60936267   (eval $ac_link) 2>&5
    60946268   ac_status=$?
    60956269-  echo "$as_me:7018: \$? = $ac_status" >&5
    6096 +  echo "$as_me:7304: \$? = $ac_status" >&5
     6270+  echo "$as_me:7305: \$? = $ac_status" >&5
    60976271   (exit $ac_status); } &&
    60986272          { ac_try='test -s conftest$ac_exeext'
    60996273-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
    6100 +  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
     6274+  { (eval echo "$as_me:7308: \"$ac_try\"") >&5
    61016275   (eval $ac_try) 2>&5
    61026276   ac_status=$?
    61036277-  echo "$as_me:7024: \$? = $ac_status" >&5
    6104 +  echo "$as_me:7310: \$? = $ac_status" >&5
     6278+  echo "$as_me:7311: \$? = $ac_status" >&5
    61056279   (exit $ac_status); }; }; then
    61066280   cf_cv_utf8_lib=yes
    61076281 else
    6108 @@ -7033,10 +7319,10 @@
     6282@@ -7033,10 +7320,10 @@
    61096283 cf_cv_header_path_utf8=
    61106284 cf_cv_library_path_utf8=
    61116285 
    61126286-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    6113 +echo "${as_me-configure}:7322: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
     6287+echo "${as_me-configure}:7323: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    61146288 
    61156289 cat >conftest.$ac_ext <<_ACEOF
    61166290-#line 7039 "configure"
    6117 +#line 7325 "configure"
     6291+#line 7326 "configure"
    61186292 #include "confdefs.h"
    61196293 
    61206294 #include <libutf8.h>
    6121 @@ -7049,16 +7335,16 @@
     6295@@ -7049,16 +7336,16 @@
    61226296 }
    61236297 _ACEOF
    61246298 rm -f conftest.$ac_objext conftest$ac_exeext
    61256299-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
    6126 +if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
     6300+if { (eval echo "$as_me:7339: \"$ac_link\"") >&5
    61276301   (eval $ac_link) 2>&5
    61286302   ac_status=$?
    61296303-  echo "$as_me:7055: \$? = $ac_status" >&5
    6130 +  echo "$as_me:7341: \$? = $ac_status" >&5
     6304+  echo "$as_me:7342: \$? = $ac_status" >&5
    61316305   (exit $ac_status); } &&
    61326306          { ac_try='test -s conftest$ac_exeext'
    61336307-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
    6134 +  { (eval echo "$as_me:7344: \"$ac_try\"") >&5
     6308+  { (eval echo "$as_me:7345: \"$ac_try\"") >&5
    61356309   (eval $ac_try) 2>&5
    61366310   ac_status=$?
    61376311-  echo "$as_me:7061: \$? = $ac_status" >&5
    6138 +  echo "$as_me:7347: \$? = $ac_status" >&5
     6312+  echo "$as_me:7348: \$? = $ac_status" >&5
    61396313   (exit $ac_status); }; }; then
    61406314   cf_cv_find_linkage_utf8=yes
    61416315 else
    6142 @@ -7067,12 +7353,41 @@
     6316@@ -7067,12 +7354,41 @@
    61436317 
    61446318     cf_cv_find_linkage_utf8=no
    … …  
    61476321+    test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
    61486322+
    6149 +echo "${as_me-configure}:7358: testing find linkage for utf8 library ..." 1>&5
    6150 +
    6151 +echo "${as_me-configure}:7360: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
     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
    61526326 
    61536327     cf_save_CPPFLAGS="$CPPFLAGS"
    … …  
    61846358 test "/usr" != "$prefix" && \
    61856359 test -d "/usr" && \
    6186 @@ -7143,16 +7458,18 @@
     6360@@ -7143,16 +7459,18 @@
    61876361        test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
    61886362 }
    … …  
    61966370 
    61976371-echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    6198 +echo "${as_me-configure}:7468: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
     6372+echo "${as_me-configure}:7469: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    61996373 
    62006374         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
    62016375         cat >conftest.$ac_ext <<_ACEOF
    62026376-#line 7155 "configure"
    6203 +#line 7472 "configure"
     6377+#line 7473 "configure"
    62046378 #include "confdefs.h"
    62056379 
    62066380 #include <libutf8.h>
    6207 @@ -7165,21 +7482,21 @@
     6381@@ -7165,21 +7483,21 @@
    62086382 }
    62096383 _ACEOF
    62106384 rm -f conftest.$ac_objext
    62116385-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
    6212 +if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
     6386+if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
    62136387   (eval $ac_compile) 2>&5
    62146388   ac_status=$?
    62156389-  echo "$as_me:7171: \$? = $ac_status" >&5
    6216 +  echo "$as_me:7488: \$? = $ac_status" >&5
     6390+  echo "$as_me:7489: \$? = $ac_status" >&5
    62176391   (exit $ac_status); } &&
    62186392          { ac_try='test -s conftest.$ac_objext'
    62196393-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
    6220 +  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
     6394+  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
    62216395   (eval $ac_try) 2>&5
    62226396   ac_status=$?
    62236397-  echo "$as_me:7177: \$? = $ac_status" >&5
    6224 +  echo "$as_me:7494: \$? = $ac_status" >&5
     6398+  echo "$as_me:7495: \$? = $ac_status" >&5
    62256399   (exit $ac_status); }; }; then
    62266400 
    … …  
    62286402 
    62296403-echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    6230 +echo "${as_me-configure}:7499: 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
    62316405 
    62326406             cf_cv_find_linkage_utf8=maybe
    62336407             cf_test_CPPFLAGS="$CPPFLAGS"
    6234 @@ -7197,13 +7514,39 @@
     6408@@ -7197,13 +7515,39 @@
    62356409 
    62366410     if test "$cf_cv_find_linkage_utf8" = maybe ; then
    62376411 
    62386412-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    6239 +echo "${as_me-configure}:7517: 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
    62406414 
    62416415       cf_save_LIBS="$LIBS"
    … …  
    62746448 test "/usr" != "$prefix" && \
    62756449 test -d "/usr" && \
    6276 @@ -7260,18 +7603,20 @@
     6450@@ -7260,18 +7604,20 @@
    62776451        test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
    62786452 }
    … …  
    62866460 
    62876461-echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    6288 +echo "${as_me-configure}:7613: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
     6462+echo "${as_me-configure}:7614: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    62896463 
    62906464             CPPFLAGS="$cf_test_CPPFLAGS"
    … …  
    62936467             cat >conftest.$ac_ext <<_ACEOF
    62946468-#line 7274 "configure"
    6295 +#line 7619 "configure"
     6469+#line 7620 "configure"
    62966470 #include "confdefs.h"
    62976471 
    62986472 #include <libutf8.h>
    6299 @@ -7284,21 +7629,21 @@
     6473@@ -7284,21 +7630,21 @@
    63006474 }
    63016475 _ACEOF
    63026476 rm -f conftest.$ac_objext conftest$ac_exeext
    63036477-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
    6304 +if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
     6478+if { (eval echo "$as_me:7633: \"$ac_link\"") >&5
    63056479   (eval $ac_link) 2>&5
    63066480   ac_status=$?
    63076481-  echo "$as_me:7290: \$? = $ac_status" >&5
    6308 +  echo "$as_me:7635: \$? = $ac_status" >&5
     6482+  echo "$as_me:7636: \$? = $ac_status" >&5
    63096483   (exit $ac_status); } &&
    63106484          { ac_try='test -s conftest$ac_exeext'
    63116485-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
    6312 +  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
     6486+  { (eval echo "$as_me:7639: \"$ac_try\"") >&5
    63136487   (eval $ac_try) 2>&5
    63146488   ac_status=$?
    63156489-  echo "$as_me:7296: \$? = $ac_status" >&5
    6316 +  echo "$as_me:7641: \$? = $ac_status" >&5
     6490+  echo "$as_me:7642: \$? = $ac_status" >&5
    63176491   (exit $ac_status); }; }; then
    63186492 
    … …  
    63206494 
    63216495-echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    6322 +echo "${as_me-configure}:7646: 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
    63236497 
    63246498                 cf_cv_find_linkage_utf8=yes
    63256499                 cf_cv_library_file_utf8="-lutf8"
    6326 @@ -7336,7 +7681,7 @@
     6500@@ -7336,7 +7682,7 @@
    63276501 fi
    63286502 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    63296503 fi
    63306504-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
    6331 +echo "$as_me:7684: result: $cf_cv_utf8_lib" >&5
     6505+echo "$as_me:7685: result: $cf_cv_utf8_lib" >&5
    63326506 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
    63336507 
    63346508 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    6335 @@ -7364,13 +7709,13 @@
     6509@@ -7364,13 +7710,13 @@
    63366510                fi
    63376511 
    … …  
    63456519                          cat >conftest.$ac_ext <<_ACEOF
    63466520-#line 7373 "configure"
    6347 +#line 7718 "configure"
     6521+#line 7719 "configure"
    63486522 #include "confdefs.h"
    63496523 #include <stdio.h>
    63506524 int
    6351 @@ -7382,16 +7727,16 @@
     6525@@ -7382,16 +7728,16 @@
    63526526 }
    63536527 _ACEOF
    63546528 rm -f conftest.$ac_objext
    63556529-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
    6356 +if { (eval echo "$as_me:7730: \"$ac_compile\"") >&5
     6530+if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5
    63576531   (eval $ac_compile) 2>&5
    63586532   ac_status=$?
    63596533-  echo "$as_me:7388: \$? = $ac_status" >&5
    6360 +  echo "$as_me:7733: \$? = $ac_status" >&5
     6534+  echo "$as_me:7734: \$? = $ac_status" >&5
    63616535   (exit $ac_status); } &&
    63626536          { ac_try='test -s conftest.$ac_objext'
    63636537-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
    6364 +  { (eval echo "$as_me:7736: \"$ac_try\"") >&5
     6538+  { (eval echo "$as_me:7737: \"$ac_try\"") >&5
    63656539   (eval $ac_try) 2>&5
    63666540   ac_status=$?
    63676541-  echo "$as_me:7394: \$? = $ac_status" >&5
    6368 +  echo "$as_me:7739: \$? = $ac_status" >&5
     6542+  echo "$as_me:7740: \$? = $ac_status" >&5
    63696543   (exit $ac_status); }; }; then
    63706544   :
    63716545 else
    6372 @@ -7408,13 +7753,13 @@
     6546@@ -7408,13 +7754,13 @@
    63736547                if test "$cf_have_incdir" = no ; then
    63746548                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    63756549 
    63766550-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
    6377 +echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
    6378  
    6379                   CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     6551+echo "${as_me-configure}:7757: testing adding $cf_add_incdir to include-path ..." 1>&5
     6552 
     6553-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     6554+                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    63806555 
    63816556-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
    … …  
    63886563                  break
    63896564                fi
    6390 @@ -7442,7 +7787,7 @@
     6565@@ -7442,7 +7788,7 @@
    63916566       if test "$cf_have_libdir" = no ; then
    63926567         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    63936568 
    63946569-echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
    6395 +echo "${as_me-configure}:7790: 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
    63966571 
    63976572         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    63986573       fi
    6399 @@ -7459,14 +7804,14 @@
     6574@@ -7459,14 +7805,14 @@
    64006575        fi
    64016576 
    64026577 # This is needed on Tru64 5.0 to declare mbstate_t
    64036578-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
    6404 +echo "$as_me:7807: 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
    64056580 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
    64066581 if test "${cf_cv_mbstate_t+set}" = set; then
    … …  
    64106585 cat >conftest.$ac_ext <<_ACEOF
    64116586-#line 7469 "configure"
    6412 +#line 7814 "configure"
     6587+#line 7815 "configure"
    64136588 #include "confdefs.h"
    64146589 
    64156590 #include <stdlib.h>
    6416 @@ -7484,23 +7829,23 @@
     6591@@ -7484,23 +7830,23 @@
    64176592 }
    64186593 _ACEOF
    64196594 rm -f conftest.$ac_objext
    64206595-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
    6421 +if { (eval echo "$as_me:7832: \"$ac_compile\"") >&5
     6596+if { (eval echo "$as_me:7833: \"$ac_compile\"") >&5
    64226597   (eval $ac_compile) 2>&5
    64236598   ac_status=$?
    64246599-  echo "$as_me:7490: \$? = $ac_status" >&5
    6425 +  echo "$as_me:7835: \$? = $ac_status" >&5
     6600+  echo "$as_me:7836: \$? = $ac_status" >&5
    64266601   (exit $ac_status); } &&
    64276602          { ac_try='test -s conftest.$ac_objext'
    64286603-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
    6429 +  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
     6604+  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
    64306605   (eval $ac_try) 2>&5
    64316606   ac_status=$?
    64326607-  echo "$as_me:7496: \$? = $ac_status" >&5
    6433 +  echo "$as_me:7841: \$? = $ac_status" >&5
     6608+  echo "$as_me:7842: \$? = $ac_status" >&5
    64346609   (exit $ac_status); }; }; then
    64356610   cf_cv_mbstate_t=no
    … …  
    64396614 cat >conftest.$ac_ext <<_ACEOF
    64406615-#line 7503 "configure"
    6441 +#line 7848 "configure"
     6616+#line 7849 "configure"
    64426617 #include "confdefs.h"
    64436618 
    64446619 #include <stdlib.h>
    6445 @@ -7519,16 +7864,16 @@
     6620@@ -7519,16 +7865,16 @@
    64466621 }
    64476622 _ACEOF
    64486623 rm -f conftest.$ac_objext
    64496624-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
    6450 +if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
     6625+if { (eval echo "$as_me:7868: \"$ac_compile\"") >&5
    64516626   (eval $ac_compile) 2>&5
    64526627   ac_status=$?
    64536628-  echo "$as_me:7525: \$? = $ac_status" >&5
    6454 +  echo "$as_me:7870: \$? = $ac_status" >&5
     6629+  echo "$as_me:7871: \$? = $ac_status" >&5
    64556630   (exit $ac_status); } &&
    64566631          { ac_try='test -s conftest.$ac_objext'
    64576632-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
    6458 +  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
     6633+  { (eval echo "$as_me:7874: \"$ac_try\"") >&5
    64596634   (eval $ac_try) 2>&5
    64606635   ac_status=$?
    64616636-  echo "$as_me:7531: \$? = $ac_status" >&5
    6462 +  echo "$as_me:7876: \$? = $ac_status" >&5
     6637+  echo "$as_me:7877: \$? = $ac_status" >&5
    64636638   (exit $ac_status); }; }; then
    64646639   cf_cv_mbstate_t=yes
    64656640 else
    6466 @@ -7540,7 +7885,7 @@
     6641@@ -7540,7 +7886,7 @@
    64676642 fi
    64686643 rm -f conftest.$ac_objext conftest.$ac_ext
    64696644 fi
    64706645-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
    6471 +echo "$as_me:7888: result: $cf_cv_mbstate_t" >&5
     6646+echo "$as_me:7889: result: $cf_cv_mbstate_t" >&5
    64726647 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
    64736648 
    64746649 if test "$cf_cv_mbstate_t" = yes ; then
    6475 @@ -7557,14 +7902,14 @@
     6650@@ -7557,14 +7903,14 @@
    64766651 fi
    64776652 
    64786653 # This is needed on Tru64 5.0 to declare wchar_t
    64796654-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
    6480 +echo "$as_me:7905: 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
    64816656 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
    64826657 if test "${cf_cv_wchar_t+set}" = set; then
    … …  
    64866661 cat >conftest.$ac_ext <<_ACEOF
    64876662-#line 7567 "configure"
    6488 +#line 7912 "configure"
     6663+#line 7913 "configure"
    64896664 #include "confdefs.h"
    64906665 
    64916666 #include <stdlib.h>
    6492 @@ -7582,23 +7927,23 @@
     6667@@ -7582,23 +7928,23 @@
    64936668 }
    64946669 _ACEOF
    64956670 rm -f conftest.$ac_objext
    64966671-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
    6497 +if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
     6672+if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5
    64986673   (eval $ac_compile) 2>&5
    64996674   ac_status=$?
    65006675-  echo "$as_me:7588: \$? = $ac_status" >&5
    6501 +  echo "$as_me:7933: \$? = $ac_status" >&5
     6676+  echo "$as_me:7934: \$? = $ac_status" >&5
    65026677   (exit $ac_status); } &&
    65036678          { ac_try='test -s conftest.$ac_objext'
    65046679-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
    6505 +  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
     6680+  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
    65066681   (eval $ac_try) 2>&5
    65076682   ac_status=$?
    65086683-  echo "$as_me:7594: \$? = $ac_status" >&5
    6509 +  echo "$as_me:7939: \$? = $ac_status" >&5
     6684+  echo "$as_me:7940: \$? = $ac_status" >&5
    65106685   (exit $ac_status); }; }; then
    65116686   cf_cv_wchar_t=no
    … …  
    65156690 cat >conftest.$ac_ext <<_ACEOF
    65166691-#line 7601 "configure"
    6517 +#line 7946 "configure"
     6692+#line 7947 "configure"
    65186693 #include "confdefs.h"
    65196694 
    65206695 #include <stdlib.h>
    6521 @@ -7617,16 +7962,16 @@
     6696@@ -7617,16 +7963,16 @@
    65226697 }
    65236698 _ACEOF
    65246699 rm -f conftest.$ac_objext
    65256700-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
    6526 +if { (eval echo "$as_me:7965: \"$ac_compile\"") >&5
     6701+if { (eval echo "$as_me:7966: \"$ac_compile\"") >&5
    65276702   (eval $ac_compile) 2>&5
    65286703   ac_status=$?
    65296704-  echo "$as_me:7623: \$? = $ac_status" >&5
    6530 +  echo "$as_me:7968: \$? = $ac_status" >&5
     6705+  echo "$as_me:7969: \$? = $ac_status" >&5
    65316706   (exit $ac_status); } &&
    65326707          { ac_try='test -s conftest.$ac_objext'
    65336708-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
    6534 +  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
     6709+  { (eval echo "$as_me:7972: \"$ac_try\"") >&5
    65356710   (eval $ac_try) 2>&5
    65366711   ac_status=$?
    65376712-  echo "$as_me:7629: \$? = $ac_status" >&5
    6538 +  echo "$as_me:7974: \$? = $ac_status" >&5
     6713+  echo "$as_me:7975: \$? = $ac_status" >&5
    65396714   (exit $ac_status); }; }; then
    65406715   cf_cv_wchar_t=yes
    65416716 else
    6542 @@ -7638,7 +7983,7 @@
     6717@@ -7638,7 +7984,7 @@
    65436718 fi
    65446719 rm -f conftest.$ac_objext conftest.$ac_ext
    65456720 fi
    65466721-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
    6547 +echo "$as_me:7986: result: $cf_cv_wchar_t" >&5
     6722+echo "$as_me:7987: result: $cf_cv_wchar_t" >&5
    65486723 echo "${ECHO_T}$cf_cv_wchar_t" >&6
    65496724 
    65506725 if test "$cf_cv_wchar_t" = yes ; then
    6551 @@ -7660,14 +8005,14 @@
     6726@@ -7660,14 +8006,14 @@
    65526727 fi
    65536728 
    65546729 # This is needed on Tru64 5.0 to declare wint_t
    65556730-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
    6556 +echo "$as_me:8008: 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
    65576732 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
    65586733 if test "${cf_cv_wint_t+set}" = set; then
    … …  
    65626737 cat >conftest.$ac_ext <<_ACEOF
    65636738-#line 7670 "configure"
    6564 +#line 8015 "configure"
     6739+#line 8016 "configure"
    65656740 #include "confdefs.h"
    65666741 
    65676742 #include <stdlib.h>
    6568 @@ -7685,23 +8030,23 @@
     6743@@ -7685,23 +8031,23 @@
    65696744 }
    65706745 _ACEOF
    65716746 rm -f conftest.$ac_objext
    65726747-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
    6573 +if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
     6748+if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
    65746749   (eval $ac_compile) 2>&5
    65756750   ac_status=$?
    65766751-  echo "$as_me:7691: \$? = $ac_status" >&5
    6577 +  echo "$as_me:8036: \$? = $ac_status" >&5
     6752+  echo "$as_me:8037: \$? = $ac_status" >&5
    65786753   (exit $ac_status); } &&
    65796754          { ac_try='test -s conftest.$ac_objext'
    65806755-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
    6581 +  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
     6756+  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
    65826757   (eval $ac_try) 2>&5
    65836758   ac_status=$?
    65846759-  echo "$as_me:7697: \$? = $ac_status" >&5
    6585 +  echo "$as_me:8042: \$? = $ac_status" >&5
     6760+  echo "$as_me:8043: \$? = $ac_status" >&5
    65866761   (exit $ac_status); }; }; then
    65876762   cf_cv_wint_t=no
    … …  
    65916766 cat >conftest.$ac_ext <<_ACEOF
    65926767-#line 7704 "configure"
    6593 +#line 8049 "configure"
     6768+#line 8050 "configure"
    65946769 #include "confdefs.h"
    65956770 
    65966771 #include <stdlib.h>
    6597 @@ -7720,16 +8065,16 @@
     6772@@ -7720,16 +8066,16 @@
    65986773 }
    65996774 _ACEOF
    66006775 rm -f conftest.$ac_objext
    66016776-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
    6602 +if { (eval echo "$as_me:8068: \"$ac_compile\"") >&5
     6777+if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5
    66036778   (eval $ac_compile) 2>&5
    66046779   ac_status=$?
    66056780-  echo "$as_me:7726: \$? = $ac_status" >&5
    6606 +  echo "$as_me:8071: \$? = $ac_status" >&5
     6781+  echo "$as_me:8072: \$? = $ac_status" >&5
    66076782   (exit $ac_status); } &&
    66086783          { ac_try='test -s conftest.$ac_objext'
    66096784-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
    6610 +  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
     6785+  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
    66116786   (eval $ac_try) 2>&5
    66126787   ac_status=$?
    66136788-  echo "$as_me:7732: \$? = $ac_status" >&5
    6614 +  echo "$as_me:8077: \$? = $ac_status" >&5
     6789+  echo "$as_me:8078: \$? = $ac_status" >&5
    66156790   (exit $ac_status); }; }; then
    66166791   cf_cv_wint_t=yes
    66176792 else
    6618 @@ -7741,7 +8086,7 @@
     6793@@ -7741,7 +8087,7 @@
    66196794 fi
    66206795 rm -f conftest.$ac_objext conftest.$ac_ext
    66216796 fi
    66226797-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
    6623 +echo "$as_me:8089: result: $cf_cv_wint_t" >&5
     6798+echo "$as_me:8090: result: $cf_cv_wint_t" >&5
    66246799 echo "${ECHO_T}$cf_cv_wint_t" >&6
    66256800 
    66266801 if test "$cf_cv_wint_t" = yes ; then
    6627 @@ -7780,7 +8125,7 @@
     6802@@ -7780,7 +8126,7 @@
    66286803        ;;
    66296804 esac
    66306805 
    66316806-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
    6632 +echo "$as_me:8128: 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
    66336808 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
    66346809 
    66356810 # Check whether --enable-lp64 or --disable-lp64 was given.
    6636 @@ -7790,7 +8135,7 @@
     6811@@ -7790,7 +8136,7 @@
    66376812 else
    66386813   with_lp64=$default_with_lp64
    66396814 fi;
    66406815-echo "$as_me:7793: result: $with_lp64" >&5
    6641 +echo "$as_me:8138: result: $with_lp64" >&5
     6816+echo "$as_me:8139: result: $with_lp64" >&5
    66426817 echo "${ECHO_T}$with_lp64" >&6
    66436818 
    66446819 if test "$with_lp64" = yes ; then
    6645 @@ -7806,7 +8151,7 @@
     6820@@ -7806,7 +8152,7 @@
    66466821 fi;
    66476822 if test "$enable_largefile" != no; then
    66486823 
    66496824-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
    6650 +  echo "$as_me:8154: 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
    66516826 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
    66526827 if test "${ac_cv_sys_largefile_CC+set}" = set; then
    66536828   echo $ECHO_N "(cached) $ECHO_C" >&6
    6654 @@ -7818,7 +8163,7 @@
     6829@@ -7818,7 +8164,7 @@
    66556830         # IRIX 6.2 and later do not support large files by default,
    66566831         # so use the C compiler's -n32 option if that helps.
    66576832          cat >conftest.$ac_ext <<_ACEOF
    66586833-#line 7821 "configure"
    6659 +#line 8166 "configure"
     6834+#line 8167 "configure"
    66606835 #include "confdefs.h"
    66616836 #include <sys/types.h>
    66626837  /* Check that off_t can represent 2**63 - 1 correctly.
    6663 @@ -7838,16 +8183,16 @@
     6838@@ -7838,16 +8184,16 @@
    66646839 }
    66656840 _ACEOF
    66666841         rm -f conftest.$ac_objext
    66676842-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
    6668 +if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
     6843+if { (eval echo "$as_me:8187: \"$ac_compile\"") >&5
    66696844   (eval $ac_compile) 2>&5
    66706845   ac_status=$?
    66716846-  echo "$as_me:7844: \$? = $ac_status" >&5
    6672 +  echo "$as_me:8189: \$? = $ac_status" >&5
     6847+  echo "$as_me:8190: \$? = $ac_status" >&5
    66736848   (exit $ac_status); } &&
    66746849          { ac_try='test -s conftest.$ac_objext'
    66756850-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
    6676 +  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
     6851+  { (eval echo "$as_me:8193: \"$ac_try\"") >&5
    66776852   (eval $ac_try) 2>&5
    66786853   ac_status=$?
    66796854-  echo "$as_me:7850: \$? = $ac_status" >&5
    6680 +  echo "$as_me:8195: \$? = $ac_status" >&5
     6855+  echo "$as_me:8196: \$? = $ac_status" >&5
    66816856   (exit $ac_status); }; }; then
    66826857   break
    66836858 else
    6684 @@ -7857,16 +8202,16 @@
     6859@@ -7857,16 +8203,16 @@
    66856860 rm -f conftest.$ac_objext
    66866861         CC="$CC -n32"
    66876862         rm -f conftest.$ac_objext
    66886863-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
    6689 +if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
     6864+if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
    66906865   (eval $ac_compile) 2>&5
    66916866   ac_status=$?
    66926867-  echo "$as_me:7863: \$? = $ac_status" >&5
    6693 +  echo "$as_me:8208: \$? = $ac_status" >&5
     6868+  echo "$as_me:8209: \$? = $ac_status" >&5
    66946869   (exit $ac_status); } &&
    66956870          { ac_try='test -s conftest.$ac_objext'
    66966871-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
    6697 +  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
     6872+  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
    66986873   (eval $ac_try) 2>&5
    66996874   ac_status=$?
    67006875-  echo "$as_me:7869: \$? = $ac_status" >&5
    6701 +  echo "$as_me:8214: \$? = $ac_status" >&5
     6876+  echo "$as_me:8215: \$? = $ac_status" >&5
    67026877   (exit $ac_status); }; }; then
    67036878   ac_cv_sys_largefile_CC=' -n32'; break
    67046879 else
    6705 @@ -7880,13 +8225,13 @@
     6880@@ -7880,13 +8226,13 @@
    67066881        rm -f conftest.$ac_ext
    67076882     fi
    67086883 fi
    67096884-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
    6710 +echo "$as_me:8228: result: $ac_cv_sys_largefile_CC" >&5
     6885+echo "$as_me:8229: result: $ac_cv_sys_largefile_CC" >&5
    67116886 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
    67126887   if test "$ac_cv_sys_largefile_CC" != no; then
    … …  
    67156890 
    67166891-  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    6717 +  echo "$as_me:8234: 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
    67186893 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
    67196894 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    67206895   echo $ECHO_N "(cached) $ECHO_C" >&6
    6721 @@ -7894,7 +8239,7 @@
     6896@@ -7894,7 +8240,7 @@
    67226897   while :; do
    67236898   ac_cv_sys_file_offset_bits=no
    67246899   cat >conftest.$ac_ext <<_ACEOF
    67256900-#line 7897 "configure"
    6726 +#line 8242 "configure"
     6901+#line 8243 "configure"
    67276902 #include "confdefs.h"
    67286903 #include <sys/types.h>
    67296904  /* Check that off_t can represent 2**63 - 1 correctly.
    6730 @@ -7914,16 +8259,16 @@
     6905@@ -7914,16 +8260,16 @@
    67316906 }
    67326907 _ACEOF
    67336908 rm -f conftest.$ac_objext
    67346909-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
    6735 +if { (eval echo "$as_me:8262: \"$ac_compile\"") >&5
     6910+if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5
    67366911   (eval $ac_compile) 2>&5
    67376912   ac_status=$?
    67386913-  echo "$as_me:7920: \$? = $ac_status" >&5
    6739 +  echo "$as_me:8265: \$? = $ac_status" >&5
     6914+  echo "$as_me:8266: \$? = $ac_status" >&5
    67406915   (exit $ac_status); } &&
    67416916          { ac_try='test -s conftest.$ac_objext'
    67426917-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
    6743 +  { (eval echo "$as_me:8268: \"$ac_try\"") >&5
     6918+  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
    67446919   (eval $ac_try) 2>&5
    67456920   ac_status=$?
    67466921-  echo "$as_me:7926: \$? = $ac_status" >&5
    6747 +  echo "$as_me:8271: \$? = $ac_status" >&5
     6922+  echo "$as_me:8272: \$? = $ac_status" >&5
    67486923   (exit $ac_status); }; }; then
    67496924   break
    67506925 else
    6751 @@ -7932,7 +8277,7 @@
     6926@@ -7932,7 +8278,7 @@
    67526927 fi
    67536928 rm -f conftest.$ac_objext conftest.$ac_ext
    67546929   cat >conftest.$ac_ext <<_ACEOF
    67556930-#line 7935 "configure"
    6756 +#line 8280 "configure"
     6931+#line 8281 "configure"
    67576932 #include "confdefs.h"
    67586933 #define _FILE_OFFSET_BITS 64
    67596934 #include <sys/types.h>
    6760 @@ -7953,16 +8298,16 @@
     6935@@ -7953,16 +8299,16 @@
    67616936 }
    67626937 _ACEOF
    67636938 rm -f conftest.$ac_objext
    67646939-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
    6765 +if { (eval echo "$as_me:8301: \"$ac_compile\"") >&5
     6940+if { (eval echo "$as_me:8302: \"$ac_compile\"") >&5
    67666941   (eval $ac_compile) 2>&5
    67676942   ac_status=$?
    67686943-  echo "$as_me:7959: \$? = $ac_status" >&5
    6769 +  echo "$as_me:8304: \$? = $ac_status" >&5
     6944+  echo "$as_me:8305: \$? = $ac_status" >&5
    67706945   (exit $ac_status); } &&
    67716946          { ac_try='test -s conftest.$ac_objext'
    67726947-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
    6773 +  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
     6948+  { (eval echo "$as_me:8308: \"$ac_try\"") >&5
    67746949   (eval $ac_try) 2>&5
    67756950   ac_status=$?
    67766951-  echo "$as_me:7965: \$? = $ac_status" >&5
    6777 +  echo "$as_me:8310: \$? = $ac_status" >&5
     6952+  echo "$as_me:8311: \$? = $ac_status" >&5
    67786953   (exit $ac_status); }; }; then
    67796954   ac_cv_sys_file_offset_bits=64; break
    67806955 else
    6781 @@ -7973,7 +8318,7 @@
     6956@@ -7973,7 +8319,7 @@
    67826957   break
    67836958 done
    67846959 fi
    67856960-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
    6786 +echo "$as_me:8321: result: $ac_cv_sys_file_offset_bits" >&5
     6961+echo "$as_me:8322: result: $ac_cv_sys_file_offset_bits" >&5
    67876962 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
    67886963 if test "$ac_cv_sys_file_offset_bits" != no; then
    67896964 
    6790 @@ -7983,7 +8328,7 @@
     6965@@ -7983,7 +8329,7 @@
    67916966 
    67926967 fi
    67936968 rm -f conftest*
    67946969-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
    6795 +  echo "$as_me:8331: 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
    67966971 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
    67976972 if test "${ac_cv_sys_large_files+set}" = set; then
    67986973   echo $ECHO_N "(cached) $ECHO_C" >&6
    6799 @@ -7991,7 +8336,7 @@
     6974@@ -7991,7 +8337,7 @@
    68006975   while :; do
    68016976   ac_cv_sys_large_files=no
    68026977   cat >conftest.$ac_ext <<_ACEOF
    68036978-#line 7994 "configure"
    6804 +#line 8339 "configure"
     6979+#line 8340 "configure"
    68056980 #include "confdefs.h"
    68066981 #include <sys/types.h>
    68076982  /* Check that off_t can represent 2**63 - 1 correctly.
    6808 @@ -8011,16 +8356,16 @@
     6983@@ -8011,16 +8357,16 @@
    68096984 }
    68106985 _ACEOF
    68116986 rm -f conftest.$ac_objext
    68126987-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
    6813 +if { (eval echo "$as_me:8359: \"$ac_compile\"") >&5
     6988+if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
    68146989   (eval $ac_compile) 2>&5
    68156990   ac_status=$?
    68166991-  echo "$as_me:8017: \$? = $ac_status" >&5
    6817 +  echo "$as_me:8362: \$? = $ac_status" >&5
     6992+  echo "$as_me:8363: \$? = $ac_status" >&5
    68186993   (exit $ac_status); } &&
    68196994          { ac_try='test -s conftest.$ac_objext'
    68206995-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
    6821 +  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
     6996+  { (eval echo "$as_me:8366: \"$ac_try\"") >&5
    68226997   (eval $ac_try) 2>&5
    68236998   ac_status=$?
    68246999-  echo "$as_me:8023: \$? = $ac_status" >&5
    6825 +  echo "$as_me:8368: \$? = $ac_status" >&5
     7000+  echo "$as_me:8369: \$? = $ac_status" >&5
    68267001   (exit $ac_status); }; }; then
    68277002   break
    68287003 else
    6829 @@ -8029,7 +8374,7 @@
     7004@@ -8029,7 +8375,7 @@
    68307005 fi
    68317006 rm -f conftest.$ac_objext conftest.$ac_ext
    68327007   cat >conftest.$ac_ext <<_ACEOF
    68337008-#line 8032 "configure"
    6834 +#line 8377 "configure"
     7009+#line 8378 "configure"
    68357010 #include "confdefs.h"
    68367011 #define _LARGE_FILES 1
    68377012 #include <sys/types.h>
    6838 @@ -8050,16 +8395,16 @@
     7013@@ -8050,16 +8396,16 @@
    68397014 }
    68407015 _ACEOF
    68417016 rm -f conftest.$ac_objext
    68427017-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
    6843 +if { (eval echo "$as_me:8398: \"$ac_compile\"") >&5
     7018+if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5
    68447019   (eval $ac_compile) 2>&5
    68457020   ac_status=$?
    68467021-  echo "$as_me:8056: \$? = $ac_status" >&5
    6847 +  echo "$as_me:8401: \$? = $ac_status" >&5
     7022+  echo "$as_me:8402: \$? = $ac_status" >&5
    68487023   (exit $ac_status); } &&
    68497024          { ac_try='test -s conftest.$ac_objext'
    68507025-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
    6851 +  { (eval echo "$as_me:8404: \"$ac_try\"") >&5
     7026+  { (eval echo "$as_me:8405: \"$ac_try\"") >&5
    68527027   (eval $ac_try) 2>&5
    68537028   ac_status=$?
    68547029-  echo "$as_me:8062: \$? = $ac_status" >&5
    6855 +  echo "$as_me:8407: \$? = $ac_status" >&5
     7030+  echo "$as_me:8408: \$? = $ac_status" >&5
    68567031   (exit $ac_status); }; }; then
    68577032   ac_cv_sys_large_files=1; break
    68587033 else
    6859 @@ -8070,7 +8415,7 @@
     7034@@ -8070,7 +8416,7 @@
    68607035   break
    68617036 done
    68627037 fi
    68637038-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
    6864 +echo "$as_me:8418: result: $ac_cv_sys_large_files" >&5
     7039+echo "$as_me:8419: result: $ac_cv_sys_large_files" >&5
    68657040 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
    68667041 if test "$ac_cv_sys_large_files" != no; then
    68677042 
    6868 @@ -8083,7 +8428,7 @@
     7043@@ -8083,7 +8429,7 @@
    68697044 fi
    68707045 
    68717046     if test "$enable_largefile" != no ; then
    68727047-       echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    6873 +       echo "$as_me:8431: 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
    68747049 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
    68757050 if test "${ac_cv_sys_largefile_source+set}" = set; then
    68767051   echo $ECHO_N "(cached) $ECHO_C" >&6
    6877 @@ -8091,7 +8436,7 @@
     7052@@ -8091,7 +8437,7 @@
    68787053   while :; do
    68797054   ac_cv_sys_largefile_source=no
    68807055   cat >conftest.$ac_ext <<_ACEOF
    68817056-#line 8094 "configure"
    6882 +#line 8439 "configure"
     7057+#line 8440 "configure"
    68837058 #include "confdefs.h"
    68847059 #include <stdio.h>
    68857060 int
    6886 @@ -8103,16 +8448,16 @@
     7061@@ -8103,16 +8449,16 @@
    68877062 }
    68887063 _ACEOF
    68897064 rm -f conftest.$ac_objext
    68907065-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
    6891 +if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
     7066+if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5
    68927067   (eval $ac_compile) 2>&5
    68937068   ac_status=$?
    68947069-  echo "$as_me:8109: \$? = $ac_status" >&5
    6895 +  echo "$as_me:8454: \$? = $ac_status" >&5
     7070+  echo "$as_me:8455: \$? = $ac_status" >&5
    68967071   (exit $ac_status); } &&
    68977072          { ac_try='test -s conftest.$ac_objext'
    68987073-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
    6899 +  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
     7074+  { (eval echo "$as_me:8458: \"$ac_try\"") >&5
    69007075   (eval $ac_try) 2>&5
    69017076   ac_status=$?
    69027077-  echo "$as_me:8115: \$? = $ac_status" >&5
    6903 +  echo "$as_me:8460: \$? = $ac_status" >&5
     7078+  echo "$as_me:8461: \$? = $ac_status" >&5
    69047079   (exit $ac_status); }; }; then
    69057080   break
    69067081 else
    6907 @@ -8121,7 +8466,7 @@
     7082@@ -8121,7 +8467,7 @@
    69087083 fi
    69097084 rm -f conftest.$ac_objext conftest.$ac_ext
    69107085   cat >conftest.$ac_ext <<_ACEOF
    69117086-#line 8124 "configure"
    6912 +#line 8469 "configure"
     7087+#line 8470 "configure"
    69137088 #include "confdefs.h"
    69147089 #define _LARGEFILE_SOURCE 1
    69157090 #include <stdio.h>
    6916 @@ -8134,16 +8479,16 @@
     7091@@ -8134,16 +8480,16 @@
    69177092 }
    69187093 _ACEOF
    69197094 rm -f conftest.$ac_objext
    69207095-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
    6921 +if { (eval echo "$as_me:8482: \"$ac_compile\"") >&5
     7096+if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5
    69227097   (eval $ac_compile) 2>&5
    69237098   ac_status=$?
    69247099-  echo "$as_me:8140: \$? = $ac_status" >&5
    6925 +  echo "$as_me:8485: \$? = $ac_status" >&5
     7100+  echo "$as_me:8486: \$? = $ac_status" >&5
    69267101   (exit $ac_status); } &&
    69277102          { ac_try='test -s conftest.$ac_objext'
    69287103-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
    6929 +  { (eval echo "$as_me:8488: \"$ac_try\"") >&5
     7104+  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
    69307105   (eval $ac_try) 2>&5
    69317106   ac_status=$?
    69327107-  echo "$as_me:8146: \$? = $ac_status" >&5
    6933 +  echo "$as_me:8491: \$? = $ac_status" >&5
     7108+  echo "$as_me:8492: \$? = $ac_status" >&5
    69347109   (exit $ac_status); }; }; then
    69357110   ac_cv_sys_largefile_source=1; break
    69367111 else
    6937 @@ -8154,7 +8499,7 @@
     7112@@ -8154,7 +8500,7 @@
    69387113   break
    69397114 done
    69407115 fi
    69417116-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
    6942 +echo "$as_me:8502: result: $ac_cv_sys_largefile_source" >&5
     7117+echo "$as_me:8503: result: $ac_cv_sys_largefile_source" >&5
    69437118 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
    69447119 if test "$ac_cv_sys_largefile_source" != no; then
    69457120 
    6946 @@ -8168,13 +8513,13 @@
     7121@@ -8168,13 +8514,13 @@
    69477122 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
    69487123 # in glibc 2.1.3, but that breaks too many other things.
    69497124 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
    69507125-echo "$as_me:8171: checking for fseeko" >&5
    6951 +echo "$as_me:8516: checking for fseeko" >&5
     7126+echo "$as_me:8517: checking for fseeko" >&5
    69527127 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
    69537128 if test "${ac_cv_func_fseeko+set}" = set; then
    … …  
    69567131   cat >conftest.$ac_ext <<_ACEOF
    69577132-#line 8177 "configure"
    6958 +#line 8522 "configure"
     7133+#line 8523 "configure"
    69597134 #include "confdefs.h"
    69607135 #include <stdio.h>
    69617136 int
    6962 @@ -8186,16 +8531,16 @@
     7137@@ -8186,16 +8532,16 @@
    69637138 }
    69647139 _ACEOF
    69657140 rm -f conftest.$ac_objext conftest$ac_exeext
    69667141-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
    6967 +if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
     7142+if { (eval echo "$as_me:8535: \"$ac_link\"") >&5
    69687143   (eval $ac_link) 2>&5
    69697144   ac_status=$?
    69707145-  echo "$as_me:8192: \$? = $ac_status" >&5
    6971 +  echo "$as_me:8537: \$? = $ac_status" >&5
     7146+  echo "$as_me:8538: \$? = $ac_status" >&5
    69727147   (exit $ac_status); } &&
    69737148          { ac_try='test -s conftest$ac_exeext'
    69747149-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
    6975 +  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
     7150+  { (eval echo "$as_me:8541: \"$ac_try\"") >&5
    69767151   (eval $ac_try) 2>&5
    69777152   ac_status=$?
    69787153-  echo "$as_me:8198: \$? = $ac_status" >&5
    6979 +  echo "$as_me:8543: \$? = $ac_status" >&5
     7154+  echo "$as_me:8544: \$? = $ac_status" >&5
    69807155   (exit $ac_status); }; }; then
    69817156   ac_cv_func_fseeko=yes
    69827157 else
    6983 @@ -8205,7 +8550,7 @@
     7158@@ -8205,7 +8551,7 @@
    69847159 fi
    69857160 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    69867161 fi
    69877162-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
    6988 +echo "$as_me:8553: result: $ac_cv_func_fseeko" >&5
     7163+echo "$as_me:8554: result: $ac_cv_func_fseeko" >&5
    69897164 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
    69907165 if test $ac_cv_func_fseeko = yes; then
    69917166 
    6992 @@ -8226,14 +8571,14 @@
     7167@@ -8226,14 +8572,14 @@
    69937168        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
    69947169        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
    69957170 
    69967171-       echo "$as_me:8229: checking whether to use struct dirent64" >&5
    6997 +       echo "$as_me:8574: checking whether to use struct dirent64" >&5
     7172+       echo "$as_me:8575: checking whether to use struct dirent64" >&5
    69987173 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
    69997174 if test "${cf_cv_struct_dirent64+set}" = set; then
    … …  
    70037178                cat >conftest.$ac_ext <<_ACEOF
    70047179-#line 8236 "configure"
    7005 +#line 8581 "configure"
     7180+#line 8582 "configure"
    70067181 #include "confdefs.h"
    70077182 
    70087183 #include <sys/types.h>
    7009 @@ -8254,16 +8599,16 @@
     7184@@ -8254,16 +8600,16 @@
    70107185 }
    70117186 _ACEOF
    70127187 rm -f conftest.$ac_objext
    70137188-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
    7014 +if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
     7189+if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5
    70157190   (eval $ac_compile) 2>&5
    70167191   ac_status=$?
    70177192-  echo "$as_me:8260: \$? = $ac_status" >&5
    7018 +  echo "$as_me:8605: \$? = $ac_status" >&5
     7193+  echo "$as_me:8606: \$? = $ac_status" >&5
    70197194   (exit $ac_status); } &&
    70207195          { ac_try='test -s conftest.$ac_objext'
    70217196-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
    7022 +  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
     7197+  { (eval echo "$as_me:8609: \"$ac_try\"") >&5
    70237198   (eval $ac_try) 2>&5
    70247199   ac_status=$?
    70257200-  echo "$as_me:8266: \$? = $ac_status" >&5
    7026 +  echo "$as_me:8611: \$? = $ac_status" >&5
     7201+  echo "$as_me:8612: \$? = $ac_status" >&5
    70277202   (exit $ac_status); }; }; then
    70287203   cf_cv_struct_dirent64=yes
    70297204 else
    7030 @@ -8274,7 +8619,7 @@
     7205@@ -8274,7 +8620,7 @@
    70317206 rm -f conftest.$ac_objext conftest.$ac_ext
    70327207 
    70337208 fi
    70347209-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
    7035 +echo "$as_me:8622: result: $cf_cv_struct_dirent64" >&5
     7210+echo "$as_me:8623: result: $cf_cv_struct_dirent64" >&5
    70367211 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
    70377212        test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
    70387213 #define HAVE_STRUCT_DIRENT64 1
    7039 @@ -8283,7 +8628,7 @@
     7214@@ -8283,7 +8629,7 @@
    70407215     fi
    70417216 
    70427217 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
    70437218-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    7044 +echo "$as_me:8631: 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
    70457220 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
    70467221 
    70477222 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
    7048 @@ -8293,14 +8638,14 @@
     7223@@ -8293,14 +8639,14 @@
    70497224 else
    70507225   with_tparm_varargs=yes
    70517226 fi;
    70527227-echo "$as_me:8296: result: $with_tparm_varargs" >&5
    7053 +echo "$as_me:8641: result: $with_tparm_varargs" >&5
     7228+echo "$as_me:8642: result: $with_tparm_varargs" >&5
    70547229 echo "${ECHO_T}$with_tparm_varargs" >&6
    70557230 NCURSES_TPARM_VARARGS=0
    … …  
    70597234 if test "$with_ticlib" != no ; then
    70607235-echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    7061 +echo "$as_me:8648: 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
    70627237 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
    70637238 
    70647239 # Check whether --enable-tic-depends or --disable-tic-depends was given.
    7065 @@ -8310,14 +8655,14 @@
     7240@@ -8310,14 +8656,14 @@
    70667241 else
    70677242   with_tic_depends=yes
    70687243 fi;
    70697244-echo "$as_me:8313: result: $with_tic_depends" >&5
    7070 +echo "$as_me:8658: result: $with_tic_depends" >&5
     7245+echo "$as_me:8659: result: $with_tic_depends" >&5
    70717246 echo "${ECHO_T}$with_tic_depends" >&6
    70727247 else
    … …  
    70767251 ###   use option --with-bool to override bool's type
    70777252-echo "$as_me:8320: checking for type of bool" >&5
    7078 +echo "$as_me:8665: checking for type of bool" >&5
     7253+echo "$as_me:8666: checking for type of bool" >&5
    70797254 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
    70807255 
    70817256 # Check whether --with-bool or --without-bool was given.
    7082 @@ -8327,10 +8672,10 @@
     7257@@ -8327,10 +8673,10 @@
    70837258 else
    70847259   NCURSES_BOOL=auto
    70857260 fi;
    70867261-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
    7087 +echo "$as_me:8675: result: $NCURSES_BOOL" >&5
     7262+echo "$as_me:8676: result: $NCURSES_BOOL" >&5
    70887263 echo "${ECHO_T}$NCURSES_BOOL" >&6
    70897264 
    70907265-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
    7091 +echo "$as_me:8678: checking for alternate terminal capabilities file" >&5
     7266+echo "$as_me:8679: checking for alternate terminal capabilities file" >&5
    70927267 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
    70937268 
    70947269 # Check whether --with-caps or --without-caps was given.
    7095 @@ -8341,11 +8686,11 @@
     7270@@ -8341,11 +8687,11 @@
    70967271   TERMINFO_CAPS=Caps
    70977272 fi;
    70987273 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
    70997274-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
    7100 +echo "$as_me:8689: result: $TERMINFO_CAPS" >&5
     7275+echo "$as_me:8690: result: $TERMINFO_CAPS" >&5
    71017276 echo "${ECHO_T}$TERMINFO_CAPS" >&6
    71027277 
    71037278 ###   use option --with-chtype to override chtype's type
    71047279-echo "$as_me:8348: checking for type of chtype" >&5
    7105 +echo "$as_me:8693: checking for type of chtype" >&5
     7280+echo "$as_me:8694: checking for type of chtype" >&5
    71067281 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    71077282 
    71087283 # Check whether --with-chtype or --without-chtype was given.
    7109 @@ -8355,11 +8700,11 @@
     7284@@ -8355,11 +8701,11 @@
    71107285 else
    71117286   NCURSES_CHTYPE=auto
    71127287 fi;
    71137288-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
    7114 +echo "$as_me:8703: result: $NCURSES_CHTYPE" >&5
     7289+echo "$as_me:8704: result: $NCURSES_CHTYPE" >&5
    71157290 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
    71167291 
    71177292 ###   use option --with-ospeed to override ospeed's type
    71187293-echo "$as_me:8362: checking for type of ospeed" >&5
    7119 +echo "$as_me:8707: checking for type of ospeed" >&5
     7294+echo "$as_me:8708: checking for type of ospeed" >&5
    71207295 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
    71217296 
    71227297 # Check whether --with-ospeed or --without-ospeed was given.
    7123 @@ -8369,11 +8714,11 @@
     7298@@ -8369,11 +8715,11 @@
    71247299 else
    71257300   NCURSES_OSPEED=short
    71267301 fi;
    71277302-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
    7128 +echo "$as_me:8717: result: $NCURSES_OSPEED" >&5
     7303+echo "$as_me:8718: result: $NCURSES_OSPEED" >&5
    71297304 echo "${ECHO_T}$NCURSES_OSPEED" >&6
    71307305 
    71317306 ###   use option --with-mmask-t to override mmask_t's type
    71327307-echo "$as_me:8376: checking for type of mmask_t" >&5
    7133 +echo "$as_me:8721: checking for type of mmask_t" >&5
     7308+echo "$as_me:8722: checking for type of mmask_t" >&5
    71347309 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
    71357310 
    71367311 # Check whether --with-mmask-t or --without-mmask-t was given.
    7137 @@ -8383,11 +8728,11 @@
     7312@@ -8383,11 +8729,11 @@
    71387313 else
    71397314   NCURSES_MMASK_T=auto
    71407315 fi;
    71417316-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
    7142 +echo "$as_me:8731: result: $NCURSES_MMASK_T" >&5
     7317+echo "$as_me:8732: result: $NCURSES_MMASK_T" >&5
    71437318 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
    71447319 
    71457320 ### Enable compiling-in rcs id's
    71467321-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
    7147 +echo "$as_me:8735: checking if RCS identifiers should be compiled-in" >&5
     7322+echo "$as_me:8736: checking if RCS identifiers should be compiled-in" >&5
    71487323 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
    71497324 
    71507325 # Check whether --with-rcs-ids or --without-rcs-ids was given.
    7151 @@ -8397,7 +8742,7 @@
     7326@@ -8397,7 +8743,7 @@
    71527327 else
    71537328   with_rcs_ids=no
    71547329 fi;
    71557330-echo "$as_me:8400: result: $with_rcs_ids" >&5
    7156 +echo "$as_me:8745: result: $with_rcs_ids" >&5
     7331+echo "$as_me:8746: result: $with_rcs_ids" >&5
    71577332 echo "${ECHO_T}$with_rcs_ids" >&6
    71587333 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
    71597334 #define USE_RCS_IDS 1
    7160 @@ -8405,7 +8750,7 @@
     7335@@ -8405,7 +8751,7 @@
    71617336 
    71627337 ###############################################################################
    71637338 
    71647339-echo "$as_me:8408: checking format of man-pages" >&5
    7165 +echo "$as_me:8753: checking format of man-pages" >&5
     7340+echo "$as_me:8754: checking format of man-pages" >&5
    71667341 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
    71677342 
    71687343 # Check whether --with-manpage-format or --without-manpage-format was given.
    7169 @@ -8494,14 +8839,14 @@
     7344@@ -8433,7 +8779,7 @@
     7345   cf_catonly=yes
     7346   cf_example=date
     7347 
     7348-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
     7349+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
     7350   for cf_dir in $MANPATH; do
     7351     test -z "$cf_dir" && cf_dir=/usr/man
     7352     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 @@
    71707354   ;;
    71717355 esac
    71727356 
    71737357-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
    7174 +echo "$as_me:8842: result: $MANPAGE_FORMAT" >&5
     7358+echo "$as_me:8843: result: $MANPAGE_FORMAT" >&5
    71757359 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
    71767360 if test -n "$cf_unknown" ; then
    71777361-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
    7178 +  { echo "$as_me:8845: WARNING: Unexpected manpage-format $cf_unknown" >&5
     7362+  { echo "$as_me:8846: WARNING: Unexpected manpage-format $cf_unknown" >&5
    71797363 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
    71807364 fi
    71817365 
    71827366-echo "$as_me:8504: checking for manpage renaming" >&5
    7183 +echo "$as_me:8849: checking for manpage renaming" >&5
     7367+echo "$as_me:8850: checking for manpage renaming" >&5
    71847368 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
    71857369 
    71867370 # Check whether --with-manpage-renames or --without-manpage-renames was given.
    7187 @@ -8529,7 +8874,7 @@
     7371@@ -8529,7 +8875,7 @@
    71887372   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
    71897373     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
    71907374   elif test ! -f $MANPAGE_RENAMES ; then
    71917375-    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
    7192 +    { { echo "$as_me:8877: error: not a filename: $MANPAGE_RENAMES" >&5
     7376+    { { echo "$as_me:8878: error: not a filename: $MANPAGE_RENAMES" >&5
    71937377 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    71947378    { (exit 1); exit 1; }; }
    71957379   fi
    7196 @@ -8543,10 +8888,10 @@
     7380@@ -8543,10 +8889,10 @@
    71977381   fi
    71987382 fi
    71997383 
    72007384-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
    7201 +echo "$as_me:8891: result: $MANPAGE_RENAMES" >&5
     7385+echo "$as_me:8892: result: $MANPAGE_RENAMES" >&5
    72027386 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
    72037387 
    72047388-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
    7205 +echo "$as_me:8894: checking if manpage aliases will be installed" >&5
     7389+echo "$as_me:8895: checking if manpage aliases will be installed" >&5
    72067390 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
    72077391 
    72087392 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
    7209 @@ -8557,7 +8902,7 @@
     7393@@ -8557,7 +8903,7 @@
    72107394   MANPAGE_ALIASES=yes
    72117395 fi;
    72127396 
    72137397-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
    7214 +echo "$as_me:8905: result: $MANPAGE_ALIASES" >&5
     7398+echo "$as_me:8906: result: $MANPAGE_ALIASES" >&5
    72157399 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
    72167400 
    72177401 if test "$LN_S" = "ln -s"; then
    7218 @@ -8568,7 +8913,7 @@
     7402@@ -8568,7 +8914,7 @@
    72197403 
    72207404 MANPAGE_SYMLINKS=no
    72217405 if test "$MANPAGE_ALIASES" = yes ; then
    72227406-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
    7223 +echo "$as_me:8916: checking if manpage symlinks should be used" >&5
     7407+echo "$as_me:8917: checking if manpage symlinks should be used" >&5
    72247408 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
    72257409 
    72267410 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
    7227 @@ -8581,17 +8926,17 @@
     7411@@ -8581,17 +8927,17 @@
    72287412 
    72297413 if test "$$cf_use_symlinks" = no; then
    72307414 if test "$MANPAGE_SYMLINKS" = yes ; then
    72317415-       { echo "$as_me:8584: WARNING: cannot make symlinks" >&5
    7232 +       { echo "$as_me:8929: WARNING: cannot make symlinks" >&5
     7416+       { echo "$as_me:8930: WARNING: cannot make symlinks" >&5
    72337417 echo "$as_me: WARNING: cannot make symlinks" >&2;}
    72347418        MANPAGE_SYMLINKS=no
    … …  
    72377421 
    72387422-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
    7239 +echo "$as_me:8935: result: $MANPAGE_SYMLINKS" >&5
     7423+echo "$as_me:8936: result: $MANPAGE_SYMLINKS" >&5
    72407424 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
    72417425 fi
    72427426 
    72437427-echo "$as_me:8594: checking for manpage tbl" >&5
    7244 +echo "$as_me:8939: checking for manpage tbl" >&5
     7428+echo "$as_me:8940: checking for manpage tbl" >&5
    72457429 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
    72467430 
    72477431 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
    7248 @@ -8602,7 +8947,7 @@
     7432@@ -8602,7 +8948,7 @@
    72497433   MANPAGE_TBL=no
    72507434 fi;
    72517435 
    72527436-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
    7253 +echo "$as_me:8950: result: $MANPAGE_TBL" >&5
     7437+echo "$as_me:8951: result: $MANPAGE_TBL" >&5
    72547438 echo "${ECHO_T}$MANPAGE_TBL" >&6
    72557439 
    72567440   if test "$prefix" = "NONE" ; then
    7257 @@ -8718,7 +9063,7 @@
     7441@@ -8718,7 +9064,7 @@
    72587442                s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
    72597443 CF_EOF
    … …  
    72647448                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    72657449                cf_name=`echo $cf_name|sed "$program_transform_name"`
    7266 @@ -8913,7 +9258,7 @@
     7450@@ -8913,7 +9259,7 @@
    72677451 ###############################################################################
    72687452 
    72697453 ### Note that some functions (such as const) are normally disabled anyway.
    72707454-echo "$as_me:8916: checking if you want to build with function extensions" >&5
    7271 +echo "$as_me:9261: 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
    72727456 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
    72737457 
    72747458 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
    7275 @@ -8923,7 +9268,7 @@
     7459@@ -8923,7 +9269,7 @@
    72767460 else
    72777461   with_ext_funcs=yes
    72787462 fi;
    72797463-echo "$as_me:8926: result: $with_ext_funcs" >&5
    7280 +echo "$as_me:9271: result: $with_ext_funcs" >&5
     7464+echo "$as_me:9272: result: $with_ext_funcs" >&5
    72817465 echo "${ECHO_T}$with_ext_funcs" >&6
    72827466 if test "$with_ext_funcs" = yes ; then
    72837467        NCURSES_EXT_FUNCS=1
    7284 @@ -8955,12 +9300,14 @@
     7468@@ -8955,12 +9301,38 @@
    72857469 #define NCURSES_EXT_FUNCS 1
    72867470 EOF
    … …  
    72907474        NCURSES_EXT_FUNCS=0
    72917475+       GENERATED_EXT_FUNCS=
     7476+fi
     7477+
     7478+echo "$as_me:9310: checking if you want to build with experimental SCREEN extensions" >&5
     7479+echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6
     7480+
     7481+# Check whether --enable-sp-funcs or --disable-sp-funcs was given.
     7482+if test "${enable_sp_funcs+set}" = set; then
     7483+  enableval="$enable_sp_funcs"
     7484+  with_sp_funcs=$enableval
     7485+else
     7486+  with_sp_funcs=no
     7487+fi;
     7488+echo "$as_me:9320: result: $with_sp_funcs" >&5
     7489+echo "${ECHO_T}$with_sp_funcs" >&6
     7490+if test "$with_sp_funcs" = yes ; then
     7491+       NCURSES_SP_FUNCS=1
     7492+       cat >>confdefs.h <<\EOF
     7493+#define NCURSES_SP_FUNCS 1
     7494+EOF
     7495+
     7496+       GENERATED_SP_FUNCS=generated
     7497+else
     7498+       NCURSES_SP_FUNCS=0
     7499+       GENERATED_SP_FUNCS=
    72927500 fi
    72937501 
    72947502 ###   use option --enable-const to turn on use of const beyond that in XSI.
    72957503-echo "$as_me:8963: checking for extended use of const keyword" >&5
    7296 +echo "$as_me:9310: checking for extended use of const keyword" >&5
     7504+echo "$as_me:9335: checking for extended use of const keyword" >&5
    72977505 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
    72987506 
    72997507 # Check whether --enable-const or --disable-const was given.
    7300 @@ -8970,7 +9317,7 @@
     7508@@ -8970,7 +9342,7 @@
    73017509 else
    73027510   with_ext_const=no
    73037511 fi;
    73047512-echo "$as_me:8973: result: $with_ext_const" >&5
    7305 +echo "$as_me:9320: result: $with_ext_const" >&5
     7513+echo "$as_me:9345: result: $with_ext_const" >&5
    73067514 echo "${ECHO_T}$with_ext_const" >&6
    73077515 NCURSES_CONST='/*nothing*/'
    73087516 if test "$with_ext_const" = yes ; then
    7309 @@ -8978,7 +9325,7 @@
     7517@@ -8978,7 +9350,7 @@
    73107518 fi
    73117519 
    73127520 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
    73137521-echo "$as_me:8981: checking if you want to use extended colors" >&5
    7314 +echo "$as_me:9328: checking if you want to use extended colors" >&5
     7522+echo "$as_me:9353: checking if you want to use extended colors" >&5
    73157523 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
    73167524 
    73177525 # Check whether --enable-ext-colors or --disable-ext-colors was given.
    7318 @@ -8988,12 +9335,12 @@
     7526@@ -8988,12 +9360,12 @@
    73197527 else
    73207528   with_ext_colors=no
    73217529 fi;
    73227530-echo "$as_me:8991: result: $with_ext_colors" >&5
    7323 +echo "$as_me:9338: result: $with_ext_colors" >&5
     7531+echo "$as_me:9363: result: $with_ext_colors" >&5
    73247532 echo "${ECHO_T}$with_ext_colors" >&6
    73257533 NCURSES_EXT_COLORS=0
    … …  
    73277535        if test "$with_widec" != yes ; then
    73287536-               { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
    7329 +               { { echo "$as_me:9343: 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
    73307538 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    73317539    { (exit 1); exit 1; }; }
    73327540        else
    7333 @@ -9004,7 +9351,7 @@
     7541@@ -9004,7 +9376,7 @@
    73347542        5.*)
    73357543                cf_cv_rel_version=6.0
    73367544                cf_cv_abi_version=6
    73377545-               { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7338 +               { echo "$as_me:9354: 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
    73397547 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    73407548                ;;
    73417549        esac
    7342 @@ -9019,7 +9366,7 @@
     7550@@ -9019,7 +9391,7 @@
    73437551 fi
    73447552 
    73457553 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
    73467554-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
    7347 +echo "$as_me:9369: 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
    73487556 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
    73497557 
    73507558 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
    7351 @@ -9029,7 +9376,7 @@
     7559@@ -9029,7 +9401,7 @@
    73527560 else
    73537561   with_ext_mouse=no
    73547562 fi;
    73557563-echo "$as_me:9032: result: $with_ext_mouse" >&5
    7356 +echo "$as_me:9379: result: $with_ext_mouse" >&5
     7564+echo "$as_me:9404: result: $with_ext_mouse" >&5
    73577565 echo "${ECHO_T}$with_ext_mouse" >&6
    73587566 NCURSES_MOUSE_VERSION=1
    73597567 if test "$with_ext_mouse" = yes ; then
    7360 @@ -9040,7 +9387,7 @@
     7568@@ -9040,7 +9412,7 @@
    73617569        5.*)
    73627570                cf_cv_rel_version=6.0
    73637571                cf_cv_abi_version=6
    73647572-               { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7365 +               { echo "$as_me:9390: 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
    73667574 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    73677575                ;;
    73687576        esac
    7369 @@ -9048,7 +9395,7 @@
     7577@@ -9048,7 +9420,7 @@
    73707578 
    73717579 fi
    73727580 
    73737581-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
    7374 +echo "$as_me:9398: checking if you want \$NCURSES_NO_PADDING code" >&5
     7582+echo "$as_me:9423: checking if you want \$NCURSES_NO_PADDING code" >&5
    73757583 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
    73767584 
    73777585 # Check whether --enable-no-padding or --disable-no-padding was given.
    7378 @@ -9058,19 +9405,19 @@
     7586@@ -9058,19 +9430,19 @@
    73797587 else
    73807588   with_no_padding=$with_ext_funcs
    73817589 fi;
    73827590-echo "$as_me:9061: result: $with_no_padding" >&5
    7383 +echo "$as_me:9408: result: $with_no_padding" >&5
     7591+echo "$as_me:9433: result: $with_no_padding" >&5
    73847592 echo "${ECHO_T}$with_no_padding" >&6
    73857593 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
    … …  
    73887596 
    73897597-echo "$as_me:9067: checking for ANSI C header files" >&5
    7390 +echo "$as_me:9414: checking for ANSI C header files" >&5
     7598+echo "$as_me:9439: checking for ANSI C header files" >&5
    73917599 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    73927600 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    73957603   cat >conftest.$ac_ext <<_ACEOF
    73967604-#line 9073 "configure"
    7397 +#line 9420 "configure"
     7605+#line 9445 "configure"
    73987606 #include "confdefs.h"
    73997607 #include <stdlib.h>
    74007608 #include <stdarg.h>
    7401 @@ -9078,13 +9425,13 @@
     7609@@ -9078,13 +9450,13 @@
    74027610 #include <float.h>
    74037611 
    74047612 _ACEOF
    74057613-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
    7406 +if { (eval echo "$as_me:9428: \"$ac_cpp conftest.$ac_ext\"") >&5
     7614+if { (eval echo "$as_me:9453: \"$ac_cpp conftest.$ac_ext\"") >&5
    74077615   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    74087616   ac_status=$?
    … …  
    74117619   cat conftest.err >&5
    74127620-  echo "$as_me:9087: \$? = $ac_status" >&5
    7413 +  echo "$as_me:9434: \$? = $ac_status" >&5
     7621+  echo "$as_me:9459: \$? = $ac_status" >&5
    74147622   (exit $ac_status); } >/dev/null; then
    74157623   if test -s conftest.err; then
    74167624     ac_cpp_err=$ac_c_preproc_warn_flag
    7417 @@ -9106,7 +9453,7 @@
     7625@@ -9106,7 +9478,7 @@
    74187626 if test $ac_cv_header_stdc = yes; then
    74197627   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    74207628   cat >conftest.$ac_ext <<_ACEOF
    74217629-#line 9109 "configure"
    7422 +#line 9456 "configure"
     7630+#line 9481 "configure"
    74237631 #include "confdefs.h"
    74247632 #include <string.h>
    74257633 
    7426 @@ -9124,7 +9471,7 @@
     7634@@ -9124,7 +9496,7 @@
    74277635 if test $ac_cv_header_stdc = yes; then
    74287636   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    74297637   cat >conftest.$ac_ext <<_ACEOF
    74307638-#line 9127 "configure"
    7431 +#line 9474 "configure"
     7639+#line 9499 "configure"
    74327640 #include "confdefs.h"
    74337641 #include <stdlib.h>
    74347642 
    7435 @@ -9145,7 +9492,7 @@
     7643@@ -9145,7 +9517,7 @@
    74367644   :
    74377645 else
    74387646   cat >conftest.$ac_ext <<_ACEOF
    74397647-#line 9148 "configure"
    7440 +#line 9495 "configure"
     7648+#line 9520 "configure"
    74417649 #include "confdefs.h"
    74427650 #include <ctype.h>
    74437651 #if ((' ' & 0x0FF) == 0x020)
    7444 @@ -9171,15 +9518,15 @@
     7652@@ -9171,15 +9543,15 @@
    74457653 }
    74467654 _ACEOF
    74477655 rm -f conftest$ac_exeext
    74487656-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
    7449 +if { (eval echo "$as_me:9521: \"$ac_link\"") >&5
     7657+if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
    74507658   (eval $ac_link) 2>&5
    74517659   ac_status=$?
    74527660-  echo "$as_me:9177: \$? = $ac_status" >&5
    7453 +  echo "$as_me:9524: \$? = $ac_status" >&5
     7661+  echo "$as_me:9549: \$? = $ac_status" >&5
    74547662   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    74557663-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
    7456 +  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
     7664+  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
    74577665   (eval $ac_try) 2>&5
    74587666   ac_status=$?
    74597667-  echo "$as_me:9182: \$? = $ac_status" >&5
    7460 +  echo "$as_me:9529: \$? = $ac_status" >&5
     7668+  echo "$as_me:9554: \$? = $ac_status" >&5
    74617669   (exit $ac_status); }; }; then
    74627670   :
    74637671 else
    7464 @@ -9192,7 +9539,7 @@
     7672@@ -9192,7 +9564,7 @@
    74657673 fi
    74667674 fi
    74677675 fi
    74687676-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
    7469 +echo "$as_me:9542: result: $ac_cv_header_stdc" >&5
     7677+echo "$as_me:9567: result: $ac_cv_header_stdc" >&5
    74707678 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    74717679 if test $ac_cv_header_stdc = yes; then
    74727680 
    7473 @@ -9208,28 +9555,28 @@
     7681@@ -9208,28 +9580,28 @@
    74747682                   inttypes.h stdint.h unistd.h
    74757683 do
    74767684 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    74777685-echo "$as_me:9211: checking for $ac_header" >&5
    7478 +echo "$as_me:9558: checking for $ac_header" >&5
     7686+echo "$as_me:9583: checking for $ac_header" >&5
    74797687 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    74807688 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    74837691   cat >conftest.$ac_ext <<_ACEOF
    74847692-#line 9217 "configure"
    7485 +#line 9564 "configure"
     7693+#line 9589 "configure"
    74867694 #include "confdefs.h"
    74877695 $ac_includes_default
    … …  
    74907698 rm -f conftest.$ac_objext
    74917699-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
    7492 +if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
     7700+if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5
    74937701   (eval $ac_compile) 2>&5
    74947702   ac_status=$?
    74957703-  echo "$as_me:9226: \$? = $ac_status" >&5
    7496 +  echo "$as_me:9573: \$? = $ac_status" >&5
     7704+  echo "$as_me:9598: \$? = $ac_status" >&5
    74977705   (exit $ac_status); } &&
    74987706          { ac_try='test -s conftest.$ac_objext'
    74997707-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
    7500 +  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
     7708+  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
    75017709   (eval $ac_try) 2>&5
    75027710   ac_status=$?
    75037711-  echo "$as_me:9232: \$? = $ac_status" >&5
    7504 +  echo "$as_me:9579: \$? = $ac_status" >&5
     7712+  echo "$as_me:9604: \$? = $ac_status" >&5
    75057713   (exit $ac_status); }; }; then
    75067714   eval "$as_ac_Header=yes"
    75077715 else
    7508 @@ -9239,7 +9586,7 @@
     7716@@ -9239,7 +9611,7 @@
    75097717 fi
    75107718 rm -f conftest.$ac_objext conftest.$ac_ext
    75117719 fi
    75127720-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7513 +echo "$as_me:9589: result: `eval echo '${'$as_ac_Header'}'`" >&5
     7721+echo "$as_me:9614: result: `eval echo '${'$as_ac_Header'}'`" >&5
    75147722 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    75157723 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    75167724   cat >>confdefs.h <<EOF
    7517 @@ -9249,13 +9596,13 @@
     7725@@ -9249,13 +9621,13 @@
    75187726 fi
    75197727 done
    75207728 
    75217729-echo "$as_me:9252: checking for signed char" >&5
    7522 +echo "$as_me:9599: checking for signed char" >&5
     7730+echo "$as_me:9624: checking for signed char" >&5
    75237731 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
    75247732 if test "${ac_cv_type_signed_char+set}" = set; then
    … …  
    75277735   cat >conftest.$ac_ext <<_ACEOF
    75287736-#line 9258 "configure"
    7529 +#line 9605 "configure"
     7737+#line 9630 "configure"
    75307738 #include "confdefs.h"
    75317739 $ac_includes_default
    75327740 int
    7533 @@ -9270,16 +9617,16 @@
     7741@@ -9270,16 +9642,16 @@
    75347742 }
    75357743 _ACEOF
    75367744 rm -f conftest.$ac_objext
    75377745-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
    7538 +if { (eval echo "$as_me:9620: \"$ac_compile\"") >&5
     7746+if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5
    75397747   (eval $ac_compile) 2>&5
    75407748   ac_status=$?
    75417749-  echo "$as_me:9276: \$? = $ac_status" >&5
    7542 +  echo "$as_me:9623: \$? = $ac_status" >&5
     7750+  echo "$as_me:9648: \$? = $ac_status" >&5
    75437751   (exit $ac_status); } &&
    75447752          { ac_try='test -s conftest.$ac_objext'
    75457753-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
    7546 +  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
     7754+  { (eval echo "$as_me:9651: \"$ac_try\"") >&5
    75477755   (eval $ac_try) 2>&5
    75487756   ac_status=$?
    75497757-  echo "$as_me:9282: \$? = $ac_status" >&5
    7550 +  echo "$as_me:9629: \$? = $ac_status" >&5
     7758+  echo "$as_me:9654: \$? = $ac_status" >&5
    75517759   (exit $ac_status); }; }; then
    75527760   ac_cv_type_signed_char=yes
    75537761 else
    7554 @@ -9289,10 +9636,10 @@
     7762@@ -9289,10 +9661,10 @@
    75557763 fi
    75567764 rm -f conftest.$ac_objext conftest.$ac_ext
    75577765 fi
    75587766-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
    7559 +echo "$as_me:9639: result: $ac_cv_type_signed_char" >&5
     7767+echo "$as_me:9664: result: $ac_cv_type_signed_char" >&5
    75607768 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
    75617769 
    75627770-echo "$as_me:9295: checking size of signed char" >&5
    7563 +echo "$as_me:9642: checking size of signed char" >&5
     7771+echo "$as_me:9667: checking size of signed char" >&5
    75647772 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
    75657773 if test "${ac_cv_sizeof_signed_char+set}" = set; then
    75667774   echo $ECHO_N "(cached) $ECHO_C" >&6
    7567 @@ -9301,7 +9648,7 @@
     7775@@ -9301,7 +9673,7 @@
    75687776   if test "$cross_compiling" = yes; then
    75697777   # Depending upon the size, compute the lo and hi bounds.
    75707778 cat >conftest.$ac_ext <<_ACEOF
    75717779-#line 9304 "configure"
    7572 +#line 9651 "configure"
     7780+#line 9676 "configure"
    75737781 #include "confdefs.h"
    75747782 $ac_includes_default
    75757783 int
    7576 @@ -9313,21 +9660,21 @@
     7784@@ -9313,21 +9685,21 @@
    75777785 }
    75787786 _ACEOF
    75797787 rm -f conftest.$ac_objext
    75807788-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
    7581 +if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
     7789+if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5
    75827790   (eval $ac_compile) 2>&5
    75837791   ac_status=$?
    75847792-  echo "$as_me:9319: \$? = $ac_status" >&5
    7585 +  echo "$as_me:9666: \$? = $ac_status" >&5
     7793+  echo "$as_me:9691: \$? = $ac_status" >&5
    75867794   (exit $ac_status); } &&
    75877795          { ac_try='test -s conftest.$ac_objext'
    75887796-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
    7589 +  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
     7797+  { (eval echo "$as_me:9694: \"$ac_try\"") >&5
    75907798   (eval $ac_try) 2>&5
    75917799   ac_status=$?
    75927800-  echo "$as_me:9325: \$? = $ac_status" >&5
    7593 +  echo "$as_me:9672: \$? = $ac_status" >&5
     7801+  echo "$as_me:9697: \$? = $ac_status" >&5
    75947802   (exit $ac_status); }; }; then
    75957803   ac_lo=0 ac_mid=0
    … …  
    75977805     cat >conftest.$ac_ext <<_ACEOF
    75987806-#line 9330 "configure"
    7599 +#line 9677 "configure"
     7807+#line 9702 "configure"
    76007808 #include "confdefs.h"
    76017809 $ac_includes_default
    76027810 int
    7603 @@ -9339,16 +9686,16 @@
     7811@@ -9339,16 +9711,16 @@
    76047812 }
    76057813 _ACEOF
    76067814 rm -f conftest.$ac_objext
    76077815-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
    7608 +if { (eval echo "$as_me:9689: \"$ac_compile\"") >&5
     7816+if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5
    76097817   (eval $ac_compile) 2>&5
    76107818   ac_status=$?
    76117819-  echo "$as_me:9345: \$? = $ac_status" >&5
    7612 +  echo "$as_me:9692: \$? = $ac_status" >&5
     7820+  echo "$as_me:9717: \$? = $ac_status" >&5
    76137821   (exit $ac_status); } &&
    76147822          { ac_try='test -s conftest.$ac_objext'
    76157823-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
    7616 +  { (eval echo "$as_me:9695: \"$ac_try\"") >&5
     7824+  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
    76177825   (eval $ac_try) 2>&5
    76187826   ac_status=$?
    76197827-  echo "$as_me:9351: \$? = $ac_status" >&5
    7620 +  echo "$as_me:9698: \$? = $ac_status" >&5
     7828+  echo "$as_me:9723: \$? = $ac_status" >&5
    76217829   (exit $ac_status); }; }; then
    76227830   ac_hi=$ac_mid; break
    76237831 else
    7624 @@ -9364,7 +9711,7 @@
     7832@@ -9364,7 +9736,7 @@
    76257833 ac_hi=-1 ac_mid=-1
    76267834   while :; do
    76277835     cat >conftest.$ac_ext <<_ACEOF
    76287836-#line 9367 "configure"
    7629 +#line 9714 "configure"
     7837+#line 9739 "configure"
    76307838 #include "confdefs.h"
    76317839 $ac_includes_default
    76327840 int
    7633 @@ -9376,16 +9723,16 @@
     7841@@ -9376,16 +9748,16 @@
    76347842 }
    76357843 _ACEOF
    76367844 rm -f conftest.$ac_objext
    76377845-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
    7638 +if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
     7846+if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5
    76397847   (eval $ac_compile) 2>&5
    76407848   ac_status=$?
    76417849-  echo "$as_me:9382: \$? = $ac_status" >&5
    7642 +  echo "$as_me:9729: \$? = $ac_status" >&5
     7850+  echo "$as_me:9754: \$? = $ac_status" >&5
    76437851   (exit $ac_status); } &&
    76447852          { ac_try='test -s conftest.$ac_objext'
    76457853-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
    7646 +  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
     7854+  { (eval echo "$as_me:9757: \"$ac_try\"") >&5
    76477855   (eval $ac_try) 2>&5
    76487856   ac_status=$?
    76497857-  echo "$as_me:9388: \$? = $ac_status" >&5
    7650 +  echo "$as_me:9735: \$? = $ac_status" >&5
     7858+  echo "$as_me:9760: \$? = $ac_status" >&5
    76517859   (exit $ac_status); }; }; then
    76527860   ac_lo=$ac_mid; break
    76537861 else
    7654 @@ -9401,7 +9748,7 @@
     7862@@ -9401,7 +9773,7 @@
    76557863 while test "x$ac_lo" != "x$ac_hi"; do
    76567864   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    76577865   cat >conftest.$ac_ext <<_ACEOF
    76587866-#line 9404 "configure"
    7659 +#line 9751 "configure"
     7867+#line 9776 "configure"
    76607868 #include "confdefs.h"
    76617869 $ac_includes_default
    76627870 int
    7663 @@ -9413,16 +9760,16 @@
     7871@@ -9413,16 +9785,16 @@
    76647872 }
    76657873 _ACEOF
    76667874 rm -f conftest.$ac_objext
    76677875-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
    7668 +if { (eval echo "$as_me:9763: \"$ac_compile\"") >&5
     7876+if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5
    76697877   (eval $ac_compile) 2>&5
    76707878   ac_status=$?
    76717879-  echo "$as_me:9419: \$? = $ac_status" >&5
    7672 +  echo "$as_me:9766: \$? = $ac_status" >&5
     7880+  echo "$as_me:9791: \$? = $ac_status" >&5
    76737881   (exit $ac_status); } &&
    76747882          { ac_try='test -s conftest.$ac_objext'
    76757883-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
    7676 +  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
     7884+  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
    76777885   (eval $ac_try) 2>&5
    76787886   ac_status=$?
    76797887-  echo "$as_me:9425: \$? = $ac_status" >&5
    7680 +  echo "$as_me:9772: \$? = $ac_status" >&5
     7888+  echo "$as_me:9797: \$? = $ac_status" >&5
    76817889   (exit $ac_status); }; }; then
    76827890   ac_hi=$ac_mid
    76837891 else
    7684 @@ -9435,12 +9782,12 @@
     7892@@ -9435,12 +9807,12 @@
    76857893 ac_cv_sizeof_signed_char=$ac_lo
    76867894 else
    76877895   if test "$cross_compiling" = yes; then
    76887896-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
    7689 +  { { echo "$as_me:9785: error: cannot run test program while cross compiling" >&5
     7897+  { { echo "$as_me:9810: error: cannot run test program while cross compiling" >&5
    76907898 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    76917899    { (exit 1); exit 1; }; }
    … …  
    76937901   cat >conftest.$ac_ext <<_ACEOF
    76947902-#line 9443 "configure"
    7695 +#line 9790 "configure"
     7903+#line 9815 "configure"
    76967904 #include "confdefs.h"
    76977905 $ac_includes_default
    76987906 int
    7699 @@ -9456,15 +9803,15 @@
     7907@@ -9456,15 +9828,15 @@
    77007908 }
    77017909 _ACEOF
    77027910 rm -f conftest$ac_exeext
    77037911-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
    7704 +if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
     7912+if { (eval echo "$as_me:9831: \"$ac_link\"") >&5
    77057913   (eval $ac_link) 2>&5
    77067914   ac_status=$?
    77077915-  echo "$as_me:9462: \$? = $ac_status" >&5
    7708 +  echo "$as_me:9809: \$? = $ac_status" >&5
     7916+  echo "$as_me:9834: \$? = $ac_status" >&5
    77097917   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    77107918-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
    7711 +  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
     7919+  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
    77127920   (eval $ac_try) 2>&5
    77137921   ac_status=$?
    77147922-  echo "$as_me:9467: \$? = $ac_status" >&5
    7715 +  echo "$as_me:9814: \$? = $ac_status" >&5
     7923+  echo "$as_me:9839: \$? = $ac_status" >&5
    77167924   (exit $ac_status); }; }; then
    77177925   ac_cv_sizeof_signed_char=`cat conftest.val`
    77187926 else
    7719 @@ -9480,7 +9827,7 @@
     7927@@ -9480,7 +9852,7 @@
    77207928   ac_cv_sizeof_signed_char=0
    77217929 fi
    77227930 fi
    77237931-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
    7724 +echo "$as_me:9830: result: $ac_cv_sizeof_signed_char" >&5
     7932+echo "$as_me:9855: result: $ac_cv_sizeof_signed_char" >&5
    77257933 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
    77267934 cat >>confdefs.h <<EOF
    77277935 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
    7728 @@ -9491,7 +9838,7 @@
     7936@@ -9491,7 +9863,7 @@
    77297937 else
    77307938        NCURSES_SBOOL="char"
    77317939 fi
    77327940-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
    7733 +echo "$as_me:9841: 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
    77347942 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
    77357943 
    77367944 # Check whether --enable-signed-char or --disable-signed-char was given.
    7737 @@ -9501,12 +9848,12 @@
     7945@@ -9501,12 +9873,12 @@
    77387946 else
    77397947   with_signed_char=no
    77407948 fi;
    77417949-echo "$as_me:9504: result: $with_signed_char" >&5
    7742 +echo "$as_me:9851: result: $with_signed_char" >&5
     7950+echo "$as_me:9876: result: $with_signed_char" >&5
    77437951 echo "${ECHO_T}$with_signed_char" >&6
    77447952 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
    … …  
    77467954 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
    77477955-echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
    7748 +echo "$as_me:9856: checking if you want SIGWINCH handler" >&5
     7956+echo "$as_me:9881: checking if you want SIGWINCH handler" >&5
    77497957 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
    77507958 
    77517959 # Check whether --enable-sigwinch or --disable-sigwinch was given.
    7752 @@ -9516,14 +9863,14 @@
     7960@@ -9516,14 +9888,14 @@
    77537961 else
    77547962   with_sigwinch=$with_ext_funcs
    77557963 fi;
    77567964-echo "$as_me:9519: result: $with_sigwinch" >&5
    7757 +echo "$as_me:9866: result: $with_sigwinch" >&5
     7965+echo "$as_me:9891: result: $with_sigwinch" >&5
    77587966 echo "${ECHO_T}$with_sigwinch" >&6
    77597967 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
    … …  
    77637971 ###   use option --enable-tcap-names to allow user to define new capabilities
    77647972-echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
    7765 +echo "$as_me:9873: 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
    77667974 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
    77677975 
    77687976 # Check whether --enable-tcap-names or --disable-tcap-names was given.
    7769 @@ -9533,7 +9880,7 @@
     7977@@ -9533,7 +9905,7 @@
    77707978 else
    77717979   with_tcap_names=$with_ext_funcs
    77727980 fi;
    77737981-echo "$as_me:9536: result: $with_tcap_names" >&5
    7774 +echo "$as_me:9883: result: $with_tcap_names" >&5
     7982+echo "$as_me:9908: result: $with_tcap_names" >&5
    77757983 echo "${ECHO_T}$with_tcap_names" >&6
    77767984 NCURSES_XNAMES=0
    77777985 test "$with_tcap_names" = yes && NCURSES_XNAMES=1
    7778 @@ -9541,7 +9888,7 @@
     7986@@ -9541,7 +9913,7 @@
    77797987 ###############################################################################
    77807988 # These options are relatively safe to experiment with.
    77817989 
    77827990-echo "$as_me:9544: checking if you want all development code" >&5
    7783 +echo "$as_me:9891: checking if you want all development code" >&5
     7991+echo "$as_me:9916: checking if you want all development code" >&5
    77847992 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
    77857993 
    77867994 # Check whether --with-develop or --without-develop was given.
    7787 @@ -9551,11 +9898,11 @@
     7995@@ -9551,11 +9923,11 @@
    77887996 else
    77897997   with_develop=no
    77907998 fi;
    77917999-echo "$as_me:9554: result: $with_develop" >&5
    7792 +echo "$as_me:9901: result: $with_develop" >&5
     8000+echo "$as_me:9926: result: $with_develop" >&5
    77938001 echo "${ECHO_T}$with_develop" >&6
    77948002 
    77958003 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
    77968004-echo "$as_me:9558: checking if you want hard-tabs code" >&5
    7797 +echo "$as_me:9905: checking if you want hard-tabs code" >&5
     8005+echo "$as_me:9930: checking if you want hard-tabs code" >&5
    77988006 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
    77998007 
    78008008 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
    7801 @@ -9565,14 +9912,14 @@
     8009@@ -9565,14 +9937,14 @@
    78028010 else
    78038011   enable_hard_tabs=$with_develop
    78048012 fi;
    78058013-echo "$as_me:9568: result: $enable_hard_tabs" >&5
    7806 +echo "$as_me:9915: result: $enable_hard_tabs" >&5
     8014+echo "$as_me:9940: result: $enable_hard_tabs" >&5
    78078015 echo "${ECHO_T}$enable_hard_tabs" >&6
    78088016 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
    … …  
    78128020 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
    78138021-echo "$as_me:9575: checking if you want limited support for xmc" >&5
    7814 +echo "$as_me:9922: checking if you want limited support for xmc" >&5
     8022+echo "$as_me:9947: checking if you want limited support for xmc" >&5
    78158023 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
    78168024 
    78178025 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
    7818 @@ -9582,7 +9929,7 @@
     8026@@ -9582,7 +9954,7 @@
    78198027 else
    78208028   enable_xmc_glitch=$with_develop
    78218029 fi;
    78228030-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
    7823 +echo "$as_me:9932: result: $enable_xmc_glitch" >&5
     8031+echo "$as_me:9957: result: $enable_xmc_glitch" >&5
    78248032 echo "${ECHO_T}$enable_xmc_glitch" >&6
    78258033 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
    78268034 #define USE_XMC_SUPPORT 1
    7827 @@ -9591,7 +9938,7 @@
     8035@@ -9591,7 +9963,7 @@
    78288036 ###############################################################################
    78298037 # These are just experimental, probably should not be in a package:
    78308038 
    78318039-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
    7832 +echo "$as_me:9941: 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
    78338041 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
    78348042 
    78358043 # Check whether --enable-assumed-color or --disable-assumed-color was given.
    7836 @@ -9601,14 +9948,14 @@
     8044@@ -9601,14 +9973,14 @@
    78378045 else
    78388046   with_assumed_color=yes
    78398047 fi;
    78408048-echo "$as_me:9604: result: $with_assumed_color" >&5
    7841 +echo "$as_me:9951: result: $with_assumed_color" >&5
     8049+echo "$as_me:9976: result: $with_assumed_color" >&5
    78428050 echo "${ECHO_T}$with_assumed_color" >&6
    78438051 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
    … …  
    78478055 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
    78488056-echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
    7849 +echo "$as_me:9958: checking if you want hashmap scrolling-optimization code" >&5
     8057+echo "$as_me:9983: checking if you want hashmap scrolling-optimization code" >&5
    78508058 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
    78518059 
    78528060 # Check whether --enable-hashmap or --disable-hashmap was given.
    7853 @@ -9618,14 +9965,14 @@
     8061@@ -9618,14 +9990,14 @@
    78548062 else
    78558063   with_hashmap=yes
    78568064 fi;
    78578065-echo "$as_me:9621: result: $with_hashmap" >&5
    7858 +echo "$as_me:9968: result: $with_hashmap" >&5
     8066+echo "$as_me:9993: result: $with_hashmap" >&5
    78598067 echo "${ECHO_T}$with_hashmap" >&6
    78608068 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
    … …  
    78648072 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
    78658073-echo "$as_me:9628: checking if you want colorfgbg code" >&5
    7866 +echo "$as_me:9975: checking if you want colorfgbg code" >&5
     8074+echo "$as_me:10000: checking if you want colorfgbg code" >&5
    78678075 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
    78688076 
    78698077 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
    7870 @@ -9635,7 +9982,7 @@
     8078@@ -9635,7 +10007,7 @@
    78718079 else
    78728080   with_colorfgbg=no
    78738081 fi;
    78748082-echo "$as_me:9638: result: $with_colorfgbg" >&5
    7875 +echo "$as_me:9985: result: $with_colorfgbg" >&5
     8083+echo "$as_me:10010: result: $with_colorfgbg" >&5
    78768084 echo "${ECHO_T}$with_colorfgbg" >&6
    78778085 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
    78788086 #define USE_COLORFGBG 1
    7879 @@ -9644,7 +9991,7 @@
     8087@@ -9644,7 +10016,7 @@
    78808088 # This is still experimental (20080329), but should ultimately be moved to
    78818089 # the script-block --with-normal, etc.
    78828090 
    78838091-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
    7884 +echo "$as_me:9994: 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
    78858093 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
    78868094 
    78878095 # Check whether --with-pthread or --without-pthread was given.
    7888 @@ -9654,27 +10001,27 @@
     8096@@ -9654,27 +10026,27 @@
    78898097 else
    78908098   with_pthread=no
    78918099 fi;
    78928100-echo "$as_me:9657: result: $with_pthread" >&5
    7893 +echo "$as_me:10004: result: $with_pthread" >&5
     8101+echo "$as_me:10029: result: $with_pthread" >&5
    78948102 echo "${ECHO_T}$with_pthread" >&6
    78958103 
    78968104 if test "$with_pthread" != no ; then
    78978105-    echo "$as_me:9661: checking for pthread.h" >&5
    7898 +    echo "$as_me:10008: checking for pthread.h" >&5
     8106+    echo "$as_me:10033: checking for pthread.h" >&5
    78998107 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
    79008108 if test "${ac_cv_header_pthread_h+set}" = set; then
    … …  
    79038111   cat >conftest.$ac_ext <<_ACEOF
    79048112-#line 9667 "configure"
    7905 +#line 10014 "configure"
     8113+#line 10039 "configure"
    79068114 #include "confdefs.h"
    79078115 #include <pthread.h>
    79088116 _ACEOF
    79098117-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
    7910 +if { (eval echo "$as_me:10018: \"$ac_cpp conftest.$ac_ext\"") >&5
     8118+if { (eval echo "$as_me:10043: \"$ac_cpp conftest.$ac_ext\"") >&5
    79118119   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    79128120   ac_status=$?
    … …  
    79158123   cat conftest.err >&5
    79168124-  echo "$as_me:9677: \$? = $ac_status" >&5
    7917 +  echo "$as_me:10024: \$? = $ac_status" >&5
     8125+  echo "$as_me:10049: \$? = $ac_status" >&5
    79188126   (exit $ac_status); } >/dev/null; then
    79198127   if test -s conftest.err; then
    79208128     ac_cpp_err=$ac_c_preproc_warn_flag
    7921 @@ -9693,7 +10040,7 @@
     8129@@ -9693,7 +10065,7 @@
    79228130 fi
    79238131 rm -f conftest.err conftest.$ac_ext
    79248132 fi
    79258133-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
    7926 +echo "$as_me:10043: result: $ac_cv_header_pthread_h" >&5
     8134+echo "$as_me:10068: result: $ac_cv_header_pthread_h" >&5
    79278135 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
    79288136 if test $ac_cv_header_pthread_h = yes; then
    79298137 
    7930 @@ -9701,12 +10048,12 @@
     8138@@ -9701,12 +10073,12 @@
    79318139 #define HAVE_PTHREADS_H 1
    79328140 EOF
    79338141 
    79348142-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
    7935 +        echo "$as_me:10051: 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
    79368144 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
    79378145         cf_save_LIBS="$LIBS"
    … …  
    79398147         cat >conftest.$ac_ext <<_ACEOF
    79408148-#line 9709 "configure"
    7941 +#line 10056 "configure"
     8149+#line 10081 "configure"
    79428150 #include "confdefs.h"
    79438151 
    79448152 #include <pthread.h>
    7945 @@ -9722,16 +10069,16 @@
     8153@@ -9722,16 +10094,16 @@
    79468154 }
    79478155 _ACEOF
    79488156 rm -f conftest.$ac_objext conftest$ac_exeext
    79498157-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
    7950 +if { (eval echo "$as_me:10072: \"$ac_link\"") >&5
     8158+if { (eval echo "$as_me:10097: \"$ac_link\"") >&5
    79518159   (eval $ac_link) 2>&5
    79528160   ac_status=$?
    79538161-  echo "$as_me:9728: \$? = $ac_status" >&5
    7954 +  echo "$as_me:10075: \$? = $ac_status" >&5
     8162+  echo "$as_me:10100: \$? = $ac_status" >&5
    79558163   (exit $ac_status); } &&
    79568164          { ac_try='test -s conftest$ac_exeext'
    79578165-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
    7958 +  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
     8166+  { (eval echo "$as_me:10103: \"$ac_try\"") >&5
    79598167   (eval $ac_try) 2>&5
    79608168   ac_status=$?
    79618169-  echo "$as_me:9734: \$? = $ac_status" >&5
    7962 +  echo "$as_me:10081: \$? = $ac_status" >&5
     8170+  echo "$as_me:10106: \$? = $ac_status" >&5
    79638171   (exit $ac_status); }; }; then
    79648172   with_pthread=yes
    79658173 else
    7966 @@ -9741,7 +10088,7 @@
     8174@@ -9741,7 +10113,7 @@
    79678175 fi
    79688176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    79698177         LIBS="$cf_save_LIBS"
    79708178-        echo "$as_me:9744: result: $with_pthread" >&5
    7971 +        echo "$as_me:10091: result: $with_pthread" >&5
     8179+        echo "$as_me:10116: result: $with_pthread" >&5
    79728180 echo "${ECHO_T}$with_pthread" >&6
    79738181 
    79748182         if test "$with_pthread" = yes ; then
    7975 @@ -9751,7 +10098,7 @@
     8183@@ -9751,7 +10123,7 @@
    79768184 EOF
    79778185 
    79788186         else
    79798187-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
    7980 +            { { echo "$as_me:10101: error: Cannot link with pthread library" >&5
     8188+            { { echo "$as_me:10126: error: Cannot link with pthread library" >&5
    79818189 echo "$as_me: error: Cannot link with pthread library" >&2;}
    79828190    { (exit 1); exit 1; }; }
    79838191         fi
    7984 @@ -9760,7 +10107,7 @@
     8192@@ -9760,7 +10132,7 @@
    79858193 
    79868194 fi
    79878195 
    79888196-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
    7989 +echo "$as_me:10110: 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
    79908198 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
    79918199 
    79928200 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
    7993 @@ -9770,18 +10117,18 @@
     8201@@ -9770,18 +10142,18 @@
    79948202 else
    79958203   use_weak_symbols=no
    79968204 fi;
    79978205-echo "$as_me:9773: result: $use_weak_symbols" >&5
    7998 +echo "$as_me:10120: result: $use_weak_symbols" >&5
     8206+echo "$as_me:10145: result: $use_weak_symbols" >&5
    79998207 echo "${ECHO_T}$use_weak_symbols" >&6
    80008208 if test "$use_weak_symbols" = yes ; then
    80018209 
    80028210-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
    8003 +echo "$as_me:10124: checking if $CC supports weak symbols" >&5
     8211+echo "$as_me:10149: checking if $CC supports weak symbols" >&5
    80048212 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
    80058213 if test "${cf_cv_weak_symbols+set}" = set; then
    … …  
    80098217 cat >conftest.$ac_ext <<_ACEOF
    80108218-#line 9784 "configure"
    8011 +#line 10131 "configure"
     8219+#line 10156 "configure"
    80128220 #include "confdefs.h"
    80138221 
    80148222 #include <stdio.h>
    8015 @@ -9807,16 +10154,16 @@
     8223@@ -9807,16 +10179,16 @@
    80168224 }
    80178225 _ACEOF
    80188226 rm -f conftest.$ac_objext
    80198227-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
    8020 +if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
     8228+if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5
    80218229   (eval $ac_compile) 2>&5
    80228230   ac_status=$?
    80238231-  echo "$as_me:9813: \$? = $ac_status" >&5
    8024 +  echo "$as_me:10160: \$? = $ac_status" >&5
     8232+  echo "$as_me:10185: \$? = $ac_status" >&5
    80258233   (exit $ac_status); } &&
    80268234          { ac_try='test -s conftest.$ac_objext'
    80278235-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
    8028 +  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
     8236+  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
    80298237   (eval $ac_try) 2>&5
    80308238   ac_status=$?
    80318239-  echo "$as_me:9819: \$? = $ac_status" >&5
    8032 +  echo "$as_me:10166: \$? = $ac_status" >&5
     8240+  echo "$as_me:10191: \$? = $ac_status" >&5
    80338241   (exit $ac_status); }; }; then
    80348242   cf_cv_weak_symbols=yes
    80358243 else
    8036 @@ -9827,7 +10174,7 @@
     8244@@ -9827,7 +10199,7 @@
    80378245 rm -f conftest.$ac_objext conftest.$ac_ext
    80388246 
    80398247 fi
    80408248-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
    8041 +echo "$as_me:10177: result: $cf_cv_weak_symbols" >&5
     8249+echo "$as_me:10202: result: $cf_cv_weak_symbols" >&5
    80428250 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
    80438251 
    80448252 else
    8045 @@ -9857,7 +10204,7 @@
     8253@@ -9857,7 +10229,7 @@
    80468254 # opaque outside of that, so there is no --enable-opaque option.  We can use
    80478255 # this option without --with-pthreads, but this will be always set for
    80488256 # pthreads.
    80498257-echo "$as_me:9860: checking if you want experimental reentrant code" >&5
    8050 +echo "$as_me:10207: checking if you want experimental reentrant code" >&5
     8258+echo "$as_me:10232: checking if you want experimental reentrant code" >&5
    80518259 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
    80528260 
    80538261 # Check whether --enable-reentrant or --disable-reentrant was given.
    8054 @@ -9867,7 +10214,7 @@
     8262@@ -9867,7 +10239,7 @@
    80558263 else
    80568264   with_reentrant=no
    80578265 fi;
    80588266-echo "$as_me:9870: result: $with_reentrant" >&5
    8059 +echo "$as_me:10217: result: $with_reentrant" >&5
     8267+echo "$as_me:10242: result: $with_reentrant" >&5
    80608268 echo "${ECHO_T}$with_reentrant" >&6
    80618269 if test "$with_reentrant" = yes ; then
    80628270        cf_cv_enable_reentrant=1
    8063 @@ -9891,7 +10238,7 @@
     8271@@ -9891,7 +10263,7 @@
    80648272        5.*)
    80658273                cf_cv_rel_version=6.0
    80668274                cf_cv_abi_version=6
    80678275-               { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    8068 +               { echo "$as_me:10241: 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
    80698277 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    80708278                ;;
    80718279        esac
    8072 @@ -9904,7 +10251,7 @@
     8280@@ -9904,7 +10276,7 @@
    80738281        NCURSES_SIZE_T=short
    80748282 fi
    80758283 
    80768284-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
    8077 +echo "$as_me:10254: checking if you want experimental safe-sprintf code" >&5
     8285+echo "$as_me:10279: checking if you want experimental safe-sprintf code" >&5
    80788286 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
    80798287 
    80808288 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
    8081 @@ -9914,7 +10261,7 @@
     8289@@ -9914,7 +10286,7 @@
    80828290 else
    80838291   with_safe_sprintf=no
    80848292 fi;
    80858293-echo "$as_me:9917: result: $with_safe_sprintf" >&5
    8086 +echo "$as_me:10264: result: $with_safe_sprintf" >&5
     8294+echo "$as_me:10289: result: $with_safe_sprintf" >&5
    80878295 echo "${ECHO_T}$with_safe_sprintf" >&6
    80888296 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
    80898297 #define USE_SAFE_SPRINTF 1
    8090 @@ -9923,7 +10270,7 @@
     8298@@ -9923,7 +10295,7 @@
    80918299 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
    80928300 # when hashmap is used scroll hints are useless
    80938301 if test "$with_hashmap" = no ; then
    80948302-echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
    8095 +echo "$as_me:10273: 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
    80968304 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
    80978305 
    80988306 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
    8099 @@ -9933,7 +10280,7 @@
     8307@@ -9933,7 +10305,7 @@
    81008308 else
    81018309   with_scroll_hints=yes
    81028310 fi;
    81038311-echo "$as_me:9936: result: $with_scroll_hints" >&5
    8104 +echo "$as_me:10283: result: $with_scroll_hints" >&5
     8312+echo "$as_me:10308: result: $with_scroll_hints" >&5
    81058313 echo "${ECHO_T}$with_scroll_hints" >&6
    81068314 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
    81078315 #define USE_SCROLL_HINTS 1
    8108 @@ -9941,7 +10288,7 @@
     8316@@ -9941,7 +10313,7 @@
    81098317 
    81108318 fi
    81118319 
    81128320-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
    8113 +echo "$as_me:10291: checking if you want experimental wgetch-events code" >&5
     8321+echo "$as_me:10316: checking if you want experimental wgetch-events code" >&5
    81148322 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
    81158323 
    81168324 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
    8117 @@ -9951,7 +10298,7 @@
     8325@@ -9951,7 +10323,7 @@
    81188326 else
    81198327   with_wgetch_events=no
    81208328 fi;
    81218329-echo "$as_me:9954: result: $with_wgetch_events" >&5
    8122 +echo "$as_me:10301: result: $with_wgetch_events" >&5
     8330+echo "$as_me:10326: result: $with_wgetch_events" >&5
    81238331 echo "${ECHO_T}$with_wgetch_events" >&6
    81248332 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
    81258333 #define NCURSES_WGETCH_EVENTS 1
    8126 @@ -9960,7 +10307,7 @@
     8334@@ -9960,7 +10332,7 @@
    81278335 ###############################################################################
    81288336 
    81298337 ###    use option --disable-echo to suppress full display compiling commands
    81308338-echo "$as_me:9963: checking if you want to display full commands during build" >&5
    8131 +echo "$as_me:10310: 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
    81328340 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
    81338341 
    81348342 # Check whether --enable-echo or --disable-echo was given.
    8135 @@ -9977,11 +10324,11 @@
     8343@@ -9977,11 +10349,11 @@
    81368344        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
    81378345        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
    81388346 fi
    81398347-echo "$as_me:9980: result: $with_echo" >&5
    8140 +echo "$as_me:10327: result: $with_echo" >&5
     8348+echo "$as_me:10352: result: $with_echo" >&5
    81418349 echo "${ECHO_T}$with_echo" >&6
    81428350 
    81438351 ###    use option --enable-warnings to turn on all gcc warnings
    81448352-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
    8145 +echo "$as_me:10331: checking if you want to see compiler warnings" >&5
     8353+echo "$as_me:10356: checking if you want to see compiler warnings" >&5
    81468354 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
    81478355 
    81488356 # Check whether --enable-warnings or --disable-warnings was given.
    8149 @@ -9989,7 +10336,7 @@
     8357@@ -9989,7 +10361,7 @@
    81508358   enableval="$enable_warnings"
    81518359   with_warnings=$enableval
    81528360 fi;
    81538361-echo "$as_me:9992: result: $with_warnings" >&5
    8154 +echo "$as_me:10339: result: $with_warnings" >&5
     8362+echo "$as_me:10364: result: $with_warnings" >&5
    81558363 echo "${ECHO_T}$with_warnings" >&6
    81568364 
    81578365 if test "x$with_warnings" = "xyes"; then
    8158 @@ -10000,12 +10347,12 @@
     8366@@ -10000,12 +10372,12 @@
    81598367 if test "$GCC" = yes ; then
    81608368        case $host_os in
    81618369        linux*|gnu*)
    81628370-               echo "$as_me:10003: checking if this is really Intel C compiler" >&5
    8163 +               echo "$as_me:10350: checking if this is really Intel C compiler" >&5
     8371+               echo "$as_me:10375: checking if this is really Intel C compiler" >&5
    81648372 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
    81658373                cf_save_CFLAGS="$CFLAGS"
    … …  
    81678375                cat >conftest.$ac_ext <<_ACEOF
    81688376-#line 10008 "configure"
    8169 +#line 10355 "configure"
     8377+#line 10380 "configure"
    81708378 #include "confdefs.h"
    81718379 
    81728380 int
    8173 @@ -10022,16 +10369,16 @@
     8381@@ -10022,16 +10394,16 @@
    81748382 }
    81758383 _ACEOF
    81768384 rm -f conftest.$ac_objext
    81778385-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
    8178 +if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
     8386+if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5
    81798387   (eval $ac_compile) 2>&5
    81808388   ac_status=$?
    81818389-  echo "$as_me:10028: \$? = $ac_status" >&5
    8182 +  echo "$as_me:10375: \$? = $ac_status" >&5
     8390+  echo "$as_me:10400: \$? = $ac_status" >&5
    81838391   (exit $ac_status); } &&
    81848392          { ac_try='test -s conftest.$ac_objext'
    81858393-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
    8186 +  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
     8394+  { (eval echo "$as_me:10403: \"$ac_try\"") >&5
    81878395   (eval $ac_try) 2>&5
    81888396   ac_status=$?
    81898397-  echo "$as_me:10034: \$? = $ac_status" >&5
    8190 +  echo "$as_me:10381: \$? = $ac_status" >&5
     8398+  echo "$as_me:10406: \$? = $ac_status" >&5
    81918399   (exit $ac_status); }; }; then
    81928400   INTEL_COMPILER=yes
    81938401 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8194 @@ -10042,14 +10389,14 @@
     8402@@ -10042,14 +10414,14 @@
    81958403 fi
    81968404 rm -f conftest.$ac_objext conftest.$ac_ext
    81978405                CFLAGS="$cf_save_CFLAGS"
    81988406-               echo "$as_me:10045: result: $INTEL_COMPILER" >&5
    8199 +               echo "$as_me:10392: result: $INTEL_COMPILER" >&5
     8407+               echo "$as_me:10417: result: $INTEL_COMPILER" >&5
    82008408 echo "${ECHO_T}$INTEL_COMPILER" >&6
    82018409                ;;
    … …  
    82058413 cat > conftest.$ac_ext <<EOF
    82068414-#line 10052 "${as_me-configure}"
    8207 +#line 10399 "${as_me-configure}"
     8415+#line 10424 "${as_me-configure}"
    82088416 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    82098417 EOF
    82108418 
    8211 @@ -10067,7 +10414,7 @@
     8419@@ -10067,7 +10439,7 @@
    82128420 # remark #981: operands are evaluated in unspecified order
    82138421 # warning #269: invalid format string conversion
    82148422 
    82158423-       { echo "$as_me:10070: checking for $CC warning options..." >&5
    8216 +       { echo "$as_me:10417: checking for $CC warning options..." >&5
     8424+       { echo "$as_me:10442: checking for $CC warning options..." >&5
    82178425 echo "$as_me: checking for $CC warning options..." >&6;}
    82188426        cf_save_CFLAGS="$CFLAGS"
    82198427        EXTRA_CFLAGS="-Wall"
    8220 @@ -10084,12 +10431,12 @@
     8428@@ -10084,12 +10456,12 @@
    82218429                wd981
    82228430        do
    82238431                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    82248432-               if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
    8225 +               if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
     8433+               if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5
    82268434   (eval $ac_compile) 2>&5
    82278435   ac_status=$?
    82288436-  echo "$as_me:10090: \$? = $ac_status" >&5
    8229 +  echo "$as_me:10437: \$? = $ac_status" >&5
     8437+  echo "$as_me:10462: \$? = $ac_status" >&5
    82308438   (exit $ac_status); }; then
    82318439-                       test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
    8232 +                       test -n "$verbose" && echo "$as_me:10439: result: ... -$cf_opt" >&5
     8440+                       test -n "$verbose" && echo "$as_me:10464: result: ... -$cf_opt" >&5
    82338441 echo "${ECHO_T}... -$cf_opt" >&6
    82348442                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
    82358443                fi
    8236 @@ -10098,7 +10445,7 @@
     8444@@ -10098,7 +10470,7 @@
    82378445 
    82388446 elif test "$GCC" = yes
    82398447 then
    82408448-       { echo "$as_me:10101: checking for $CC warning options..." >&5
    8241 +       { echo "$as_me:10448: checking for $CC warning options..." >&5
     8449+       { echo "$as_me:10473: checking for $CC warning options..." >&5
    82428450 echo "$as_me: checking for $CC warning options..." >&6;}
    82438451        cf_save_CFLAGS="$CFLAGS"
    82448452        EXTRA_CFLAGS="-W -Wall"
    8245 @@ -10118,12 +10465,12 @@
     8453@@ -10118,12 +10490,12 @@
    82468454                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
    82478455        do
    82488456                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    82498457-               if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
    8250 +               if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
     8458+               if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5
    82518459   (eval $ac_compile) 2>&5
    82528460   ac_status=$?
    82538461-  echo "$as_me:10124: \$? = $ac_status" >&5
    8254 +  echo "$as_me:10471: \$? = $ac_status" >&5
     8462+  echo "$as_me:10496: \$? = $ac_status" >&5
    82558463   (exit $ac_status); }; then
    82568464-                       test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
    8257 +                       test -n "$verbose" && echo "$as_me:10473: result: ... -$cf_opt" >&5
     8465+                       test -n "$verbose" && echo "$as_me:10498: result: ... -$cf_opt" >&5
    82588466 echo "${ECHO_T}... -$cf_opt" >&6
    82598467                        case $cf_opt in #(vi
    82608468                        Wcast-qual) #(vi
    8261 @@ -10134,7 +10481,7 @@
     8469@@ -10134,7 +10506,7 @@
    82628470                                [34].*)
    82638471                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
    82648472 
    82658473-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    8266 +echo "${as_me-configure}:10484: 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
    82678475 
    82688476                                        continue;;
    82698477                                esac
    8270 @@ -10154,12 +10501,12 @@
     8478@@ -10154,12 +10526,12 @@
    82718479 if test "$GCC" = yes ; then
    82728480        case $host_os in
    82738481        linux*|gnu*)
    82748482-               echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
    8275 +               echo "$as_me:10504: checking if this is really Intel C++ compiler" >&5
     8483+               echo "$as_me:10529: checking if this is really Intel C++ compiler" >&5
    82768484 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
    82778485                cf_save_CFLAGS="$CXXFLAGS"
    … …  
    82798487                cat >conftest.$ac_ext <<_ACEOF
    82808488-#line 10162 "configure"
    8281 +#line 10509 "configure"
     8489+#line 10534 "configure"
    82828490 #include "confdefs.h"
    82838491 
    82848492 int
    8285 @@ -10176,16 +10523,16 @@
     8493@@ -10176,16 +10548,16 @@
    82868494 }
    82878495 _ACEOF
    82888496 rm -f conftest.$ac_objext
    82898497-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
    8290 +if { (eval echo "$as_me:10526: \"$ac_compile\"") >&5
     8498+if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
    82918499   (eval $ac_compile) 2>&5
    82928500   ac_status=$?
    82938501-  echo "$as_me:10182: \$? = $ac_status" >&5
    8294 +  echo "$as_me:10529: \$? = $ac_status" >&5
     8502+  echo "$as_me:10554: \$? = $ac_status" >&5
    82958503   (exit $ac_status); } &&
    82968504          { ac_try='test -s conftest.$ac_objext'
    82978505-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
    8298 +  { (eval echo "$as_me:10532: \"$ac_try\"") >&5
     8506+  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
    82998507   (eval $ac_try) 2>&5
    83008508   ac_status=$?
    83018509-  echo "$as_me:10188: \$? = $ac_status" >&5
    8302 +  echo "$as_me:10535: \$? = $ac_status" >&5
     8510+  echo "$as_me:10560: \$? = $ac_status" >&5
    83038511   (exit $ac_status); }; }; then
    83048512   INTEL_CPLUSPLUS=yes
    83058513 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8306 @@ -10196,7 +10543,7 @@
     8514@@ -10196,7 +10568,7 @@
    83078515 fi
    83088516 rm -f conftest.$ac_objext conftest.$ac_ext
    83098517                CXXFLAGS="$cf_save_CFLAGS"
    83108518-               echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
    8311 +               echo "$as_me:10546: result: $INTEL_CPLUSPLUS" >&5
     8519+               echo "$as_me:10571: result: $INTEL_CPLUSPLUS" >&5
    83128520 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
    83138521                ;;
    83148522        esac
    8315 @@ -10210,7 +10557,7 @@
     8523@@ -10210,7 +10582,7 @@
    83168524 ac_main_return=return
    83178525 
    83188526 cat > conftest.$ac_ext <<EOF
    83198527-#line 10213 "configure"
    8320 +#line 10560 "configure"
     8528+#line 10585 "configure"
    83218529 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    83228530 EOF
    83238531 
    8324 @@ -10228,7 +10575,7 @@
     8532@@ -10228,7 +10600,7 @@
    83258533 # remark #981: operands are evaluated in unspecified order
    83268534 # warning #269: invalid format string conversion
    83278535 
    83288536-       { echo "$as_me:10231: checking for $CC warning options..." >&5
    8329 +       { echo "$as_me:10578: checking for $CC warning options..." >&5
     8537+       { echo "$as_me:10603: checking for $CC warning options..." >&5
    83308538 echo "$as_me: checking for $CC warning options..." >&6;}
    83318539        cf_save_CXXFLAGS="$CXXFLAGS"
    83328540        EXTRA_CXXFLAGS="-Wall"
    8333 @@ -10245,12 +10592,12 @@
     8541@@ -10245,12 +10617,12 @@
    83348542                wd981
    83358543        do
    83368544                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
    83378545-               if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
    8338 +               if { (eval echo "$as_me:10595: \"$ac_compile\"") >&5
     8546+               if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5
    83398547   (eval $ac_compile) 2>&5
    83408548   ac_status=$?
    83418549-  echo "$as_me:10251: \$? = $ac_status" >&5
    8342 +  echo "$as_me:10598: \$? = $ac_status" >&5
     8550+  echo "$as_me:10623: \$? = $ac_status" >&5
    83438551   (exit $ac_status); }; then
    83448552-                       test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
    8345 +                       test -n "$verbose" && echo "$as_me:10600: result: ... -$cf_opt" >&5
     8553+                       test -n "$verbose" && echo "$as_me:10625: result: ... -$cf_opt" >&5
    83468554 echo "${ECHO_T}... -$cf_opt" >&6
    83478555                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    83488556                fi
    8349 @@ -10259,7 +10606,7 @@
     8557@@ -10259,7 +10631,7 @@
    83508558 
    83518559 elif test "$GXX" = yes
    83528560 then
    83538561-       { echo "$as_me:10262: checking for $CXX warning options..." >&5
    8354 +       { echo "$as_me:10609: checking for $CXX warning options..." >&5
     8562+       { echo "$as_me:10634: checking for $CXX warning options..." >&5
    83558563 echo "$as_me: checking for $CXX warning options..." >&6;}
    83568564        cf_save_CXXFLAGS="$CXXFLAGS"
    83578565        EXTRA_CXXFLAGS="-W -Wall"
    8358 @@ -10288,16 +10635,16 @@
     8566@@ -10288,16 +10660,16 @@
    83598567                Wundef $cf_gxx_extra_warnings Wno-unused
    83608568        do
    83618569                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
    83628570-               if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
    8363 +               if { (eval echo "$as_me:10638: \"$ac_compile\"") >&5
     8571+               if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
    83648572   (eval $ac_compile) 2>&5
    83658573   ac_status=$?
    83668574-  echo "$as_me:10294: \$? = $ac_status" >&5
    8367 +  echo "$as_me:10641: \$? = $ac_status" >&5
     8575+  echo "$as_me:10666: \$? = $ac_status" >&5
    83688576   (exit $ac_status); }; then
    83698577-                       test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
    8370 +                       test -n "$verbose" && echo "$as_me:10643: result: ... -$cf_opt" >&5
     8578+                       test -n "$verbose" && echo "$as_me:10668: result: ... -$cf_opt" >&5
    83718579 echo "${ECHO_T}... -$cf_opt" >&6
    83728580                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    83738581                else
    83748582-                       test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
    8375 +                       test -n "$verbose" && echo "$as_me:10647: result: ... no -$cf_opt" >&5
     8583+                       test -n "$verbose" && echo "$as_me:10672: result: ... no -$cf_opt" >&5
    83768584 echo "${ECHO_T}... no -$cf_opt" >&6
    83778585                fi
    83788586        done
    8379 @@ -10333,10 +10680,10 @@
     8587@@ -10333,10 +10705,10 @@
    83808588 EOF
    83818589 if test "$GCC" = yes
    83828590 then
    83838591-       { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
    8384 +       { echo "$as_me:10683: checking for $CC __attribute__ directives..." >&5
     8592+       { echo "$as_me:10708: checking for $CC __attribute__ directives..." >&5
    83858593 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
    83868594 cat > conftest.$ac_ext <<EOF
    83878595-#line 10339 "${as_me-configure}"
    8388 +#line 10686 "${as_me-configure}"
     8596+#line 10711 "${as_me-configure}"
    83898597 #include "confdefs.h"
    83908598 #include "conftest.h"
    83918599 #include "conftest.i"
    8392 @@ -10374,12 +10721,12 @@
     8600@@ -10374,12 +10746,12 @@
    83938601 EOF
    83948602                        ;;
    83958603                esac
    83968604-               if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
    8397 +               if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
     8605+               if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
    83988606   (eval $ac_compile) 2>&5
    83998607   ac_status=$?
    84008608-  echo "$as_me:10380: \$? = $ac_status" >&5
    8401 +  echo "$as_me:10727: \$? = $ac_status" >&5
     8609+  echo "$as_me:10752: \$? = $ac_status" >&5
    84028610   (exit $ac_status); }; then
    84038611-                       test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
    8404 +                       test -n "$verbose" && echo "$as_me:10729: result: ... $cf_attribute" >&5
     8612+                       test -n "$verbose" && echo "$as_me:10754: result: ... $cf_attribute" >&5
    84058613 echo "${ECHO_T}... $cf_attribute" >&6
    84068614                        cat conftest.h >>confdefs.h
    84078615                fi
    8408 @@ -10391,7 +10738,7 @@
     8616@@ -10391,7 +10763,7 @@
    84098617 fi
    84108618 
    84118619 ###    use option --enable-assertions to turn on generation of assertion code
    84128620-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
    8413 +echo "$as_me:10741: checking if you want to enable runtime assertions" >&5
     8621+echo "$as_me:10766: checking if you want to enable runtime assertions" >&5
    84148622 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
    84158623 
    84168624 # Check whether --enable-assertions or --disable-assertions was given.
    8417 @@ -10401,7 +10748,7 @@
     8625@@ -10401,7 +10773,7 @@
    84188626 else
    84198627   with_assertions=no
    84208628 fi;
    84218629-echo "$as_me:10404: result: $with_assertions" >&5
    8422 +echo "$as_me:10751: result: $with_assertions" >&5
     8630+echo "$as_me:10776: result: $with_assertions" >&5
    84238631 echo "${ECHO_T}$with_assertions" >&6
    84248632 if test -n "$GCC"
    84258633 then
    8426 @@ -10419,7 +10766,7 @@
     8634@@ -10419,7 +10791,7 @@
    84278635 
    84288636 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
    84298637 
    84308638-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
    8431 +echo "$as_me:10769: 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
    84328640 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
    84338641 
    84348642 # Check whether --with-dmalloc or --without-dmalloc was given.
    8435 @@ -10435,7 +10782,7 @@
     8643@@ -10435,7 +10807,7 @@
    84368644 else
    84378645   with_dmalloc=
    84388646 fi;
    84398647-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
    8440 +echo "$as_me:10785: result: ${with_dmalloc:-no}" >&5
     8648+echo "$as_me:10810: result: ${with_dmalloc:-no}" >&5
    84418649 echo "${ECHO_T}${with_dmalloc:-no}" >&6
    84428650 
    84438651 case .$with_cflags in #(vi
    8444 @@ -10519,23 +10866,23 @@
     8652@@ -10505,7 +10877,7 @@
     8653 
     8654 if test -n "$cf_new_cppflags" ; then
     8655 
     8656-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     8657+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     8658 fi
     8659 
     8660 if test -n "$cf_new_extra_cppflags" ; then
     8661@@ -10519,23 +10891,23 @@
    84458662 esac
    84468663 
    84478664 if test "$with_dmalloc" = yes ; then
    84488665-       echo "$as_me:10522: checking for dmalloc.h" >&5
    8449 +       echo "$as_me:10869: checking for dmalloc.h" >&5
     8666+       echo "$as_me:10894: checking for dmalloc.h" >&5
    84508667 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
    84518668 if test "${ac_cv_header_dmalloc_h+set}" = set; then
    … …  
    84548671   cat >conftest.$ac_ext <<_ACEOF
    84558672-#line 10528 "configure"
    8456 +#line 10875 "configure"
     8673+#line 10900 "configure"
    84578674 #include "confdefs.h"
    84588675 #include <dmalloc.h>
    84598676 _ACEOF
    84608677-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
    8461 +if { (eval echo "$as_me:10879: \"$ac_cpp conftest.$ac_ext\"") >&5
     8678+if { (eval echo "$as_me:10904: \"$ac_cpp conftest.$ac_ext\"") >&5
    84628679   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    84638680   ac_status=$?
    … …  
    84668683   cat conftest.err >&5
    84678684-  echo "$as_me:10538: \$? = $ac_status" >&5
    8468 +  echo "$as_me:10885: \$? = $ac_status" >&5
     8685+  echo "$as_me:10910: \$? = $ac_status" >&5
    84698686   (exit $ac_status); } >/dev/null; then
    84708687   if test -s conftest.err; then
    84718688     ac_cpp_err=$ac_c_preproc_warn_flag
    8472 @@ -10554,11 +10901,11 @@
     8689@@ -10554,11 +10926,11 @@
    84738690 fi
    84748691 rm -f conftest.err conftest.$ac_ext
    84758692 fi
    84768693-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
    8477 +echo "$as_me:10904: result: $ac_cv_header_dmalloc_h" >&5
     8694+echo "$as_me:10929: result: $ac_cv_header_dmalloc_h" >&5
    84788695 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
    84798696 if test $ac_cv_header_dmalloc_h = yes; then
    84808697 
    84818698-echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
    8482 +echo "$as_me:10908: checking for dmalloc_debug in -ldmalloc" >&5
     8699+echo "$as_me:10933: checking for dmalloc_debug in -ldmalloc" >&5
    84838700 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
    84848701 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
    84858702   echo $ECHO_N "(cached) $ECHO_C" >&6
    8486 @@ -10566,7 +10913,7 @@
     8703@@ -10566,7 +10938,7 @@
    84878704   ac_check_lib_save_LIBS=$LIBS
    84888705 LIBS="-ldmalloc  $LIBS"
    84898706 cat >conftest.$ac_ext <<_ACEOF
    84908707-#line 10569 "configure"
    8491 +#line 10916 "configure"
     8708+#line 10941 "configure"
    84928709 #include "confdefs.h"
    84938710 
    84948711 /* Override any gcc2 internal prototype to avoid an error.  */
    8495 @@ -10585,16 +10932,16 @@
     8712@@ -10585,16 +10957,16 @@
    84968713 }
    84978714 _ACEOF
    84988715 rm -f conftest.$ac_objext conftest$ac_exeext
    84998716-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
    8500 +if { (eval echo "$as_me:10935: \"$ac_link\"") >&5
     8717+if { (eval echo "$as_me:10960: \"$ac_link\"") >&5
    85018718   (eval $ac_link) 2>&5
    85028719   ac_status=$?
    85038720-  echo "$as_me:10591: \$? = $ac_status" >&5
    8504 +  echo "$as_me:10938: \$? = $ac_status" >&5
     8721+  echo "$as_me:10963: \$? = $ac_status" >&5
    85058722   (exit $ac_status); } &&
    85068723          { ac_try='test -s conftest$ac_exeext'
    85078724-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
    8508 +  { (eval echo "$as_me:10941: \"$ac_try\"") >&5
     8725+  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
    85098726   (eval $ac_try) 2>&5
    85108727   ac_status=$?
    85118728-  echo "$as_me:10597: \$? = $ac_status" >&5
    8512 +  echo "$as_me:10944: \$? = $ac_status" >&5
     8729+  echo "$as_me:10969: \$? = $ac_status" >&5
    85138730   (exit $ac_status); }; }; then
    85148731   ac_cv_lib_dmalloc_dmalloc_debug=yes
    85158732 else
    8516 @@ -10605,7 +10952,7 @@
     8733@@ -10605,7 +10977,7 @@
    85178734 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    85188735 LIBS=$ac_check_lib_save_LIBS
    85198736 fi
    85208737-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    8521 +echo "$as_me:10955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
     8738+echo "$as_me:10980: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    85228739 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
    85238740 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    85248741   cat >>confdefs.h <<EOF
    8525 @@ -10620,7 +10967,7 @@
     8742@@ -10620,7 +10992,7 @@
    85268743 
    85278744 fi
    85288745 
    85298746-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
    8530 +echo "$as_me:10970: 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
    85318748 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
    85328749 
    85338750 # Check whether --with-dbmalloc or --without-dbmalloc was given.
    8534 @@ -10636,7 +10983,7 @@
     8751@@ -10636,7 +11008,7 @@
    85358752 else
    85368753   with_dbmalloc=
    85378754 fi;
    85388755-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
    8539 +echo "$as_me:10986: result: ${with_dbmalloc:-no}" >&5
     8756+echo "$as_me:11011: result: ${with_dbmalloc:-no}" >&5
    85408757 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
    85418758 
    85428759 case .$with_cflags in #(vi
    8543 @@ -10720,23 +11067,23 @@
     8760@@ -10706,7 +11078,7 @@
     8761 
     8762 if test -n "$cf_new_cppflags" ; then
     8763 
     8764-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     8765+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     8766 fi
     8767 
     8768 if test -n "$cf_new_extra_cppflags" ; then
     8769@@ -10720,23 +11092,23 @@
    85448770 esac
    85458771 
    85468772 if test "$with_dbmalloc" = yes ; then
    85478773-       echo "$as_me:10723: checking for dbmalloc.h" >&5
    8548 +       echo "$as_me:11070: checking for dbmalloc.h" >&5
     8774+       echo "$as_me:11095: checking for dbmalloc.h" >&5
    85498775 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
    85508776 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
    … …  
    85538779   cat >conftest.$ac_ext <<_ACEOF
    85548780-#line 10729 "configure"
    8555 +#line 11076 "configure"
     8781+#line 11101 "configure"
    85568782 #include "confdefs.h"
    85578783 #include <dbmalloc.h>
    85588784 _ACEOF
    85598785-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
    8560 +if { (eval echo "$as_me:11080: \"$ac_cpp conftest.$ac_ext\"") >&5
     8786+if { (eval echo "$as_me:11105: \"$ac_cpp conftest.$ac_ext\"") >&5
    85618787   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    85628788   ac_status=$?
    … …  
    85658791   cat conftest.err >&5
    85668792-  echo "$as_me:10739: \$? = $ac_status" >&5
    8567 +  echo "$as_me:11086: \$? = $ac_status" >&5
     8793+  echo "$as_me:11111: \$? = $ac_status" >&5
    85688794   (exit $ac_status); } >/dev/null; then
    85698795   if test -s conftest.err; then
    85708796     ac_cpp_err=$ac_c_preproc_warn_flag
    8571 @@ -10755,11 +11102,11 @@
     8797@@ -10755,11 +11127,11 @@
    85728798 fi
    85738799 rm -f conftest.err conftest.$ac_ext
    85748800 fi
    85758801-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
    8576 +echo "$as_me:11105: result: $ac_cv_header_dbmalloc_h" >&5
     8802+echo "$as_me:11130: result: $ac_cv_header_dbmalloc_h" >&5
    85778803 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
    85788804 if test $ac_cv_header_dbmalloc_h = yes; then
    85798805 
    85808806-echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
    8581 +echo "$as_me:11109: checking for debug_malloc in -ldbmalloc" >&5
     8807+echo "$as_me:11134: checking for debug_malloc in -ldbmalloc" >&5
    85828808 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
    85838809 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
    85848810   echo $ECHO_N "(cached) $ECHO_C" >&6
    8585 @@ -10767,7 +11114,7 @@
     8811@@ -10767,7 +11139,7 @@
    85868812   ac_check_lib_save_LIBS=$LIBS
    85878813 LIBS="-ldbmalloc  $LIBS"
    85888814 cat >conftest.$ac_ext <<_ACEOF
    85898815-#line 10770 "configure"
    8590 +#line 11117 "configure"
     8816+#line 11142 "configure"
    85918817 #include "confdefs.h"
    85928818 
    85938819 /* Override any gcc2 internal prototype to avoid an error.  */
    8594 @@ -10786,16 +11133,16 @@
     8820@@ -10786,16 +11158,16 @@
    85958821 }
    85968822 _ACEOF
    85978823 rm -f conftest.$ac_objext conftest$ac_exeext
    85988824-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
    8599 +if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
     8825+if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    86008826   (eval $ac_link) 2>&5
    86018827   ac_status=$?
    86028828-  echo "$as_me:10792: \$? = $ac_status" >&5
    8603 +  echo "$as_me:11139: \$? = $ac_status" >&5
     8829+  echo "$as_me:11164: \$? = $ac_status" >&5
    86048830   (exit $ac_status); } &&
    86058831          { ac_try='test -s conftest$ac_exeext'
    86068832-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
    8607 +  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
     8833+  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    86088834   (eval $ac_try) 2>&5
    86098835   ac_status=$?
    86108836-  echo "$as_me:10798: \$? = $ac_status" >&5
    8611 +  echo "$as_me:11145: \$? = $ac_status" >&5
     8837+  echo "$as_me:11170: \$? = $ac_status" >&5
    86128838   (exit $ac_status); }; }; then
    86138839   ac_cv_lib_dbmalloc_debug_malloc=yes
    86148840 else
    8615 @@ -10806,7 +11153,7 @@
     8841@@ -10806,7 +11178,7 @@
    86168842 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    86178843 LIBS=$ac_check_lib_save_LIBS
    86188844 fi
    86198845-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    8620 +echo "$as_me:11156: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
     8846+echo "$as_me:11181: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    86218847 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
    86228848 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    86238849   cat >>confdefs.h <<EOF
    8624 @@ -10821,7 +11168,7 @@
     8850@@ -10821,7 +11193,7 @@
    86258851 
    86268852 fi
    86278853 
    86288854-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
    8629 +echo "$as_me:11171: 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
    86308856 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
    86318857 
    86328858 # Check whether --with-valgrind or --without-valgrind was given.
    8633 @@ -10837,7 +11184,7 @@
     8859@@ -10837,7 +11209,7 @@
    86348860 else
    86358861   with_valgrind=
    86368862 fi;
    86378863-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
    8638 +echo "$as_me:11187: result: ${with_valgrind:-no}" >&5
     8864+echo "$as_me:11212: result: ${with_valgrind:-no}" >&5
    86398865 echo "${ECHO_T}${with_valgrind:-no}" >&6
    86408866 
    86418867 case .$with_cflags in #(vi
    8642 @@ -10920,7 +11267,7 @@
     8868@@ -10907,7 +11279,7 @@
     8869 
     8870 if test -n "$cf_new_cppflags" ; then
     8871 
     8872-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     8873+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     8874 fi
     8875 
     8876 if test -n "$cf_new_extra_cppflags" ; then
     8877@@ -10920,7 +11292,7 @@
    86438878        ;;
    86448879 esac
    86458880 
    86468881-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
    8647 +echo "$as_me:11270: 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
    86488883 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
    86498884 
    86508885 # Check whether --enable-leaks or --disable-leaks was given.
    8651 @@ -10930,7 +11277,7 @@
     8886@@ -10930,7 +11302,7 @@
    86528887 else
    86538888   : ${with_no_leaks:=no}
    86548889 fi;
    86558890-echo "$as_me:10933: result: $with_no_leaks" >&5
    8656 +echo "$as_me:11280: result: $with_no_leaks" >&5
     8891+echo "$as_me:11305: result: $with_no_leaks" >&5
    86578892 echo "${ECHO_T}$with_no_leaks" >&6
    86588893 
    86598894 if test "$with_no_leaks" = yes ; then
    8660 @@ -10975,7 +11322,7 @@
     8895@@ -10975,7 +11347,7 @@
    86618896        ;;
    86628897 esac
    86638898 
    86648899-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
    8665 +echo "$as_me:11325: 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
    86668901 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
    86678902 
    86688903 # Check whether --with-trace or --without-trace was given.
    8669 @@ -10985,7 +11332,7 @@
     8904@@ -10985,7 +11357,7 @@
    86708905 else
    86718906   cf_with_trace=$cf_all_traces
    86728907 fi;
    86738908-echo "$as_me:10988: result: $cf_with_trace" >&5
    8674 +echo "$as_me:11335: result: $cf_with_trace" >&5
     8909+echo "$as_me:11360: result: $cf_with_trace" >&5
    86758910 echo "${ECHO_T}$cf_with_trace" >&6
    86768911 
    86778912 if test "$cf_with_trace" = yes ; then
    8678 @@ -11066,13 +11413,13 @@
     8913@@ -11052,7 +11424,7 @@
     8914 
     8915 if test -n "$cf_new_cppflags" ; then
     8916 
     8917-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     8918+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     8919 fi
     8920 
     8921 if test -n "$cf_new_extra_cppflags" ; then
     8922@@ -11066,13 +11438,17 @@
    86798923 fi
    86808924 
    86818925 ###    Checks for libraries.
    86828926-echo "$as_me:11069: checking for gettimeofday" >&5
    8683 +echo "$as_me:11416: checking for gettimeofday" >&5
     8927+case $cf_cv_system_name in #(vi
     8928+*mingw32*) #(vi
     8929+       ;;
     8930+*)
     8931+echo "$as_me:11445: checking for gettimeofday" >&5
    86848932 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
    86858933 if test "${ac_cv_func_gettimeofday+set}" = set; then
    … …  
    86888936   cat >conftest.$ac_ext <<_ACEOF
    86898937-#line 11075 "configure"
    8690 +#line 11422 "configure"
     8938+#line 11451 "configure"
    86918939 #include "confdefs.h"
    86928940 /* System header to define __stub macros and hopefully few prototypes,
    86938941     which can conflict with char gettimeofday (); below.  */
    8694 @@ -11103,16 +11450,16 @@
     8942@@ -11103,16 +11479,16 @@
    86958943 }
    86968944 _ACEOF
    86978945 rm -f conftest.$ac_objext conftest$ac_exeext
    86988946-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
    8699 +if { (eval echo "$as_me:11453: \"$ac_link\"") >&5
     8947+if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
    87008948   (eval $ac_link) 2>&5
    87018949   ac_status=$?
    87028950-  echo "$as_me:11109: \$? = $ac_status" >&5
    8703 +  echo "$as_me:11456: \$? = $ac_status" >&5
     8951+  echo "$as_me:11485: \$? = $ac_status" >&5
    87048952   (exit $ac_status); } &&
    87058953          { ac_try='test -s conftest$ac_exeext'
    87068954-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
    8707 +  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
     8955+  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
    87088956   (eval $ac_try) 2>&5
    87098957   ac_status=$?
    87108958-  echo "$as_me:11115: \$? = $ac_status" >&5
    8711 +  echo "$as_me:11462: \$? = $ac_status" >&5
     8959+  echo "$as_me:11491: \$? = $ac_status" >&5
    87128960   (exit $ac_status); }; }; then
    87138961   ac_cv_func_gettimeofday=yes
    87148962 else
    8715 @@ -11122,7 +11469,7 @@
     8963@@ -11122,7 +11498,7 @@
    87168964 fi
    87178965 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    87188966 fi
    87198967-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
    8720 +echo "$as_me:11472: result: $ac_cv_func_gettimeofday" >&5
     8968+echo "$as_me:11501: result: $ac_cv_func_gettimeofday" >&5
    87218969 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
    87228970 if test $ac_cv_func_gettimeofday = yes; then
    87238971   cat >>confdefs.h <<\EOF
    8724 @@ -11131,7 +11478,7 @@
     8972@@ -11131,7 +11507,7 @@
    87258973 
    87268974 else
    87278975 
    87288976-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
    8729 +echo "$as_me:11481: checking for gettimeofday in -lbsd" >&5
     8977+echo "$as_me:11510: checking for gettimeofday in -lbsd" >&5
    87308978 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
    87318979 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    87328980   echo $ECHO_N "(cached) $ECHO_C" >&6
    8733 @@ -11139,7 +11486,7 @@
     8981@@ -11139,7 +11515,7 @@
    87348982   ac_check_lib_save_LIBS=$LIBS
    87358983 LIBS="-lbsd  $LIBS"
    87368984 cat >conftest.$ac_ext <<_ACEOF
    87378985-#line 11142 "configure"
    8738 +#line 11489 "configure"
     8986+#line 11518 "configure"
    87398987 #include "confdefs.h"
    87408988 
    87418989 /* Override any gcc2 internal prototype to avoid an error.  */
    8742 @@ -11158,16 +11505,16 @@
     8990@@ -11158,16 +11534,16 @@
    87438991 }
    87448992 _ACEOF
    87458993 rm -f conftest.$ac_objext conftest$ac_exeext
    87468994-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    8747 +if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
     8995+if { (eval echo "$as_me:11537: \"$ac_link\"") >&5
    87488996   (eval $ac_link) 2>&5
    87498997   ac_status=$?
    87508998-  echo "$as_me:11164: \$? = $ac_status" >&5
    8751 +  echo "$as_me:11511: \$? = $ac_status" >&5
     8999+  echo "$as_me:11540: \$? = $ac_status" >&5
    87529000   (exit $ac_status); } &&
    87539001          { ac_try='test -s conftest$ac_exeext'
    87549002-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    8755 +  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
     9003+  { (eval echo "$as_me:11543: \"$ac_try\"") >&5
    87569004   (eval $ac_try) 2>&5
    87579005   ac_status=$?
    87589006-  echo "$as_me:11170: \$? = $ac_status" >&5
    8759 +  echo "$as_me:11517: \$? = $ac_status" >&5
     9007+  echo "$as_me:11546: \$? = $ac_status" >&5
    87609008   (exit $ac_status); }; }; then
    87619009   ac_cv_lib_bsd_gettimeofday=yes
    87629010 else
    8763 @@ -11178,7 +11525,7 @@
     9011@@ -11178,7 +11554,7 @@
    87649012 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    87659013 LIBS=$ac_check_lib_save_LIBS
    87669014 fi
    87679015-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
    8768 +echo "$as_me:11528: result: $ac_cv_lib_bsd_gettimeofday" >&5
     9016+echo "$as_me:11557: result: $ac_cv_lib_bsd_gettimeofday" >&5
    87699017 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
    87709018 if test $ac_cv_lib_bsd_gettimeofday = yes; then
    87719019   cat >>confdefs.h <<\EOF
    8772 @@ -11190,14 +11537,14 @@
    8773  
    8774  fi
     9020@@ -11189,15 +11565,17 @@
     9021 fi
     9022 
     9023 fi
     9024+       ;;
     9025+esac
    87759026 
    87769027-echo "$as_me:11193: checking if -lm needed for math functions" >&5
    8777 +echo "$as_me:11540: checking if -lm needed for math functions" >&5
     9028+echo "$as_me:11571: checking if -lm needed for math functions" >&5
    87789029 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
    87799030 if test "${cf_cv_need_libm+set}" = set; then
    … …  
    87839034        cat >conftest.$ac_ext <<_ACEOF
    87849035-#line 11200 "configure"
    8785 +#line 11547 "configure"
     9036+#line 11578 "configure"
    87869037 #include "confdefs.h"
    87879038 
    87889039        #include <stdio.h>
    8789 @@ -11212,16 +11559,16 @@
     9040@@ -11212,16 +11590,16 @@
    87909041 }
    87919042 _ACEOF
    87929043 rm -f conftest.$ac_objext conftest$ac_exeext
    87939044-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
    8794 +if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
     9045+if { (eval echo "$as_me:11593: \"$ac_link\"") >&5
    87959046   (eval $ac_link) 2>&5
    87969047   ac_status=$?
    87979048-  echo "$as_me:11218: \$? = $ac_status" >&5
    8798 +  echo "$as_me:11565: \$? = $ac_status" >&5
     9049+  echo "$as_me:11596: \$? = $ac_status" >&5
    87999050   (exit $ac_status); } &&
    88009051          { ac_try='test -s conftest$ac_exeext'
    88019052-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
    8802 +  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
     9053+  { (eval echo "$as_me:11599: \"$ac_try\"") >&5
    88039054   (eval $ac_try) 2>&5
    88049055   ac_status=$?
    88059056-  echo "$as_me:11224: \$? = $ac_status" >&5
    8806 +  echo "$as_me:11571: \$? = $ac_status" >&5
     9057+  echo "$as_me:11602: \$? = $ac_status" >&5
    88079058   (exit $ac_status); }; }; then
    88089059   cf_cv_need_libm=no
    88099060 else
    8810 @@ -11231,7 +11578,7 @@
     9061@@ -11231,7 +11609,7 @@
    88119062 fi
    88129063 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    88139064 fi
    88149065-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
    8815 +echo "$as_me:11581: result: $cf_cv_need_libm" >&5
     9066+echo "$as_me:11612: result: $cf_cv_need_libm" >&5
    88169067 echo "${ECHO_T}$cf_cv_need_libm" >&6
    88179068 if test "$cf_cv_need_libm" = yes
    88189069 then
    8819 @@ -11239,13 +11586,13 @@
     9070@@ -11239,13 +11617,13 @@
    88209071 fi
    88219072 
    88229073 ###    Checks for header files.
    88239074-echo "$as_me:11242: checking for ANSI C header files" >&5
    8824 +echo "$as_me:11589: checking for ANSI C header files" >&5
     9075+echo "$as_me:11620: checking for ANSI C header files" >&5
    88259076 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    88269077 if test "${ac_cv_header_stdc+set}" = set; then
    … …  
    88299080   cat >conftest.$ac_ext <<_ACEOF
    88309081-#line 11248 "configure"
    8831 +#line 11595 "configure"
     9082+#line 11626 "configure"
    88329083 #include "confdefs.h"
    88339084 #include <stdlib.h>
    88349085 #include <stdarg.h>
    8835 @@ -11253,13 +11600,13 @@
     9086@@ -11253,13 +11631,13 @@
    88369087 #include <float.h>
    88379088 
    88389089 _ACEOF
    88399090-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
    8840 +if { (eval echo "$as_me:11603: \"$ac_cpp conftest.$ac_ext\"") >&5
     9091+if { (eval echo "$as_me:11634: \"$ac_cpp conftest.$ac_ext\"") >&5
    88419092   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    88429093   ac_status=$?
    … …  
    88459096   cat conftest.err >&5
    88469097-  echo "$as_me:11262: \$? = $ac_status" >&5
    8847 +  echo "$as_me:11609: \$? = $ac_status" >&5
     9098+  echo "$as_me:11640: \$? = $ac_status" >&5
    88489099   (exit $ac_status); } >/dev/null; then
    88499100   if test -s conftest.err; then
    88509101     ac_cpp_err=$ac_c_preproc_warn_flag
    8851 @@ -11281,7 +11628,7 @@
     9102@@ -11281,7 +11659,7 @@
    88529103 if test $ac_cv_header_stdc = yes; then
    88539104   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    88549105   cat >conftest.$ac_ext <<_ACEOF
    88559106-#line 11284 "configure"
    8856 +#line 11631 "configure"
     9107+#line 11662 "configure"
    88579108 #include "confdefs.h"
    88589109 #include <string.h>
    88599110 
    8860 @@ -11299,7 +11646,7 @@
     9111@@ -11299,7 +11677,7 @@
    88619112 if test $ac_cv_header_stdc = yes; then
    88629113   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    88639114   cat >conftest.$ac_ext <<_ACEOF
    88649115-#line 11302 "configure"
    8865 +#line 11649 "configure"
     9116+#line 11680 "configure"
    88669117 #include "confdefs.h"
    88679118 #include <stdlib.h>
    88689119 
    8869 @@ -11320,7 +11667,7 @@
     9120@@ -11320,7 +11698,7 @@
    88709121   :
    88719122 else
    88729123   cat >conftest.$ac_ext <<_ACEOF
    88739124-#line 11323 "configure"
    8874 +#line 11670 "configure"
     9125+#line 11701 "configure"
    88759126 #include "confdefs.h"
    88769127 #include <ctype.h>
    88779128 #if ((' ' & 0x0FF) == 0x020)
    8878 @@ -11346,15 +11693,15 @@
     9129@@ -11346,15 +11724,15 @@
    88799130 }
    88809131 _ACEOF
    88819132 rm -f conftest$ac_exeext
    88829133-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
    8883 +if { (eval echo "$as_me:11696: \"$ac_link\"") >&5
     9134+if { (eval echo "$as_me:11727: \"$ac_link\"") >&5
    88849135   (eval $ac_link) 2>&5
    88859136   ac_status=$?
    88869137-  echo "$as_me:11352: \$? = $ac_status" >&5
    8887 +  echo "$as_me:11699: \$? = $ac_status" >&5
     9138+  echo "$as_me:11730: \$? = $ac_status" >&5
    88889139   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    88899140-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
    8890 +  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
     9141+  { (eval echo "$as_me:11732: \"$ac_try\"") >&5
    88919142   (eval $ac_try) 2>&5
    88929143   ac_status=$?
    88939144-  echo "$as_me:11357: \$? = $ac_status" >&5
    8894 +  echo "$as_me:11704: \$? = $ac_status" >&5
     9145+  echo "$as_me:11735: \$? = $ac_status" >&5
    88959146   (exit $ac_status); }; }; then
    88969147   :
    88979148 else
    8898 @@ -11367,7 +11714,7 @@
     9149@@ -11367,7 +11745,7 @@
    88999150 fi
    89009151 fi
    89019152 fi
    89029153-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
    8903 +echo "$as_me:11717: result: $ac_cv_header_stdc" >&5
     9154+echo "$as_me:11748: result: $ac_cv_header_stdc" >&5
    89049155 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    89059156 if test $ac_cv_header_stdc = yes; then
    89069157 
    8907 @@ -11380,13 +11727,13 @@
     9158@@ -11380,13 +11758,13 @@
    89089159 ac_header_dirent=no
    89099160 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    89109161   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
    89119162-echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
    8912 +echo "$as_me:11730: checking for $ac_hdr that defines DIR" >&5
     9163+echo "$as_me:11761: checking for $ac_hdr that defines DIR" >&5
    89139164 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
    89149165 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    89179168   cat >conftest.$ac_ext <<_ACEOF
    89189169-#line 11389 "configure"
    8919 +#line 11736 "configure"
     9170+#line 11767 "configure"
    89209171 #include "confdefs.h"
    89219172 #include <sys/types.h>
    89229173 #include <$ac_hdr>
    8923 @@ -11401,16 +11748,16 @@
     9174@@ -11401,16 +11779,16 @@
    89249175 }
    89259176 _ACEOF
    89269177 rm -f conftest.$ac_objext
    89279178-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
    8928 +if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
     9179+if { (eval echo "$as_me:11782: \"$ac_compile\"") >&5
    89299180   (eval $ac_compile) 2>&5
    89309181   ac_status=$?
    89319182-  echo "$as_me:11407: \$? = $ac_status" >&5
    8932 +  echo "$as_me:11754: \$? = $ac_status" >&5
     9183+  echo "$as_me:11785: \$? = $ac_status" >&5
    89339184   (exit $ac_status); } &&
    89349185          { ac_try='test -s conftest.$ac_objext'
    89359186-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
    8936 +  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
     9187+  { (eval echo "$as_me:11788: \"$ac_try\"") >&5
    89379188   (eval $ac_try) 2>&5
    89389189   ac_status=$?
    89399190-  echo "$as_me:11413: \$? = $ac_status" >&5
    8940 +  echo "$as_me:11760: \$? = $ac_status" >&5
     9191+  echo "$as_me:11791: \$? = $ac_status" >&5
    89419192   (exit $ac_status); }; }; then
    89429193   eval "$as_ac_Header=yes"
    89439194 else
    8944 @@ -11420,7 +11767,7 @@
     9195@@ -11420,7 +11798,7 @@
    89459196 fi
    89469197 rm -f conftest.$ac_objext conftest.$ac_ext
    89479198 fi
    89489199-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
    8949 +echo "$as_me:11770: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9200+echo "$as_me:11801: result: `eval echo '${'$as_ac_Header'}'`" >&5
    89509201 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    89519202 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    89529203   cat >>confdefs.h <<EOF
    8953 @@ -11433,7 +11780,7 @@
     9204@@ -11433,7 +11811,7 @@
    89549205 done
    89559206 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
    89569207 if test $ac_header_dirent = dirent.h; then
    89579208-  echo "$as_me:11436: checking for opendir in -ldir" >&5
    8958 +  echo "$as_me:11783: checking for opendir in -ldir" >&5
     9209+  echo "$as_me:11814: checking for opendir in -ldir" >&5
    89599210 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
    89609211 if test "${ac_cv_lib_dir_opendir+set}" = set; then
    89619212   echo $ECHO_N "(cached) $ECHO_C" >&6
    8962 @@ -11441,7 +11788,7 @@
     9213@@ -11441,7 +11819,7 @@
    89639214   ac_check_lib_save_LIBS=$LIBS
    89649215 LIBS="-ldir  $LIBS"
    89659216 cat >conftest.$ac_ext <<_ACEOF
    89669217-#line 11444 "configure"
    8967 +#line 11791 "configure"
     9218+#line 11822 "configure"
    89689219 #include "confdefs.h"
    89699220 
    89709221 /* Override any gcc2 internal prototype to avoid an error.  */
    8971 @@ -11460,16 +11807,16 @@
     9222@@ -11460,16 +11838,16 @@
    89729223 }
    89739224 _ACEOF
    89749225 rm -f conftest.$ac_objext conftest$ac_exeext
    89759226-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
    8976 +if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
     9227+if { (eval echo "$as_me:11841: \"$ac_link\"") >&5
    89779228   (eval $ac_link) 2>&5
    89789229   ac_status=$?
    89799230-  echo "$as_me:11466: \$? = $ac_status" >&5
    8980 +  echo "$as_me:11813: \$? = $ac_status" >&5
     9231+  echo "$as_me:11844: \$? = $ac_status" >&5
    89819232   (exit $ac_status); } &&
    89829233          { ac_try='test -s conftest$ac_exeext'
    89839234-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
    8984 +  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
     9235+  { (eval echo "$as_me:11847: \"$ac_try\"") >&5
    89859236   (eval $ac_try) 2>&5
    89869237   ac_status=$?
    89879238-  echo "$as_me:11472: \$? = $ac_status" >&5
    8988 +  echo "$as_me:11819: \$? = $ac_status" >&5
     9239+  echo "$as_me:11850: \$? = $ac_status" >&5
    89899240   (exit $ac_status); }; }; then
    89909241   ac_cv_lib_dir_opendir=yes
    89919242 else
    8992 @@ -11480,14 +11827,14 @@
     9243@@ -11480,14 +11858,14 @@
    89939244 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    89949245 LIBS=$ac_check_lib_save_LIBS
    89959246 fi
    89969247-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
    8997 +echo "$as_me:11830: result: $ac_cv_lib_dir_opendir" >&5
     9248+echo "$as_me:11861: result: $ac_cv_lib_dir_opendir" >&5
    89989249 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
    89999250 if test $ac_cv_lib_dir_opendir = yes; then
    … …  
    90039254 else
    90049255-  echo "$as_me:11490: checking for opendir in -lx" >&5
    9005 +  echo "$as_me:11837: checking for opendir in -lx" >&5
     9256+  echo "$as_me:11868: checking for opendir in -lx" >&5
    90069257 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
    90079258 if test "${ac_cv_lib_x_opendir+set}" = set; then
    90089259   echo $ECHO_N "(cached) $ECHO_C" >&6
    9009 @@ -11495,7 +11842,7 @@
     9260@@ -11495,7 +11873,7 @@
    90109261   ac_check_lib_save_LIBS=$LIBS
    90119262 LIBS="-lx  $LIBS"
    90129263 cat >conftest.$ac_ext <<_ACEOF
    90139264-#line 11498 "configure"
    9014 +#line 11845 "configure"
     9265+#line 11876 "configure"
    90159266 #include "confdefs.h"
    90169267 
    90179268 /* Override any gcc2 internal prototype to avoid an error.  */
    9018 @@ -11514,16 +11861,16 @@
     9269@@ -11514,16 +11892,16 @@
    90199270 }
    90209271 _ACEOF
    90219272 rm -f conftest.$ac_objext conftest$ac_exeext
    90229273-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
    9023 +if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
     9274+if { (eval echo "$as_me:11895: \"$ac_link\"") >&5
    90249275   (eval $ac_link) 2>&5
    90259276   ac_status=$?
    90269277-  echo "$as_me:11520: \$? = $ac_status" >&5
    9027 +  echo "$as_me:11867: \$? = $ac_status" >&5
     9278+  echo "$as_me:11898: \$? = $ac_status" >&5
    90289279   (exit $ac_status); } &&
    90299280          { ac_try='test -s conftest$ac_exeext'
    90309281-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
    9031 +  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
     9282+  { (eval echo "$as_me:11901: \"$ac_try\"") >&5
    90329283   (eval $ac_try) 2>&5
    90339284   ac_status=$?
    90349285-  echo "$as_me:11526: \$? = $ac_status" >&5
    9035 +  echo "$as_me:11873: \$? = $ac_status" >&5
     9286+  echo "$as_me:11904: \$? = $ac_status" >&5
    90369287   (exit $ac_status); }; }; then
    90379288   ac_cv_lib_x_opendir=yes
    90389289 else
    9039 @@ -11534,7 +11881,7 @@
     9290@@ -11534,7 +11912,7 @@
    90409291 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    90419292 LIBS=$ac_check_lib_save_LIBS
    90429293 fi
    90439294-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
    9044 +echo "$as_me:11884: result: $ac_cv_lib_x_opendir" >&5
     9295+echo "$as_me:11915: result: $ac_cv_lib_x_opendir" >&5
    90459296 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
    90469297 if test $ac_cv_lib_x_opendir = yes; then
    90479298   LIBS="$LIBS -lx"
    9048 @@ -11542,13 +11889,13 @@
     9299@@ -11542,13 +11920,13 @@
    90499300 
    90509301 fi
    90519302 
    90529303-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
    9053 +echo "$as_me:11892: 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
    90549305 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
    90559306 if test "${ac_cv_header_time+set}" = set; then
    … …  
    90589309   cat >conftest.$ac_ext <<_ACEOF
    90599310-#line 11551 "configure"
    9060 +#line 11898 "configure"
     9311+#line 11929 "configure"
    90619312 #include "confdefs.h"
    90629313 #include <sys/types.h>
    90639314 #include <sys/time.h>
    9064 @@ -11564,16 +11911,16 @@
     9315@@ -11564,16 +11942,16 @@
    90659316 }
    90669317 _ACEOF
    90679318 rm -f conftest.$ac_objext
    90689319-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
    9069 +if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
     9320+if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5
    90709321   (eval $ac_compile) 2>&5
    90719322   ac_status=$?
    90729323-  echo "$as_me:11570: \$? = $ac_status" >&5
    9073 +  echo "$as_me:11917: \$? = $ac_status" >&5
     9324+  echo "$as_me:11948: \$? = $ac_status" >&5
    90749325   (exit $ac_status); } &&
    90759326          { ac_try='test -s conftest.$ac_objext'
    90769327-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
    9077 +  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
     9328+  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
    90789329   (eval $ac_try) 2>&5
    90799330   ac_status=$?
    90809331-  echo "$as_me:11576: \$? = $ac_status" >&5
    9081 +  echo "$as_me:11923: \$? = $ac_status" >&5
     9332+  echo "$as_me:11954: \$? = $ac_status" >&5
    90829333   (exit $ac_status); }; }; then
    90839334   ac_cv_header_time=yes
    90849335 else
    9085 @@ -11583,7 +11930,7 @@
     9336@@ -11583,7 +11961,7 @@
    90869337 fi
    90879338 rm -f conftest.$ac_objext conftest.$ac_ext
    90889339 fi
    90899340-echo "$as_me:11586: result: $ac_cv_header_time" >&5
    9090 +echo "$as_me:11933: result: $ac_cv_header_time" >&5
     9341+echo "$as_me:11964: result: $ac_cv_header_time" >&5
    90919342 echo "${ECHO_T}$ac_cv_header_time" >&6
    90929343 if test $ac_cv_header_time = yes; then
    90939344 
    9094 @@ -11593,14 +11940,14 @@
     9345@@ -11593,14 +11971,14 @@
    90959346 
    90969347 fi
    90979348 
    90989349-echo "$as_me:11596: checking for regular-expression headers" >&5
    9099 +echo "$as_me:11943: checking for regular-expression headers" >&5
     9350+echo "$as_me:11974: checking for regular-expression headers" >&5
    91009351 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
    91019352 if test "${cf_cv_regex+set}" = set; then
    … …  
    91059356 cat >conftest.$ac_ext <<_ACEOF
    91069357-#line 11603 "configure"
    9107 +#line 11950 "configure"
     9358+#line 11981 "configure"
    91089359 #include "confdefs.h"
    91099360 #include <sys/types.h>
    91109361 #include <regex.h>
    9111 @@ -11618,16 +11965,16 @@
     9362@@ -11618,16 +11996,16 @@
    91129363 }
    91139364 _ACEOF
    91149365 rm -f conftest.$ac_objext conftest$ac_exeext
    91159366-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
    9116 +if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
     9367+if { (eval echo "$as_me:11999: \"$ac_link\"") >&5
    91179368   (eval $ac_link) 2>&5
    91189369   ac_status=$?
    91199370-  echo "$as_me:11624: \$? = $ac_status" >&5
    9120 +  echo "$as_me:11971: \$? = $ac_status" >&5
     9371+  echo "$as_me:12002: \$? = $ac_status" >&5
    91219372   (exit $ac_status); } &&
    91229373          { ac_try='test -s conftest$ac_exeext'
    91239374-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
    9124 +  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
     9375+  { (eval echo "$as_me:12005: \"$ac_try\"") >&5
    91259376   (eval $ac_try) 2>&5
    91269377   ac_status=$?
    91279378-  echo "$as_me:11630: \$? = $ac_status" >&5
    9128 +  echo "$as_me:11977: \$? = $ac_status" >&5
     9379+  echo "$as_me:12008: \$? = $ac_status" >&5
    91299380   (exit $ac_status); }; }; then
    91309381   cf_cv_regex="regex.h"
    91319382 else
    9132 @@ -11635,7 +11982,7 @@
     9383@@ -11635,7 +12013,7 @@
    91339384 cat conftest.$ac_ext >&5
    91349385 
    91359386        cat >conftest.$ac_ext <<_ACEOF
    91369387-#line 11638 "configure"
    9137 +#line 11985 "configure"
     9388+#line 12016 "configure"
    91389389 #include "confdefs.h"
    91399390 #include <regexp.h>
    91409391 int
    9141 @@ -11650,16 +11997,16 @@
     9392@@ -11650,16 +12028,16 @@
    91429393 }
    91439394 _ACEOF
    91449395 rm -f conftest.$ac_objext conftest$ac_exeext
    91459396-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
    9146 +if { (eval echo "$as_me:12000: \"$ac_link\"") >&5
     9397+if { (eval echo "$as_me:12031: \"$ac_link\"") >&5
    91479398   (eval $ac_link) 2>&5
    91489399   ac_status=$?
    91499400-  echo "$as_me:11656: \$? = $ac_status" >&5
    9150 +  echo "$as_me:12003: \$? = $ac_status" >&5
     9401+  echo "$as_me:12034: \$? = $ac_status" >&5
    91519402   (exit $ac_status); } &&
    91529403          { ac_try='test -s conftest$ac_exeext'
    91539404-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
    9154 +  { (eval echo "$as_me:12006: \"$ac_try\"") >&5
     9405+  { (eval echo "$as_me:12037: \"$ac_try\"") >&5
    91559406   (eval $ac_try) 2>&5
    91569407   ac_status=$?
    91579408-  echo "$as_me:11662: \$? = $ac_status" >&5
    9158 +  echo "$as_me:12009: \$? = $ac_status" >&5
     9409+  echo "$as_me:12040: \$? = $ac_status" >&5
    91599410   (exit $ac_status); }; }; then
    91609411   cf_cv_regex="regexp.h"
    91619412 else
    9162 @@ -11669,7 +12016,7 @@
     9413@@ -11669,7 +12047,7 @@
    91639414                cf_save_LIBS="$LIBS"
    91649415                LIBS="-lgen $LIBS"
    91659416                cat >conftest.$ac_ext <<_ACEOF
    91669417-#line 11672 "configure"
    9167 +#line 12019 "configure"
     9418+#line 12050 "configure"
    91689419 #include "confdefs.h"
    91699420 #include <regexpr.h>
    91709421 int
    9171 @@ -11684,16 +12031,16 @@
     9422@@ -11684,16 +12062,16 @@
    91729423 }
    91739424 _ACEOF
    91749425 rm -f conftest.$ac_objext conftest$ac_exeext
    91759426-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
    9176 +if { (eval echo "$as_me:12034: \"$ac_link\"") >&5
     9427+if { (eval echo "$as_me:12065: \"$ac_link\"") >&5
    91779428   (eval $ac_link) 2>&5
    91789429   ac_status=$?
    91799430-  echo "$as_me:11690: \$? = $ac_status" >&5
    9180 +  echo "$as_me:12037: \$? = $ac_status" >&5
     9431+  echo "$as_me:12068: \$? = $ac_status" >&5
    91819432   (exit $ac_status); } &&
    91829433          { ac_try='test -s conftest$ac_exeext'
    91839434-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
    9184 +  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
     9435+  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
    91859436   (eval $ac_try) 2>&5
    91869437   ac_status=$?
    91879438-  echo "$as_me:11696: \$? = $ac_status" >&5
    9188 +  echo "$as_me:12043: \$? = $ac_status" >&5
     9439+  echo "$as_me:12074: \$? = $ac_status" >&5
    91899440   (exit $ac_status); }; }; then
    91909441   cf_cv_regex="regexpr.h"
    91919442 else
    9192 @@ -11709,7 +12056,7 @@
     9443@@ -11709,7 +12087,7 @@
    91939444 
    91949445 fi
    91959446 
    91969447-echo "$as_me:11712: result: $cf_cv_regex" >&5
    9197 +echo "$as_me:12059: result: $cf_cv_regex" >&5
     9448+echo "$as_me:12090: result: $cf_cv_regex" >&5
    91989449 echo "${ECHO_T}$cf_cv_regex" >&6
    91999450 case $cf_cv_regex in
    92009451        regex.h)   cat >>confdefs.h <<\EOF
    9201 @@ -11745,23 +12092,23 @@
     9452@@ -11745,23 +12123,23 @@
    92029453 
    92039454 do
    92049455 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    92059456-echo "$as_me:11748: checking for $ac_header" >&5
    9206 +echo "$as_me:12095: checking for $ac_header" >&5
     9457+echo "$as_me:12126: checking for $ac_header" >&5
    92079458 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    92089459 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    92119462   cat >conftest.$ac_ext <<_ACEOF
    92129463-#line 11754 "configure"
    9213 +#line 12101 "configure"
     9464+#line 12132 "configure"
    92149465 #include "confdefs.h"
    92159466 #include <$ac_header>
    92169467 _ACEOF
    92179468-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
    9218 +if { (eval echo "$as_me:12105: \"$ac_cpp conftest.$ac_ext\"") >&5
     9469+if { (eval echo "$as_me:12136: \"$ac_cpp conftest.$ac_ext\"") >&5
    92199470   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    92209471   ac_status=$?
    … …  
    92239474   cat conftest.err >&5
    92249475-  echo "$as_me:11764: \$? = $ac_status" >&5
    9225 +  echo "$as_me:12111: \$? = $ac_status" >&5
     9476+  echo "$as_me:12142: \$? = $ac_status" >&5
    92269477   (exit $ac_status); } >/dev/null; then
    92279478   if test -s conftest.err; then
    92289479     ac_cpp_err=$ac_c_preproc_warn_flag
    9229 @@ -11780,7 +12127,7 @@
     9480@@ -11780,7 +12158,7 @@
    92309481 fi
    92319482 rm -f conftest.err conftest.$ac_ext
    92329483 fi
    92339484-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
    9234 +echo "$as_me:12130: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9485+echo "$as_me:12161: result: `eval echo '${'$as_ac_Header'}'`" >&5
    92359486 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    92369487 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    92379488   cat >>confdefs.h <<EOF
    9238 @@ -11794,7 +12141,7 @@
     9489@@ -11794,7 +12172,7 @@
    92399490 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
    92409491 if test "$ISC" = yes ; then
    92419492 
    92429493-echo "$as_me:11797: checking for main in -lcposix" >&5
    9243 +echo "$as_me:12144: checking for main in -lcposix" >&5
     9494+echo "$as_me:12175: checking for main in -lcposix" >&5
    92449495 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
    92459496 if test "${ac_cv_lib_cposix_main+set}" = set; then
    92469497   echo $ECHO_N "(cached) $ECHO_C" >&6
    9247 @@ -11802,7 +12149,7 @@
     9498@@ -11802,7 +12180,7 @@
    92489499   ac_check_lib_save_LIBS=$LIBS
    92499500 LIBS="-lcposix  $LIBS"
    92509501 cat >conftest.$ac_ext <<_ACEOF
    92519502-#line 11805 "configure"
    9252 +#line 12152 "configure"
     9503+#line 12183 "configure"
    92539504 #include "confdefs.h"
    92549505 
    92559506 int
    9256 @@ -11814,16 +12161,16 @@
     9507@@ -11814,16 +12192,16 @@
    92579508 }
    92589509 _ACEOF
    92599510 rm -f conftest.$ac_objext conftest$ac_exeext
    92609511-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
    9261 +if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
     9512+if { (eval echo "$as_me:12195: \"$ac_link\"") >&5
    92629513   (eval $ac_link) 2>&5
    92639514   ac_status=$?
    92649515-  echo "$as_me:11820: \$? = $ac_status" >&5
    9265 +  echo "$as_me:12167: \$? = $ac_status" >&5
     9516+  echo "$as_me:12198: \$? = $ac_status" >&5
    92669517   (exit $ac_status); } &&
    92679518          { ac_try='test -s conftest$ac_exeext'
    92689519-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
    9269 +  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
     9520+  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
    92709521   (eval $ac_try) 2>&5
    92719522   ac_status=$?
    92729523-  echo "$as_me:11826: \$? = $ac_status" >&5
    9273 +  echo "$as_me:12173: \$? = $ac_status" >&5
     9524+  echo "$as_me:12204: \$? = $ac_status" >&5
    92749525   (exit $ac_status); }; }; then
    92759526   ac_cv_lib_cposix_main=yes
    92769527 else
    9277 @@ -11834,7 +12181,7 @@
     9528@@ -11834,7 +12212,7 @@
    92789529 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    92799530 LIBS=$ac_check_lib_save_LIBS
    92809531 fi
    92819532-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
    9282 +echo "$as_me:12184: result: $ac_cv_lib_cposix_main" >&5
     9533+echo "$as_me:12215: result: $ac_cv_lib_cposix_main" >&5
    92839534 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
    92849535 if test $ac_cv_lib_cposix_main = yes; then
    92859536   cat >>confdefs.h <<EOF
    9286 @@ -11845,7 +12192,7 @@
     9537@@ -11845,7 +12223,7 @@
    92879538 
    92889539 fi
    92899540 
    92909541-       echo "$as_me:11848: checking for bzero in -linet" >&5
    9291 +       echo "$as_me:12195: checking for bzero in -linet" >&5
     9542+       echo "$as_me:12226: checking for bzero in -linet" >&5
    92929543 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
    92939544 if test "${ac_cv_lib_inet_bzero+set}" = set; then
    92949545   echo $ECHO_N "(cached) $ECHO_C" >&6
    9295 @@ -11853,7 +12200,7 @@
     9546@@ -11853,7 +12231,7 @@
    92969547   ac_check_lib_save_LIBS=$LIBS
    92979548 LIBS="-linet  $LIBS"
    92989549 cat >conftest.$ac_ext <<_ACEOF
    92999550-#line 11856 "configure"
    9300 +#line 12203 "configure"
     9551+#line 12234 "configure"
    93019552 #include "confdefs.h"
    93029553 
    93039554 /* Override any gcc2 internal prototype to avoid an error.  */
    9304 @@ -11872,16 +12219,16 @@
     9555@@ -11872,16 +12250,16 @@
    93059556 }
    93069557 _ACEOF
    93079558 rm -f conftest.$ac_objext conftest$ac_exeext
    93089559-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
    9309 +if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
     9560+if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
    93109561   (eval $ac_link) 2>&5
    93119562   ac_status=$?
    93129563-  echo "$as_me:11878: \$? = $ac_status" >&5
    9313 +  echo "$as_me:12225: \$? = $ac_status" >&5
     9564+  echo "$as_me:12256: \$? = $ac_status" >&5
    93149565   (exit $ac_status); } &&
    93159566          { ac_try='test -s conftest$ac_exeext'
    93169567-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
    9317 +  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
     9568+  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
    93189569   (eval $ac_try) 2>&5
    93199570   ac_status=$?
    93209571-  echo "$as_me:11884: \$? = $ac_status" >&5
    9321 +  echo "$as_me:12231: \$? = $ac_status" >&5
     9572+  echo "$as_me:12262: \$? = $ac_status" >&5
    93229573   (exit $ac_status); }; }; then
    93239574   ac_cv_lib_inet_bzero=yes
    93249575 else
    9325 @@ -11892,21 +12239,21 @@
     9576@@ -11892,21 +12270,21 @@
    93269577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    93279578 LIBS=$ac_check_lib_save_LIBS
    93289579 fi
    93299580-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
    9330 +echo "$as_me:12242: result: $ac_cv_lib_inet_bzero" >&5
     9581+echo "$as_me:12273: result: $ac_cv_lib_inet_bzero" >&5
    93319582 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
    93329583 if test $ac_cv_lib_inet_bzero = yes; then
    … …  
    93369587 
    93379588-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
    9338 +echo "$as_me:12249: 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
    93399590 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
    93409591 if test "${cf_cv_sys_time_select+set}" = set; then
    … …  
    93449595 cat >conftest.$ac_ext <<_ACEOF
    93459596-#line 11909 "configure"
    9346 +#line 12256 "configure"
     9597+#line 12287 "configure"
    93479598 #include "confdefs.h"
    93489599 
    93499600 #include <sys/types.h>
    9350 @@ -11926,16 +12273,16 @@
     9601@@ -11926,16 +12304,16 @@
    93519602 }
    93529603 _ACEOF
    93539604 rm -f conftest.$ac_objext
    93549605-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
    9355 +if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
     9606+if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5
    93569607   (eval $ac_compile) 2>&5
    93579608   ac_status=$?
    93589609-  echo "$as_me:11932: \$? = $ac_status" >&5
    9359 +  echo "$as_me:12279: \$? = $ac_status" >&5
     9610+  echo "$as_me:12310: \$? = $ac_status" >&5
    93609611   (exit $ac_status); } &&
    93619612          { ac_try='test -s conftest.$ac_objext'
    93629613-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
    9363 +  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
     9614+  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
    93649615   (eval $ac_try) 2>&5
    93659616   ac_status=$?
    93669617-  echo "$as_me:11938: \$? = $ac_status" >&5
    9367 +  echo "$as_me:12285: \$? = $ac_status" >&5
     9618+  echo "$as_me:12316: \$? = $ac_status" >&5
    93689619   (exit $ac_status); }; }; then
    93699620   cf_cv_sys_time_select=yes
    93709621 else
    9371 @@ -11947,7 +12294,7 @@
     9622@@ -11947,7 +12325,7 @@
    93729623 
    93739624 fi
    93749625 
    93759626-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
    9376 +echo "$as_me:12297: result: $cf_cv_sys_time_select" >&5
     9627+echo "$as_me:12328: result: $cf_cv_sys_time_select" >&5
    93779628 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
    93789629 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
    93799630 #define HAVE_SYS_TIME_SELECT 1
    9380 @@ -11961,7 +12308,7 @@
     9631@@ -11961,7 +12339,7 @@
    93819632 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    93829633 ac_main_return=return
    93839634 
    93849635-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
    9385 +echo "$as_me:12311: checking for $CC option to accept ANSI C" >&5
     9636+echo "$as_me:12342: checking for $CC option to accept ANSI C" >&5
    93869637 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
    93879638 if test "${ac_cv_prog_cc_stdc+set}" = set; then
    93889639   echo $ECHO_N "(cached) $ECHO_C" >&6
    9389 @@ -11969,7 +12316,7 @@
     9640@@ -11969,7 +12347,7 @@
    93909641   ac_cv_prog_cc_stdc=no
    93919642 ac_save_CC=$CC
    93929643 cat >conftest.$ac_ext <<_ACEOF
    93939644-#line 11972 "configure"
    9394 +#line 12319 "configure"
     9645+#line 12350 "configure"
    93959646 #include "confdefs.h"
    93969647 #include <stdarg.h>
    93979648 #include <stdio.h>
    9398 @@ -12018,16 +12365,16 @@
     9649@@ -12018,16 +12396,16 @@
    93999650 do
    94009651   CC="$ac_save_CC $ac_arg"
    94019652   rm -f conftest.$ac_objext
    94029653-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
    9403 +if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
     9654+if { (eval echo "$as_me:12399: \"$ac_compile\"") >&5
    94049655   (eval $ac_compile) 2>&5
    94059656   ac_status=$?
    94069657-  echo "$as_me:12024: \$? = $ac_status" >&5
    9407 +  echo "$as_me:12371: \$? = $ac_status" >&5
     9658+  echo "$as_me:12402: \$? = $ac_status" >&5
    94089659   (exit $ac_status); } &&
    94099660          { ac_try='test -s conftest.$ac_objext'
    94109661-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
    9411 +  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
     9662+  { (eval echo "$as_me:12405: \"$ac_try\"") >&5
    94129663   (eval $ac_try) 2>&5
    94139664   ac_status=$?
    94149665-  echo "$as_me:12030: \$? = $ac_status" >&5
    9415 +  echo "$as_me:12377: \$? = $ac_status" >&5
     9666+  echo "$as_me:12408: \$? = $ac_status" >&5
    94169667   (exit $ac_status); }; }; then
    94179668   ac_cv_prog_cc_stdc=$ac_arg
    94189669 break
    9419 @@ -12044,21 +12391,21 @@
     9670@@ -12044,21 +12422,21 @@
    94209671 
    94219672 case "x$ac_cv_prog_cc_stdc" in
    94229673   x|xno)
    94239674-    echo "$as_me:12047: result: none needed" >&5
    9424 +    echo "$as_me:12394: result: none needed" >&5
     9675+    echo "$as_me:12425: result: none needed" >&5
    94259676 echo "${ECHO_T}none needed" >&6 ;;
    94269677   *)
    94279678-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
    9428 +    echo "$as_me:12397: result: $ac_cv_prog_cc_stdc" >&5
     9679+    echo "$as_me:12428: result: $ac_cv_prog_cc_stdc" >&5
    94299680 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    94309681     CC="$CC $ac_cv_prog_cc_stdc" ;;
    … …  
    94329683 
    94339684-echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
    9434 +echo "$as_me:12402: checking for an ANSI C-conforming const" >&5
     9685+echo "$as_me:12433: checking for an ANSI C-conforming const" >&5
    94359686 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
    94369687 if test "${ac_cv_c_const+set}" = set; then
    … …  
    94399690   cat >conftest.$ac_ext <<_ACEOF
    94409691-#line 12061 "configure"
    9441 +#line 12408 "configure"
     9692+#line 12439 "configure"
    94429693 #include "confdefs.h"
    94439694 
    94449695 int
    9445 @@ -12116,16 +12463,16 @@
     9696@@ -12116,16 +12494,16 @@
    94469697 }
    94479698 _ACEOF
    94489699 rm -f conftest.$ac_objext
    94499700-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
    9450 +if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
     9701+if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5
    94519702   (eval $ac_compile) 2>&5
    94529703   ac_status=$?
    94539704-  echo "$as_me:12122: \$? = $ac_status" >&5
    9454 +  echo "$as_me:12469: \$? = $ac_status" >&5
     9705+  echo "$as_me:12500: \$? = $ac_status" >&5
    94559706   (exit $ac_status); } &&
    94569707          { ac_try='test -s conftest.$ac_objext'
    94579708-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
    9458 +  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
     9709+  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
    94599710   (eval $ac_try) 2>&5
    94609711   ac_status=$?
    94619712-  echo "$as_me:12128: \$? = $ac_status" >&5
    9462 +  echo "$as_me:12475: \$? = $ac_status" >&5
     9713+  echo "$as_me:12506: \$? = $ac_status" >&5
    94639714   (exit $ac_status); }; }; then
    94649715   ac_cv_c_const=yes
    94659716 else
    9466 @@ -12135,7 +12482,7 @@
     9717@@ -12135,7 +12513,7 @@
    94679718 fi
    94689719 rm -f conftest.$ac_objext conftest.$ac_ext
    94699720 fi
    94709721-echo "$as_me:12138: result: $ac_cv_c_const" >&5
    9471 +echo "$as_me:12485: result: $ac_cv_c_const" >&5
     9722+echo "$as_me:12516: result: $ac_cv_c_const" >&5
    94729723 echo "${ECHO_T}$ac_cv_c_const" >&6
    94739724 if test $ac_cv_c_const = no; then
    94749725 
    9475 @@ -12145,7 +12492,7 @@
     9726@@ -12145,7 +12523,7 @@
    94769727 
    94779728 fi
    94789729 
    94799730-echo "$as_me:12148: checking for inline" >&5
    9480 +echo "$as_me:12495: checking for inline" >&5
     9731+echo "$as_me:12526: checking for inline" >&5
    94819732 echo $ECHO_N "checking for inline... $ECHO_C" >&6
    94829733 if test "${ac_cv_c_inline+set}" = set; then
    94839734   echo $ECHO_N "(cached) $ECHO_C" >&6
    9484 @@ -12153,7 +12500,7 @@
     9735@@ -12153,7 +12531,7 @@
    94859736   ac_cv_c_inline=no
    94869737 for ac_kw in inline __inline__ __inline; do
    94879738   cat >conftest.$ac_ext <<_ACEOF
    94889739-#line 12156 "configure"
    9489 +#line 12503 "configure"
     9740+#line 12534 "configure"
    94909741 #include "confdefs.h"
    94919742 #ifndef __cplusplus
    94929743 static $ac_kw int static_foo () {return 0; }
    9493 @@ -12162,16 +12509,16 @@
     9744@@ -12162,16 +12540,16 @@
    94949745 
    94959746 _ACEOF
    94969747 rm -f conftest.$ac_objext
    94979748-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
    9498 +if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
     9749+if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5
    94999750   (eval $ac_compile) 2>&5
    95009751   ac_status=$?
    95019752-  echo "$as_me:12168: \$? = $ac_status" >&5
    9502 +  echo "$as_me:12515: \$? = $ac_status" >&5
     9753+  echo "$as_me:12546: \$? = $ac_status" >&5
    95039754   (exit $ac_status); } &&
    95049755          { ac_try='test -s conftest.$ac_objext'
    95059756-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
    9506 +  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
     9757+  { (eval echo "$as_me:12549: \"$ac_try\"") >&5
    95079758   (eval $ac_try) 2>&5
    95089759   ac_status=$?
    95099760-  echo "$as_me:12174: \$? = $ac_status" >&5
    9510 +  echo "$as_me:12521: \$? = $ac_status" >&5
     9761+  echo "$as_me:12552: \$? = $ac_status" >&5
    95119762   (exit $ac_status); }; }; then
    95129763   ac_cv_c_inline=$ac_kw; break
    95139764 else
    9514 @@ -12182,7 +12529,7 @@
     9765@@ -12182,7 +12560,7 @@
    95159766 done
    95169767 
    95179768 fi
    95189769-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
    9519 +echo "$as_me:12532: result: $ac_cv_c_inline" >&5
     9770+echo "$as_me:12563: result: $ac_cv_c_inline" >&5
    95209771 echo "${ECHO_T}$ac_cv_c_inline" >&6
    95219772 case $ac_cv_c_inline in
    95229773   inline | yes) ;;
    9523 @@ -12205,7 +12552,7 @@
     9774@@ -12205,7 +12583,7 @@
    95249775     :
    95259776   elif test "$GCC" = yes
    95269777   then
    95279778-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
    9528 +    echo "$as_me:12555: checking if gcc supports options to tune inlining" >&5
     9779+    echo "$as_me:12586: checking if gcc supports options to tune inlining" >&5
    95299780 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
    95309781 if test "${cf_cv_gcc_inline+set}" = set; then
    95319782   echo $ECHO_N "(cached) $ECHO_C" >&6
    9532 @@ -12214,7 +12561,7 @@
     9783@@ -12214,7 +12592,7 @@
    95339784       cf_save_CFLAGS=$CFLAGS
    95349785       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
    95359786       cat >conftest.$ac_ext <<_ACEOF
    95369787-#line 12217 "configure"
    9537 +#line 12564 "configure"
     9788+#line 12595 "configure"
    95389789 #include "confdefs.h"
    95399790 inline int foo(void) { return 1; }
    95409791 int
    9541 @@ -12226,16 +12573,16 @@
     9792@@ -12226,16 +12604,16 @@
    95429793 }
    95439794 _ACEOF
    95449795 rm -f conftest.$ac_objext
    95459796-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
    9546 +if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
     9797+if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
    95479798   (eval $ac_compile) 2>&5
    95489799   ac_status=$?
    95499800-  echo "$as_me:12232: \$? = $ac_status" >&5
    9550 +  echo "$as_me:12579: \$? = $ac_status" >&5
     9801+  echo "$as_me:12610: \$? = $ac_status" >&5
    95519802   (exit $ac_status); } &&
    95529803          { ac_try='test -s conftest.$ac_objext'
    95539804-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
    9554 +  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
     9805+  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
    95559806   (eval $ac_try) 2>&5
    95569807   ac_status=$?
    95579808-  echo "$as_me:12238: \$? = $ac_status" >&5
    9558 +  echo "$as_me:12585: \$? = $ac_status" >&5
     9809+  echo "$as_me:12616: \$? = $ac_status" >&5
    95599810   (exit $ac_status); }; }; then
    95609811   cf_cv_gcc_inline=yes
    95619812 else
    9562 @@ -12247,7 +12594,7 @@
     9813@@ -12247,7 +12625,7 @@
    95639814       CFLAGS=$cf_save_CFLAGS
    95649815 
    95659816 fi
    95669817-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
    9567 +echo "$as_me:12597: result: $cf_cv_gcc_inline" >&5
     9818+echo "$as_me:12628: result: $cf_cv_gcc_inline" >&5
    95689819 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
    95699820     if test "$cf_cv_gcc_inline" = yes ; then
    95709821 
    9571 @@ -12323,7 +12670,7 @@
     9822@@ -12311,7 +12689,7 @@
     9823 
     9824 if test -n "$cf_new_cppflags" ; then
     9825 
     9826-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     9827+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     9828 fi
     9829 
     9830 if test -n "$cf_new_extra_cppflags" ; then
     9831@@ -12323,7 +12701,7 @@
    95729832   fi
    95739833 fi
    95749834 
    95759835-echo "$as_me:12326: checking for signal global datatype" >&5
    9576 +echo "$as_me:12673: checking for signal global datatype" >&5
     9836+echo "$as_me:12704: checking for signal global datatype" >&5
    95779837 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
    95789838 if test "${cf_cv_sig_atomic_t+set}" = set; then
    95799839   echo $ECHO_N "(cached) $ECHO_C" >&6
    9580 @@ -12335,7 +12682,7 @@
     9840@@ -12335,7 +12713,7 @@
    95819841                "int"
    95829842        do
    95839843        cat >conftest.$ac_ext <<_ACEOF
    95849844-#line 12338 "configure"
    9585 +#line 12685 "configure"
     9845+#line 12716 "configure"
    95869846 #include "confdefs.h"
    95879847 
    95889848 #include <sys/types.h>
    9589 @@ -12358,16 +12705,16 @@
     9849@@ -12358,16 +12736,16 @@
    95909850 }
    95919851 _ACEOF
    95929852 rm -f conftest.$ac_objext
    95939853-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
    9594 +if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
     9854+if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5
    95959855   (eval $ac_compile) 2>&5
    95969856   ac_status=$?
    95979857-  echo "$as_me:12364: \$? = $ac_status" >&5
    9598 +  echo "$as_me:12711: \$? = $ac_status" >&5
     9858+  echo "$as_me:12742: \$? = $ac_status" >&5
    95999859   (exit $ac_status); } &&
    96009860          { ac_try='test -s conftest.$ac_objext'
    96019861-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
    9602 +  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
     9862+  { (eval echo "$as_me:12745: \"$ac_try\"") >&5
    96039863   (eval $ac_try) 2>&5
    96049864   ac_status=$?
    96059865-  echo "$as_me:12370: \$? = $ac_status" >&5
    9606 +  echo "$as_me:12717: \$? = $ac_status" >&5
     9866+  echo "$as_me:12748: \$? = $ac_status" >&5
    96079867   (exit $ac_status); }; }; then
    96089868   cf_cv_sig_atomic_t=$cf_type
    96099869 else
    9610 @@ -12381,7 +12728,7 @@
     9870@@ -12381,7 +12759,7 @@
    96119871 
    96129872 fi
    96139873 
    96149874-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
    9615 +echo "$as_me:12731: result: $cf_cv_sig_atomic_t" >&5
     9875+echo "$as_me:12762: result: $cf_cv_sig_atomic_t" >&5
    96169876 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
    96179877 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
    96189878 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
    9619 @@ -12389,7 +12736,7 @@
     9879@@ -12389,7 +12767,7 @@
    96209880 
    96219881 if test $NCURSES_CHTYPE = auto ; then
    96229882 
    96239883-echo "$as_me:12392: checking for type of chtype" >&5
    9624 +echo "$as_me:12739: checking for type of chtype" >&5
     9884+echo "$as_me:12770: checking for type of chtype" >&5
    96259885 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    96269886 if test "${cf_cv_typeof_chtype+set}" = set; then
    96279887   echo $ECHO_N "(cached) $ECHO_C" >&6
    9628 @@ -12399,7 +12746,7 @@
     9888@@ -12399,7 +12777,7 @@
    96299889   cf_cv_typeof_chtype=long
    96309890 else
    96319891   cat >conftest.$ac_ext <<_ACEOF
    96329892-#line 12402 "configure"
    9633 +#line 12749 "configure"
     9893+#line 12780 "configure"
    96349894 #include "confdefs.h"
    96359895 
    96369896 #define WANT_BITS 31
    9637 @@ -12434,15 +12781,15 @@
     9897@@ -12434,15 +12812,15 @@
    96389898 
    96399899 _ACEOF
    96409900 rm -f conftest$ac_exeext
    96419901-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
    9642 +if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
     9902+if { (eval echo "$as_me:12815: \"$ac_link\"") >&5
    96439903   (eval $ac_link) 2>&5
    96449904   ac_status=$?
    96459905-  echo "$as_me:12440: \$? = $ac_status" >&5
    9646 +  echo "$as_me:12787: \$? = $ac_status" >&5
     9906+  echo "$as_me:12818: \$? = $ac_status" >&5
    96479907   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    96489908-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
    9649 +  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
     9909+  { (eval echo "$as_me:12820: \"$ac_try\"") >&5
    96509910   (eval $ac_try) 2>&5
    96519911   ac_status=$?
    96529912-  echo "$as_me:12445: \$? = $ac_status" >&5
    9653 +  echo "$as_me:12792: \$? = $ac_status" >&5
     9913+  echo "$as_me:12823: \$? = $ac_status" >&5
    96549914   (exit $ac_status); }; }; then
    96559915   cf_cv_typeof_chtype=`cat cf_test.out`
    96569916 else
    9657 @@ -12457,7 +12804,7 @@
     9917@@ -12457,7 +12835,7 @@
    96589918 
    96599919 fi
    96609920 
    96619921-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
    9662 +echo "$as_me:12807: result: $cf_cv_typeof_chtype" >&5
     9922+echo "$as_me:12838: result: $cf_cv_typeof_chtype" >&5
    96639923 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
    96649924 
    96659925 cat >>confdefs.h <<EOF
    9666 @@ -12469,14 +12816,14 @@
     9926@@ -12469,14 +12847,14 @@
    96679927 fi
    96689928 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
    96699929 
    96709930-echo "$as_me:12472: checking if unsigned literals are legal" >&5
    9671 +echo "$as_me:12819: checking if unsigned literals are legal" >&5
     9931+echo "$as_me:12850: checking if unsigned literals are legal" >&5
    96729932 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
    96739933 if test "${cf_cv_unsigned_literals+set}" = set; then
    … …  
    96779937        cat >conftest.$ac_ext <<_ACEOF
    96789938-#line 12479 "configure"
    9679 +#line 12826 "configure"
     9939+#line 12857 "configure"
    96809940 #include "confdefs.h"
    96819941 
    96829942 int
    9683 @@ -12488,16 +12835,16 @@
     9943@@ -12488,16 +12866,16 @@
    96849944 }
    96859945 _ACEOF
    96869946 rm -f conftest.$ac_objext
    96879947-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
    9688 +if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
     9948+if { (eval echo "$as_me:12869: \"$ac_compile\"") >&5
    96899949   (eval $ac_compile) 2>&5
    96909950   ac_status=$?
    96919951-  echo "$as_me:12494: \$? = $ac_status" >&5
    9692 +  echo "$as_me:12841: \$? = $ac_status" >&5
     9952+  echo "$as_me:12872: \$? = $ac_status" >&5
    96939953   (exit $ac_status); } &&
    96949954          { ac_try='test -s conftest.$ac_objext'
    96959955-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
    9696 +  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
     9956+  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
    96979957   (eval $ac_try) 2>&5
    96989958   ac_status=$?
    96999959-  echo "$as_me:12500: \$? = $ac_status" >&5
    9700 +  echo "$as_me:12847: \$? = $ac_status" >&5
     9960+  echo "$as_me:12878: \$? = $ac_status" >&5
    97019961   (exit $ac_status); }; }; then
    97029962   cf_cv_unsigned_literals=yes
    97039963 else
    9704 @@ -12509,7 +12856,7 @@
     9964@@ -12509,7 +12887,7 @@
    97059965 
    97069966 fi
    97079967 
    97089968-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
    9709 +echo "$as_me:12859: result: $cf_cv_unsigned_literals" >&5
     9969+echo "$as_me:12890: result: $cf_cv_unsigned_literals" >&5
    97109970 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
    97119971 
    97129972 cf_cv_1UL="1"
    9713 @@ -12525,14 +12872,14 @@
     9973@@ -12525,14 +12903,14 @@
    97149974 
    97159975 ###    Checks for external-data
    97169976 
    97179977-echo "$as_me:12528: checking if external errno is declared" >&5
    9718 +echo "$as_me:12875: checking if external errno is declared" >&5
     9978+echo "$as_me:12906: checking if external errno is declared" >&5
    97199979 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
    97209980 if test "${cf_cv_dcl_errno+set}" = set; then
    … …  
    97249984     cat >conftest.$ac_ext <<_ACEOF
    97259985-#line 12535 "configure"
    9726 +#line 12882 "configure"
     9986+#line 12913 "configure"
    97279987 #include "confdefs.h"
    97289988 
    97299989 #ifdef HAVE_STDLIB_H
    9730 @@ -12550,16 +12897,16 @@
     9990@@ -12550,16 +12928,16 @@
    97319991 }
    97329992 _ACEOF
    97339993 rm -f conftest.$ac_objext
    97349994-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
    9735 +if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
     9995+if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5
    97369996   (eval $ac_compile) 2>&5
    97379997   ac_status=$?
    97389998-  echo "$as_me:12556: \$? = $ac_status" >&5
    9739 +  echo "$as_me:12903: \$? = $ac_status" >&5
     9999+  echo "$as_me:12934: \$? = $ac_status" >&5
    974010000   (exit $ac_status); } &&
    974110001          { ac_try='test -s conftest.$ac_objext'
    974210002-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
    9743 +  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
     10003+  { (eval echo "$as_me:12937: \"$ac_try\"") >&5
    974410004   (eval $ac_try) 2>&5
    974510005   ac_status=$?
    974610006-  echo "$as_me:12562: \$? = $ac_status" >&5
    9747 +  echo "$as_me:12909: \$? = $ac_status" >&5
     10007+  echo "$as_me:12940: \$? = $ac_status" >&5
    974810008   (exit $ac_status); }; }; then
    974910009   cf_cv_dcl_errno=yes
    975010010 else
    9751 @@ -12570,7 +12917,7 @@
     10011@@ -12570,7 +12948,7 @@
    975210012 rm -f conftest.$ac_objext conftest.$ac_ext
    975310013 
    975410014 fi
    975510015-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
    9756 +echo "$as_me:12920: result: $cf_cv_dcl_errno" >&5
     10016+echo "$as_me:12951: result: $cf_cv_dcl_errno" >&5
    975710017 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
    975810018 
    975910019 if test "$cf_cv_dcl_errno" = no ; then
    9760 @@ -12585,14 +12932,14 @@
     10020@@ -12585,14 +12963,14 @@
    976110021 
    976210022 # It's possible (for near-UNIX clones) that the data doesn't exist
    976310023 
    976410024-echo "$as_me:12588: checking if external errno exists" >&5
    9765 +echo "$as_me:12935: checking if external errno exists" >&5
     10025+echo "$as_me:12966: checking if external errno exists" >&5
    976610026 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
    976710027 if test "${cf_cv_have_errno+set}" = set; then
    … …  
    977110031     cat >conftest.$ac_ext <<_ACEOF
    977210032-#line 12595 "configure"
    9773 +#line 12942 "configure"
     10033+#line 12973 "configure"
    977410034 #include "confdefs.h"
    977510035 
    977610036 #undef errno
    9777 @@ -12607,16 +12954,16 @@
     10037@@ -12607,16 +12985,16 @@
    977810038 }
    977910039 _ACEOF
    978010040 rm -f conftest.$ac_objext conftest$ac_exeext
    978110041-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
    9782 +if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
     10042+if { (eval echo "$as_me:12988: \"$ac_link\"") >&5
    978310043   (eval $ac_link) 2>&5
    978410044   ac_status=$?
    978510045-  echo "$as_me:12613: \$? = $ac_status" >&5
    9786 +  echo "$as_me:12960: \$? = $ac_status" >&5
     10046+  echo "$as_me:12991: \$? = $ac_status" >&5
    978710047   (exit $ac_status); } &&
    978810048          { ac_try='test -s conftest$ac_exeext'
    978910049-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
    9790 +  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
     10050+  { (eval echo "$as_me:12994: \"$ac_try\"") >&5
    979110051   (eval $ac_try) 2>&5
    979210052   ac_status=$?
    979310053-  echo "$as_me:12619: \$? = $ac_status" >&5
    9794 +  echo "$as_me:12966: \$? = $ac_status" >&5
     10054+  echo "$as_me:12997: \$? = $ac_status" >&5
    979510055   (exit $ac_status); }; }; then
    979610056   cf_cv_have_errno=yes
    979710057 else
    9798 @@ -12627,7 +12974,7 @@
     10058@@ -12627,7 +13005,7 @@
    979910059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    980010060 
    980110061 fi
    980210062-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
    9803 +echo "$as_me:12977: result: $cf_cv_have_errno" >&5
     10063+echo "$as_me:13008: result: $cf_cv_have_errno" >&5
    980410064 echo "${ECHO_T}$cf_cv_have_errno" >&6
    980510065 
    980610066 if test "$cf_cv_have_errno" = yes ; then
    9807 @@ -12640,7 +12987,7 @@
     10067@@ -12640,7 +13018,7 @@
    980810068 
    980910069 fi
    981010070 
    981110071-echo "$as_me:12643: checking if data-only library module links" >&5
    9812 +echo "$as_me:12990: checking if data-only library module links" >&5
     10072+echo "$as_me:13021: checking if data-only library module links" >&5
    981310073 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
    981410074 if test "${cf_cv_link_dataonly+set}" = set; then
    981510075   echo $ECHO_N "(cached) $ECHO_C" >&6
    9816 @@ -12648,20 +12995,20 @@
     10076@@ -12648,20 +13026,20 @@
    981710077 
    981810078        rm -f conftest.a
    981910079        cat >conftest.$ac_ext <<EOF
    982010080-#line 12651 "configure"
    9821 +#line 12998 "configure"
     10081+#line 13029 "configure"
    982210082 int    testdata[3] = { 123, 456, 789 };
    982310083 EOF
    982410084-       if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
    9825 +       if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
     10085+       if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
    982610086   (eval $ac_compile) 2>&5
    982710087   ac_status=$?
    982810088-  echo "$as_me:12657: \$? = $ac_status" >&5
    9829 +  echo "$as_me:13004: \$? = $ac_status" >&5
     10089+  echo "$as_me:13035: \$? = $ac_status" >&5
    983010090   (exit $ac_status); } ; then
    983110091                mv conftest.o data.o && \
    … …  
    983610096        cat >conftest.$ac_ext <<EOF
    983710097-#line 12664 "configure"
    9838 +#line 13011 "configure"
     10098+#line 13042 "configure"
    983910099 int    testfunc()
    984010100 {
    984110101 #if defined(NeXT)
    9842 @@ -12674,13 +13021,13 @@
     10102@@ -12674,13 +13052,13 @@
    984310103 #endif
    984410104 }
    984510105 EOF
    984610106-       if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
    9847 +       if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
     10107+       if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
    984810108   (eval $ac_compile) 2>&5
    984910109   ac_status=$?
    985010110-  echo "$as_me:12680: \$? = $ac_status" >&5
    9851 +  echo "$as_me:13027: \$? = $ac_status" >&5
     10111+  echo "$as_me:13058: \$? = $ac_status" >&5
    985210112   (exit $ac_status); }; then
    985310113                mv conftest.o func.o && \
    … …  
    985710117        rm -f conftest.$ac_ext func.o
    985810118        ( eval $RANLIB conftest.a ) 2>&5 >/dev/null
    9859 @@ -12690,7 +13037,7 @@
     10119@@ -12690,7 +13068,7 @@
    986010120   cf_cv_link_dataonly=unknown
    986110121 else
    986210122   cat >conftest.$ac_ext <<_ACEOF
    986310123-#line 12693 "configure"
    9864 +#line 13040 "configure"
     10124+#line 13071 "configure"
    986510125 #include "confdefs.h"
    986610126 
    986710127        int main()
    9868 @@ -12701,15 +13048,15 @@
     10128@@ -12701,15 +13079,15 @@
    986910129 
    987010130 _ACEOF
    987110131 rm -f conftest$ac_exeext
    987210132-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
    9873 +if { (eval echo "$as_me:13051: \"$ac_link\"") >&5
     10133+if { (eval echo "$as_me:13082: \"$ac_link\"") >&5
    987410134   (eval $ac_link) 2>&5
    987510135   ac_status=$?
    987610136-  echo "$as_me:12707: \$? = $ac_status" >&5
    9877 +  echo "$as_me:13054: \$? = $ac_status" >&5
     10137+  echo "$as_me:13085: \$? = $ac_status" >&5
    987810138   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    987910139-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
    9880 +  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
     10140+  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
    988110141   (eval $ac_try) 2>&5
    988210142   ac_status=$?
    988310143-  echo "$as_me:12712: \$? = $ac_status" >&5
    9884 +  echo "$as_me:13059: \$? = $ac_status" >&5
     10144+  echo "$as_me:13090: \$? = $ac_status" >&5
    988510145   (exit $ac_status); }; }; then
    988610146   cf_cv_link_dataonly=yes
    988710147 else
    9888 @@ -12724,7 +13071,7 @@
     10148@@ -12724,7 +13102,7 @@
    988910149 
    989010150 fi
    989110151 
    989210152-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
    9893 +echo "$as_me:13074: result: $cf_cv_link_dataonly" >&5
     10153+echo "$as_me:13105: result: $cf_cv_link_dataonly" >&5
    989410154 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
    989510155 
    989610156 if test "$cf_cv_link_dataonly" = no ; then
    9897 @@ -12759,13 +13106,13 @@
     10157@@ -12759,13 +13137,13 @@
    989810158 
    989910159 do
    990010160 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    990110161-echo "$as_me:12762: checking for $ac_func" >&5
    9902 +echo "$as_me:13109: checking for $ac_func" >&5
     10162+echo "$as_me:13140: checking for $ac_func" >&5
    990310163 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    990410164 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    990710167   cat >conftest.$ac_ext <<_ACEOF
    990810168-#line 12768 "configure"
    9909 +#line 13115 "configure"
     10169+#line 13146 "configure"
    991010170 #include "confdefs.h"
    991110171 /* System header to define __stub macros and hopefully few prototypes,
    991210172     which can conflict with char $ac_func (); below.  */
    9913 @@ -12796,16 +13143,16 @@
     10173@@ -12796,16 +13174,16 @@
    991410174 }
    991510175 _ACEOF
    991610176 rm -f conftest.$ac_objext conftest$ac_exeext
    991710177-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
    9918 +if { (eval echo "$as_me:13146: \"$ac_link\"") >&5
     10178+if { (eval echo "$as_me:13177: \"$ac_link\"") >&5
    991910179   (eval $ac_link) 2>&5
    992010180   ac_status=$?
    992110181-  echo "$as_me:12802: \$? = $ac_status" >&5
    9922 +  echo "$as_me:13149: \$? = $ac_status" >&5
     10182+  echo "$as_me:13180: \$? = $ac_status" >&5
    992310183   (exit $ac_status); } &&
    992410184          { ac_try='test -s conftest$ac_exeext'
    992510185-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
    9926 +  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
     10186+  { (eval echo "$as_me:13183: \"$ac_try\"") >&5
    992710187   (eval $ac_try) 2>&5
    992810188   ac_status=$?
    992910189-  echo "$as_me:12808: \$? = $ac_status" >&5
    9930 +  echo "$as_me:13155: \$? = $ac_status" >&5
     10190+  echo "$as_me:13186: \$? = $ac_status" >&5
    993110191   (exit $ac_status); }; }; then
    993210192   eval "$as_ac_var=yes"
    993310193 else
    9934 @@ -12815,7 +13162,7 @@
     10194@@ -12815,7 +13193,7 @@
    993510195 fi
    993610196 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    993710197 fi
    993810198-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
    9939 +echo "$as_me:13165: result: `eval echo '${'$as_ac_var'}'`" >&5
     10199+echo "$as_me:13196: result: `eval echo '${'$as_ac_var'}'`" >&5
    994010200 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    994110201 if test `eval echo '${'$as_ac_var'}'` = yes; then
    994210202   cat >>confdefs.h <<EOF
    9943 @@ -12827,14 +13174,14 @@
     10203@@ -12827,14 +13205,14 @@
    994410204 
    994510205 if test "$with_getcap" = "yes" ; then
    994610206 
    994710207-echo "$as_me:12830: checking for terminal-capability database functions" >&5
    9948 +echo "$as_me:13177: checking for terminal-capability database functions" >&5
     10208+echo "$as_me:13208: checking for terminal-capability database functions" >&5
    994910209 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
    995010210 if test "${cf_cv_cgetent+set}" = set; then
    … …  
    995410214 cat >conftest.$ac_ext <<_ACEOF
    995510215-#line 12837 "configure"
    9956 +#line 13184 "configure"
     10216+#line 13215 "configure"
    995710217 #include "confdefs.h"
    995810218 
    995910219 #include <stdlib.h>
    9960 @@ -12854,16 +13201,16 @@
     10220@@ -12854,16 +13232,16 @@
    996110221 }
    996210222 _ACEOF
    996310223 rm -f conftest.$ac_objext conftest$ac_exeext
    996410224-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
    9965 +if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
     10225+if { (eval echo "$as_me:13235: \"$ac_link\"") >&5
    996610226   (eval $ac_link) 2>&5
    996710227   ac_status=$?
    996810228-  echo "$as_me:12860: \$? = $ac_status" >&5
    9969 +  echo "$as_me:13207: \$? = $ac_status" >&5
     10229+  echo "$as_me:13238: \$? = $ac_status" >&5
    997010230   (exit $ac_status); } &&
    997110231          { ac_try='test -s conftest$ac_exeext'
    997210232-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
    9973 +  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
     10233+  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
    997410234   (eval $ac_try) 2>&5
    997510235   ac_status=$?
    997610236-  echo "$as_me:12866: \$? = $ac_status" >&5
    9977 +  echo "$as_me:13213: \$? = $ac_status" >&5
     10237+  echo "$as_me:13244: \$? = $ac_status" >&5
    997810238   (exit $ac_status); }; }; then
    997910239   cf_cv_cgetent=yes
    998010240 else
    9981 @@ -12875,7 +13222,7 @@
     10241@@ -12875,7 +13253,7 @@
    998210242 
    998310243 fi
    998410244 
    998510245-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
    9986 +echo "$as_me:13225: result: $cf_cv_cgetent" >&5
     10246+echo "$as_me:13256: result: $cf_cv_cgetent" >&5
    998710247 echo "${ECHO_T}$cf_cv_cgetent" >&6
    998810248 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
    998910249 #define HAVE_BSD_CGETENT 1
    9990 @@ -12883,14 +13230,14 @@
     10250@@ -12883,14 +13261,14 @@
    999110251 
    999210252 fi
    999310253 
    999410254-echo "$as_me:12886: checking for isascii" >&5
    9995 +echo "$as_me:13233: checking for isascii" >&5
     10255+echo "$as_me:13264: checking for isascii" >&5
    999610256 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
    999710257 if test "${cf_cv_have_isascii+set}" = set; then
    … …  
    1000110261        cat >conftest.$ac_ext <<_ACEOF
    1000210262-#line 12893 "configure"
    10003 +#line 13240 "configure"
     10263+#line 13271 "configure"
    1000410264 #include "confdefs.h"
    1000510265 #include <ctype.h>
    1000610266 int
    10007 @@ -12902,16 +13249,16 @@
     10267@@ -12902,16 +13280,16 @@
    1000810268 }
    1000910269 _ACEOF
    1001010270 rm -f conftest.$ac_objext conftest$ac_exeext
    1001110271-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
    10012 +if { (eval echo "$as_me:13252: \"$ac_link\"") >&5
     10272+if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
    1001310273   (eval $ac_link) 2>&5
    1001410274   ac_status=$?
    1001510275-  echo "$as_me:12908: \$? = $ac_status" >&5
    10016 +  echo "$as_me:13255: \$? = $ac_status" >&5
     10276+  echo "$as_me:13286: \$? = $ac_status" >&5
    1001710277   (exit $ac_status); } &&
    1001810278          { ac_try='test -s conftest$ac_exeext'
    1001910279-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
    10020 +  { (eval echo "$as_me:13258: \"$ac_try\"") >&5
     10280+  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
    1002110281   (eval $ac_try) 2>&5
    1002210282   ac_status=$?
    1002310283-  echo "$as_me:12914: \$? = $ac_status" >&5
    10024 +  echo "$as_me:13261: \$? = $ac_status" >&5
     10284+  echo "$as_me:13292: \$? = $ac_status" >&5
    1002510285   (exit $ac_status); }; }; then
    1002610286   cf_cv_have_isascii=yes
    1002710287 else
    10028 @@ -12922,17 +13269,17 @@
     10288@@ -12922,17 +13300,17 @@
    1002910289 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1003010290 
    1003110291 fi
    1003210292-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
    10033 +echo "$as_me:13272: result: $cf_cv_have_isascii" >&5
     10293+echo "$as_me:13303: result: $cf_cv_have_isascii" >&5
    1003410294 echo "${ECHO_T}$cf_cv_have_isascii" >&6
    1003510295 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
    … …  
    1003910299 if test "$ac_cv_func_sigaction" = yes; then
    1004010300-echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
    10041 +echo "$as_me:13279: checking whether sigaction needs _POSIX_SOURCE" >&5
     10301+echo "$as_me:13310: checking whether sigaction needs _POSIX_SOURCE" >&5
    1004210302 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
    1004310303 cat >conftest.$ac_ext <<_ACEOF
    1004410304-#line 12935 "configure"
    10045 +#line 13282 "configure"
     10305+#line 13313 "configure"
    1004610306 #include "confdefs.h"
    1004710307 
    1004810308 #include <sys/types.h>
    10049 @@ -12946,16 +13293,16 @@
     10309@@ -12946,16 +13324,16 @@
    1005010310 }
    1005110311 _ACEOF
    1005210312 rm -f conftest.$ac_objext
    1005310313-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
    10054 +if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
     10314+if { (eval echo "$as_me:13327: \"$ac_compile\"") >&5
    1005510315   (eval $ac_compile) 2>&5
    1005610316   ac_status=$?
    1005710317-  echo "$as_me:12952: \$? = $ac_status" >&5
    10058 +  echo "$as_me:13299: \$? = $ac_status" >&5
     10318+  echo "$as_me:13330: \$? = $ac_status" >&5
    1005910319   (exit $ac_status); } &&
    1006010320          { ac_try='test -s conftest.$ac_objext'
    1006110321-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
    10062 +  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
     10322+  { (eval echo "$as_me:13333: \"$ac_try\"") >&5
    1006310323   (eval $ac_try) 2>&5
    1006410324   ac_status=$?
    1006510325-  echo "$as_me:12958: \$? = $ac_status" >&5
    10066 +  echo "$as_me:13305: \$? = $ac_status" >&5
     10326+  echo "$as_me:13336: \$? = $ac_status" >&5
    1006710327   (exit $ac_status); }; }; then
    1006810328   sigact_bad=no
    1006910329 else
    10070 @@ -12963,7 +13310,7 @@
     10330@@ -12963,7 +13341,7 @@
    1007110331 cat conftest.$ac_ext >&5
    1007210332 
    1007310333 cat >conftest.$ac_ext <<_ACEOF
    1007410334-#line 12966 "configure"
    10075 +#line 13313 "configure"
     10335+#line 13344 "configure"
    1007610336 #include "confdefs.h"
    1007710337 
    1007810338 #define _POSIX_SOURCE
    10079 @@ -12978,16 +13325,16 @@
     10339@@ -12978,16 +13356,16 @@
    1008010340 }
    1008110341 _ACEOF
    1008210342 rm -f conftest.$ac_objext
    1008310343-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
    10084 +if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5
     10344+if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
    1008510345   (eval $ac_compile) 2>&5
    1008610346   ac_status=$?
    1008710347-  echo "$as_me:12984: \$? = $ac_status" >&5
    10088 +  echo "$as_me:13331: \$? = $ac_status" >&5
     10348+  echo "$as_me:13362: \$? = $ac_status" >&5
    1008910349   (exit $ac_status); } &&
    1009010350          { ac_try='test -s conftest.$ac_objext'
    1009110351-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
    10092 +  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
     10352+  { (eval echo "$as_me:13365: \"$ac_try\"") >&5
    1009310353   (eval $ac_try) 2>&5
    1009410354   ac_status=$?
    1009510355-  echo "$as_me:12990: \$? = $ac_status" >&5
    10096 +  echo "$as_me:13337: \$? = $ac_status" >&5
     10356+  echo "$as_me:13368: \$? = $ac_status" >&5
    1009710357   (exit $ac_status); }; }; then
    1009810358   sigact_bad=yes
    1009910359         cat >>confdefs.h <<\EOF
    10100 @@ -13002,11 +13349,11 @@
     10360@@ -13002,11 +13380,11 @@
    1010110361 rm -f conftest.$ac_objext conftest.$ac_ext
    1010210362 fi
    1010310363 rm -f conftest.$ac_objext conftest.$ac_ext
    1010410364-echo "$as_me:13005: result: $sigact_bad" >&5
    10105 +echo "$as_me:13352: result: $sigact_bad" >&5
     10365+echo "$as_me:13383: result: $sigact_bad" >&5
    1010610366 echo "${ECHO_T}$sigact_bad" >&6
    1010710367 fi
    1010810368 
    1010910369-echo "$as_me:13009: checking if nanosleep really works" >&5
    10110 +echo "$as_me:13356: checking if nanosleep really works" >&5
     10370+echo "$as_me:13387: checking if nanosleep really works" >&5
    1011110371 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
    1011210372 if test "${cf_cv_func_nanosleep+set}" = set; then
    1011310373   echo $ECHO_N "(cached) $ECHO_C" >&6
    10114 @@ -13016,7 +13363,7 @@
     10374@@ -13016,7 +13394,7 @@
    1011510375   cf_cv_func_nanosleep=unknown
    1011610376 else
    1011710377   cat >conftest.$ac_ext <<_ACEOF
    1011810378-#line 13019 "configure"
    10119 +#line 13366 "configure"
     10379+#line 13397 "configure"
    1012010380 #include "confdefs.h"
    1012110381 
    1012210382 #include <stdio.h>
    10123 @@ -13041,15 +13388,15 @@
     10383@@ -13041,15 +13419,15 @@
    1012410384 
    1012510385 _ACEOF
    1012610386 rm -f conftest$ac_exeext
    1012710387-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
    10128 +if { (eval echo "$as_me:13391: \"$ac_link\"") >&5
     10388+if { (eval echo "$as_me:13422: \"$ac_link\"") >&5
    1012910389   (eval $ac_link) 2>&5
    1013010390   ac_status=$?
    1013110391-  echo "$as_me:13047: \$? = $ac_status" >&5
    10132 +  echo "$as_me:13394: \$? = $ac_status" >&5
     10392+  echo "$as_me:13425: \$? = $ac_status" >&5
    1013310393   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1013410394-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
    10135 +  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
     10395+  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
    1013610396   (eval $ac_try) 2>&5
    1013710397   ac_status=$?
    1013810398-  echo "$as_me:13052: \$? = $ac_status" >&5
    10139 +  echo "$as_me:13399: \$? = $ac_status" >&5
     10399+  echo "$as_me:13430: \$? = $ac_status" >&5
    1014010400   (exit $ac_status); }; }; then
    1014110401   cf_cv_func_nanosleep=yes
    1014210402 else
    10143 @@ -13061,7 +13408,7 @@
     10403@@ -13061,7 +13439,7 @@
    1014410404 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1014510405 fi
    1014610406 fi
    1014710407-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
    10148 +echo "$as_me:13411: result: $cf_cv_func_nanosleep" >&5
     10408+echo "$as_me:13442: result: $cf_cv_func_nanosleep" >&5
    1014910409 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
    1015010410 
    1015110411 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
    10152 @@ -13075,23 +13422,23 @@
     10412@@ -13075,23 +13453,23 @@
    1015310413 
    1015410414 do
    1015510415 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1015610416-echo "$as_me:13078: checking for $ac_header" >&5
    10157 +echo "$as_me:13425: checking for $ac_header" >&5
     10417+echo "$as_me:13456: checking for $ac_header" >&5
    1015810418 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1015910419 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1016210422   cat >conftest.$ac_ext <<_ACEOF
    1016310423-#line 13084 "configure"
    10164 +#line 13431 "configure"
     10424+#line 13462 "configure"
    1016510425 #include "confdefs.h"
    1016610426 #include <$ac_header>
    1016710427 _ACEOF
    1016810428-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
    10169 +if { (eval echo "$as_me:13435: \"$ac_cpp conftest.$ac_ext\"") >&5
     10429+if { (eval echo "$as_me:13466: \"$ac_cpp conftest.$ac_ext\"") >&5
    1017010430   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1017110431   ac_status=$?
    … …  
    1017410434   cat conftest.err >&5
    1017510435-  echo "$as_me:13094: \$? = $ac_status" >&5
    10176 +  echo "$as_me:13441: \$? = $ac_status" >&5
     10436+  echo "$as_me:13472: \$? = $ac_status" >&5
    1017710437   (exit $ac_status); } >/dev/null; then
    1017810438   if test -s conftest.err; then
    1017910439     ac_cpp_err=$ac_c_preproc_warn_flag
    10180 @@ -13110,7 +13457,7 @@
     10440@@ -13110,7 +13488,7 @@
    1018110441 fi
    1018210442 rm -f conftest.err conftest.$ac_ext
    1018310443 fi
    1018410444-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10185 +echo "$as_me:13460: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10445+echo "$as_me:13491: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1018610446 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1018710447 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1018810448   cat >>confdefs.h <<EOF
    10189 @@ -13125,23 +13472,23 @@
     10449@@ -13125,23 +13503,23 @@
    1019010450 for ac_header in sys/termio.h
    1019110451 do
    1019210452 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1019310453-echo "$as_me:13128: checking for $ac_header" >&5
    10194 +echo "$as_me:13475: checking for $ac_header" >&5
     10454+echo "$as_me:13506: checking for $ac_header" >&5
    1019510455 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1019610456 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1019910459   cat >conftest.$ac_ext <<_ACEOF
    1020010460-#line 13134 "configure"
    10201 +#line 13481 "configure"
     10461+#line 13512 "configure"
    1020210462 #include "confdefs.h"
    1020310463 #include <$ac_header>
    1020410464 _ACEOF
    1020510465-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
    10206 +if { (eval echo "$as_me:13485: \"$ac_cpp conftest.$ac_ext\"") >&5
     10466+if { (eval echo "$as_me:13516: \"$ac_cpp conftest.$ac_ext\"") >&5
    1020710467   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1020810468   ac_status=$?
    … …  
    1021110471   cat conftest.err >&5
    1021210472-  echo "$as_me:13144: \$? = $ac_status" >&5
    10213 +  echo "$as_me:13491: \$? = $ac_status" >&5
     10473+  echo "$as_me:13522: \$? = $ac_status" >&5
    1021410474   (exit $ac_status); } >/dev/null; then
    1021510475   if test -s conftest.err; then
    1021610476     ac_cpp_err=$ac_c_preproc_warn_flag
    10217 @@ -13160,7 +13507,7 @@
     10477@@ -13160,7 +13538,7 @@
    1021810478 fi
    1021910479 rm -f conftest.err conftest.$ac_ext
    1022010480 fi
    1022110481-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10222 +echo "$as_me:13510: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10482+echo "$as_me:13541: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1022310483 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1022410484 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1022510485   cat >>confdefs.h <<EOF
    10226 @@ -13178,10 +13525,10 @@
     10486@@ -13178,10 +13556,10 @@
    1022710487        *)      termios_bad=maybe ;;
    1022810488        esac
    1022910489        if test "$termios_bad" = maybe ; then
    1023010490-       echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
    10231 +       echo "$as_me:13528: checking whether termios.h needs _POSIX_SOURCE" >&5
     10491+       echo "$as_me:13559: checking whether termios.h needs _POSIX_SOURCE" >&5
    1023210492 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
    1023310493        cat >conftest.$ac_ext <<_ACEOF
    1023410494-#line 13184 "configure"
    10235 +#line 13531 "configure"
     10495+#line 13562 "configure"
    1023610496 #include "confdefs.h"
    1023710497 #include <termios.h>
    1023810498 int
    10239 @@ -13193,16 +13540,16 @@
     10499@@ -13193,16 +13571,16 @@
    1024010500 }
    1024110501 _ACEOF
    1024210502 rm -f conftest.$ac_objext
    1024310503-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
    10244 +if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
     10504+if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
    1024510505   (eval $ac_compile) 2>&5
    1024610506   ac_status=$?
    1024710507-  echo "$as_me:13199: \$? = $ac_status" >&5
    10248 +  echo "$as_me:13546: \$? = $ac_status" >&5
     10508+  echo "$as_me:13577: \$? = $ac_status" >&5
    1024910509   (exit $ac_status); } &&
    1025010510          { ac_try='test -s conftest.$ac_objext'
    1025110511-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
    10252 +  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
     10512+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
    1025310513   (eval $ac_try) 2>&5
    1025410514   ac_status=$?
    1025510515-  echo "$as_me:13205: \$? = $ac_status" >&5
    10256 +  echo "$as_me:13552: \$? = $ac_status" >&5
     10516+  echo "$as_me:13583: \$? = $ac_status" >&5
    1025710517   (exit $ac_status); }; }; then
    1025810518   termios_bad=no
    1025910519 else
    10260 @@ -13210,7 +13557,7 @@
     10520@@ -13210,7 +13588,7 @@
    1026110521 cat conftest.$ac_ext >&5
    1026210522 
    1026310523                cat >conftest.$ac_ext <<_ACEOF
    1026410524-#line 13213 "configure"
    10265 +#line 13560 "configure"
     10525+#line 13591 "configure"
    1026610526 #include "confdefs.h"
    1026710527 
    1026810528 #define _POSIX_SOURCE
    10269 @@ -13224,16 +13571,16 @@
     10529@@ -13224,16 +13602,16 @@
    1027010530 }
    1027110531 _ACEOF
    1027210532 rm -f conftest.$ac_objext
    1027310533-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
    10274 +if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
     10534+if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5
    1027510535   (eval $ac_compile) 2>&5
    1027610536   ac_status=$?
    1027710537-  echo "$as_me:13230: \$? = $ac_status" >&5
    10278 +  echo "$as_me:13577: \$? = $ac_status" >&5
     10538+  echo "$as_me:13608: \$? = $ac_status" >&5
    1027910539   (exit $ac_status); } &&
    1028010540          { ac_try='test -s conftest.$ac_objext'
    1028110541-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
    10282 +  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
     10542+  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
    1028310543   (eval $ac_try) 2>&5
    1028410544   ac_status=$?
    1028510545-  echo "$as_me:13236: \$? = $ac_status" >&5
    10286 +  echo "$as_me:13583: \$? = $ac_status" >&5
     10546+  echo "$as_me:13614: \$? = $ac_status" >&5
    1028710547   (exit $ac_status); }; }; then
    1028810548   termios_bad=unknown
    1028910549 else
    10290 @@ -13248,19 +13595,19 @@
     10550@@ -13248,19 +13626,19 @@
    1029110551 
    1029210552 fi
    1029310553 rm -f conftest.$ac_objext conftest.$ac_ext
    1029410554-       echo "$as_me:13251: result: $termios_bad" >&5
    10295 +       echo "$as_me:13598: result: $termios_bad" >&5
     10555+       echo "$as_me:13629: result: $termios_bad" >&5
    1029610556 echo "${ECHO_T}$termios_bad" >&6
    1029710557        fi
    … …  
    1029910559 
    1030010560-echo "$as_me:13256: checking for tcgetattr" >&5
    10301 +echo "$as_me:13603: checking for tcgetattr" >&5
     10561+echo "$as_me:13634: checking for tcgetattr" >&5
    1030210562 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
    1030310563 if test "${cf_cv_have_tcgetattr+set}" = set; then
    … …  
    1030710567 cat >conftest.$ac_ext <<_ACEOF
    1030810568-#line 13263 "configure"
    10309 +#line 13610 "configure"
     10569+#line 13641 "configure"
    1031010570 #include "confdefs.h"
    1031110571 
    1031210572 #include <sys/types.h>
    10313 @@ -13288,16 +13635,16 @@
     10573@@ -13288,16 +13666,16 @@
    1031410574 }
    1031510575 _ACEOF
    1031610576 rm -f conftest.$ac_objext conftest$ac_exeext
    1031710577-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
    10318 +if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
     10578+if { (eval echo "$as_me:13669: \"$ac_link\"") >&5
    1031910579   (eval $ac_link) 2>&5
    1032010580   ac_status=$?
    1032110581-  echo "$as_me:13294: \$? = $ac_status" >&5
    10322 +  echo "$as_me:13641: \$? = $ac_status" >&5
     10582+  echo "$as_me:13672: \$? = $ac_status" >&5
    1032310583   (exit $ac_status); } &&
    1032410584          { ac_try='test -s conftest$ac_exeext'
    1032510585-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
    10326 +  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
     10586+  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
    1032710587   (eval $ac_try) 2>&5
    1032810588   ac_status=$?
    1032910589-  echo "$as_me:13300: \$? = $ac_status" >&5
    10330 +  echo "$as_me:13647: \$? = $ac_status" >&5
     10590+  echo "$as_me:13678: \$? = $ac_status" >&5
    1033110591   (exit $ac_status); }; }; then
    1033210592   cf_cv_have_tcgetattr=yes
    1033310593 else
    10334 @@ -13307,20 +13654,20 @@
     10594@@ -13307,20 +13685,20 @@
    1033510595 fi
    1033610596 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1033710597 fi
    1033810598-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
    10339 +echo "$as_me:13657: result: $cf_cv_have_tcgetattr" >&5
     10599+echo "$as_me:13688: result: $cf_cv_have_tcgetattr" >&5
    1034010600 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
    1034110601 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
    … …  
    1034410604 
    1034510605-echo "$as_me:13316: checking for vsscanf function or workaround" >&5
    10346 +echo "$as_me:13663: checking for vsscanf function or workaround" >&5
     10606+echo "$as_me:13694: checking for vsscanf function or workaround" >&5
    1034710607 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
    1034810608 if test "${cf_cv_func_vsscanf+set}" = set; then
    … …  
    1035210612 cat >conftest.$ac_ext <<_ACEOF
    1035310613-#line 13323 "configure"
    10354 +#line 13670 "configure"
     10614+#line 13701 "configure"
    1035510615 #include "confdefs.h"
    1035610616 
    1035710617 #include <stdarg.h>
    10358 @@ -13336,16 +13683,16 @@
     10618@@ -13336,16 +13714,16 @@
    1035910619 }
    1036010620 _ACEOF
    1036110621 rm -f conftest.$ac_objext conftest$ac_exeext
    1036210622-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
    10363 +if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
     10623+if { (eval echo "$as_me:13717: \"$ac_link\"") >&5
    1036410624   (eval $ac_link) 2>&5
    1036510625   ac_status=$?
    1036610626-  echo "$as_me:13342: \$? = $ac_status" >&5
    10367 +  echo "$as_me:13689: \$? = $ac_status" >&5
     10627+  echo "$as_me:13720: \$? = $ac_status" >&5
    1036810628   (exit $ac_status); } &&
    1036910629          { ac_try='test -s conftest$ac_exeext'
    1037010630-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
    10371 +  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
     10631+  { (eval echo "$as_me:13723: \"$ac_try\"") >&5
    1037210632   (eval $ac_try) 2>&5
    1037310633   ac_status=$?
    1037410634-  echo "$as_me:13348: \$? = $ac_status" >&5
    10375 +  echo "$as_me:13695: \$? = $ac_status" >&5
     10635+  echo "$as_me:13726: \$? = $ac_status" >&5
    1037610636   (exit $ac_status); }; }; then
    1037710637   cf_cv_func_vsscanf=vsscanf
    1037810638 else
    10379 @@ -13353,7 +13700,7 @@
     10639@@ -13353,7 +13731,7 @@
    1038010640 cat conftest.$ac_ext >&5
    1038110641 
    1038210642 cat >conftest.$ac_ext <<_ACEOF
    1038310643-#line 13356 "configure"
    10384 +#line 13703 "configure"
     10644+#line 13734 "configure"
    1038510645 #include "confdefs.h"
    1038610646 
    1038710647 #include <stdarg.h>
    10388 @@ -13375,16 +13722,16 @@
     10648@@ -13375,16 +13753,16 @@
    1038910649 }
    1039010650 _ACEOF
    1039110651 rm -f conftest.$ac_objext conftest$ac_exeext
    1039210652-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
    10393 +if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
     10653+if { (eval echo "$as_me:13756: \"$ac_link\"") >&5
    1039410654   (eval $ac_link) 2>&5
    1039510655   ac_status=$?
    1039610656-  echo "$as_me:13381: \$? = $ac_status" >&5
    10397 +  echo "$as_me:13728: \$? = $ac_status" >&5
     10657+  echo "$as_me:13759: \$? = $ac_status" >&5
    1039810658   (exit $ac_status); } &&
    1039910659          { ac_try='test -s conftest$ac_exeext'
    1040010660-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
    10401 +  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
     10661+  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
    1040210662   (eval $ac_try) 2>&5
    1040310663   ac_status=$?
    1040410664-  echo "$as_me:13387: \$? = $ac_status" >&5
    10405 +  echo "$as_me:13734: \$? = $ac_status" >&5
     10665+  echo "$as_me:13765: \$? = $ac_status" >&5
    1040610666   (exit $ac_status); }; }; then
    1040710667   cf_cv_func_vsscanf=vfscanf
    1040810668 else
    10409 @@ -13392,7 +13739,7 @@
     10669@@ -13392,7 +13770,7 @@
    1041010670 cat conftest.$ac_ext >&5
    1041110671 
    1041210672 cat >conftest.$ac_ext <<_ACEOF
    1041310673-#line 13395 "configure"
    10414 +#line 13742 "configure"
     10674+#line 13773 "configure"
    1041510675 #include "confdefs.h"
    1041610676 
    1041710677 #include <stdarg.h>
    10418 @@ -13414,16 +13761,16 @@
     10678@@ -13414,16 +13792,16 @@
    1041910679 }
    1042010680 _ACEOF
    1042110681 rm -f conftest.$ac_objext conftest$ac_exeext
    1042210682-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
    10423 +if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
     10683+if { (eval echo "$as_me:13795: \"$ac_link\"") >&5
    1042410684   (eval $ac_link) 2>&5
    1042510685   ac_status=$?
    1042610686-  echo "$as_me:13420: \$? = $ac_status" >&5
    10427 +  echo "$as_me:13767: \$? = $ac_status" >&5
     10687+  echo "$as_me:13798: \$? = $ac_status" >&5
    1042810688   (exit $ac_status); } &&
    1042910689          { ac_try='test -s conftest$ac_exeext'
    1043010690-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
    10431 +  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
     10691+  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
    1043210692   (eval $ac_try) 2>&5
    1043310693   ac_status=$?
    1043410694-  echo "$as_me:13426: \$? = $ac_status" >&5
    10435 +  echo "$as_me:13773: \$? = $ac_status" >&5
     10695+  echo "$as_me:13804: \$? = $ac_status" >&5
    1043610696   (exit $ac_status); }; }; then
    1043710697   cf_cv_func_vsscanf=_doscan
    1043810698 else
    10439 @@ -13438,7 +13785,7 @@
     10699@@ -13438,7 +13816,7 @@
    1044010700 fi
    1044110701 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1044210702 fi
    1044310703-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
    10444 +echo "$as_me:13788: result: $cf_cv_func_vsscanf" >&5
     10704+echo "$as_me:13819: result: $cf_cv_func_vsscanf" >&5
    1044510705 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
    1044610706 
    1044710707 case $cf_cv_func_vsscanf in #(vi
    10448 @@ -13456,7 +13803,7 @@
     10708@@ -13456,7 +13834,7 @@
    1044910709 ;;
    1045010710 esac
    1045110711 
    1045210712-echo "$as_me:13459: checking for working mkstemp" >&5
    10453 +echo "$as_me:13806: checking for working mkstemp" >&5
     10713+echo "$as_me:13837: checking for working mkstemp" >&5
    1045410714 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
    1045510715 if test "${cf_cv_func_mkstemp+set}" = set; then
    1045610716   echo $ECHO_N "(cached) $ECHO_C" >&6
    10457 @@ -13464,13 +13811,13 @@
     10717@@ -13464,13 +13842,13 @@
    1045810718 
    1045910719 rm -f conftest*
    1046010720 if test "$cross_compiling" = yes; then
    1046110721-  echo "$as_me:13467: checking for mkstemp" >&5
    10462 +  echo "$as_me:13814: checking for mkstemp" >&5
     10722+  echo "$as_me:13845: checking for mkstemp" >&5
    1046310723 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
    1046410724 if test "${ac_cv_func_mkstemp+set}" = set; then
    … …  
    1046710727   cat >conftest.$ac_ext <<_ACEOF
    1046810728-#line 13473 "configure"
    10469 +#line 13820 "configure"
     10729+#line 13851 "configure"
    1047010730 #include "confdefs.h"
    1047110731 /* System header to define __stub macros and hopefully few prototypes,
    1047210732     which can conflict with char mkstemp (); below.  */
    10473 @@ -13501,16 +13848,16 @@
     10733@@ -13501,16 +13879,16 @@
    1047410734 }
    1047510735 _ACEOF
    1047610736 rm -f conftest.$ac_objext conftest$ac_exeext
    1047710737-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
    10478 +if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
     10738+if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
    1047910739   (eval $ac_link) 2>&5
    1048010740   ac_status=$?
    1048110741-  echo "$as_me:13507: \$? = $ac_status" >&5
    10482 +  echo "$as_me:13854: \$? = $ac_status" >&5
     10742+  echo "$as_me:13885: \$? = $ac_status" >&5
    1048310743   (exit $ac_status); } &&
    1048410744          { ac_try='test -s conftest$ac_exeext'
    1048510745-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
    10486 +  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
     10746+  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
    1048710747   (eval $ac_try) 2>&5
    1048810748   ac_status=$?
    1048910749-  echo "$as_me:13513: \$? = $ac_status" >&5
    10490 +  echo "$as_me:13860: \$? = $ac_status" >&5
     10750+  echo "$as_me:13891: \$? = $ac_status" >&5
    1049110751   (exit $ac_status); }; }; then
    1049210752   ac_cv_func_mkstemp=yes
    1049310753 else
    10494 @@ -13520,12 +13867,12 @@
     10754@@ -13520,12 +13898,12 @@
    1049510755 fi
    1049610756 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1049710757 fi
    1049810758-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
    10499 +echo "$as_me:13870: result: $ac_cv_func_mkstemp" >&5
     10759+echo "$as_me:13901: result: $ac_cv_func_mkstemp" >&5
    1050010760 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
    1050110761 
    … …  
    1050310763   cat >conftest.$ac_ext <<_ACEOF
    1050410764-#line 13528 "configure"
    10505 +#line 13875 "configure"
     10765+#line 13906 "configure"
    1050610766 #include "confdefs.h"
    1050710767 
    1050810768 #include <sys/types.h>
    10509 @@ -13563,15 +13910,15 @@
     10769@@ -13563,15 +13941,15 @@
    1051010770 
    1051110771 _ACEOF
    1051210772 rm -f conftest$ac_exeext
    1051310773-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
    10514 +if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
     10774+if { (eval echo "$as_me:13944: \"$ac_link\"") >&5
    1051510775   (eval $ac_link) 2>&5
    1051610776   ac_status=$?
    1051710777-  echo "$as_me:13569: \$? = $ac_status" >&5
    10518 +  echo "$as_me:13916: \$? = $ac_status" >&5
     10778+  echo "$as_me:13947: \$? = $ac_status" >&5
    1051910779   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1052010780-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
    10521 +  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
     10781+  { (eval echo "$as_me:13949: \"$ac_try\"") >&5
    1052210782   (eval $ac_try) 2>&5
    1052310783   ac_status=$?
    1052410784-  echo "$as_me:13574: \$? = $ac_status" >&5
    10525 +  echo "$as_me:13921: \$? = $ac_status" >&5
     10785+  echo "$as_me:13952: \$? = $ac_status" >&5
    1052610786   (exit $ac_status); }; }; then
    1052710787   cf_cv_func_mkstemp=yes
    1052810788 
    10529 @@ -13586,7 +13933,7 @@
     10789@@ -13586,7 +13964,7 @@
    1053010790 fi
    1053110791 
    1053210792 fi
    1053310793-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
    10534 +echo "$as_me:13936: result: $cf_cv_func_mkstemp" >&5
     10794+echo "$as_me:13967: result: $cf_cv_func_mkstemp" >&5
    1053510795 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
    1053610796 if test "$cf_cv_func_mkstemp" = yes ; then
    1053710797        cat >>confdefs.h <<\EOF
    10538 @@ -13604,21 +13951,21 @@
     10798@@ -13604,21 +13982,21 @@
    1053910799 fi
    1054010800 
    1054110801 if test "$cross_compiling" = yes ; then
    1054210802-       { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    10543 +       { echo "$as_me:13954: WARNING: cross compiling: assume setvbuf params not reversed" >&5
     10803+       { echo "$as_me:13985: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    1054410804 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
    1054510805 else
    1054610806-       echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
    10547 +       echo "$as_me:13957: checking whether setvbuf arguments are reversed" >&5
     10807+       echo "$as_me:13988: checking whether setvbuf arguments are reversed" >&5
    1054810808 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
    1054910809 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
    … …  
    1055210812   if test "$cross_compiling" = yes; then
    1055310813-  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
    10554 +  { { echo "$as_me:13963: error: cannot run test program while cross compiling" >&5
     10814+  { { echo "$as_me:13994: error: cannot run test program while cross compiling" >&5
    1055510815 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    1055610816    { (exit 1); exit 1; }; }
    … …  
    1055810818   cat >conftest.$ac_ext <<_ACEOF
    1055910819-#line 13621 "configure"
    10560 +#line 13968 "configure"
     10820+#line 13999 "configure"
    1056110821 #include "confdefs.h"
    1056210822 #include <stdio.h>
    1056310823 /* If setvbuf has the reversed format, exit 0. */
    10564 @@ -13635,15 +13982,15 @@
     10824@@ -13635,15 +14013,15 @@
    1056510825 }
    1056610826 _ACEOF
    1056710827 rm -f conftest$ac_exeext
    1056810828-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
    10569 +if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
     10829+if { (eval echo "$as_me:14016: \"$ac_link\"") >&5
    1057010830   (eval $ac_link) 2>&5
    1057110831   ac_status=$?
    1057210832-  echo "$as_me:13641: \$? = $ac_status" >&5
    10573 +  echo "$as_me:13988: \$? = $ac_status" >&5
     10833+  echo "$as_me:14019: \$? = $ac_status" >&5
    1057410834   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1057510835-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
    10576 +  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
     10836+  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
    1057710837   (eval $ac_try) 2>&5
    1057810838   ac_status=$?
    1057910839-  echo "$as_me:13646: \$? = $ac_status" >&5
    10580 +  echo "$as_me:13993: \$? = $ac_status" >&5
     10840+  echo "$as_me:14024: \$? = $ac_status" >&5
    1058110841   (exit $ac_status); }; }; then
    1058210842   ac_cv_func_setvbuf_reversed=yes
    1058310843 else
    10584 @@ -13656,7 +14003,7 @@
     10844@@ -13656,7 +14034,7 @@
    1058510845 fi
    1058610846 rm -f core core.* *.core
    1058710847 fi
    1058810848-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
    10589 +echo "$as_me:14006: result: $ac_cv_func_setvbuf_reversed" >&5
     10849+echo "$as_me:14037: result: $ac_cv_func_setvbuf_reversed" >&5
    1059010850 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
    1059110851 if test $ac_cv_func_setvbuf_reversed = yes; then
    1059210852 
    10593 @@ -13667,13 +14014,13 @@
     10853@@ -13667,13 +14045,13 @@
    1059410854 fi
    1059510855 
    1059610856 fi
    1059710857-echo "$as_me:13670: checking return type of signal handlers" >&5
    10598 +echo "$as_me:14017: checking return type of signal handlers" >&5
     10858+echo "$as_me:14048: checking return type of signal handlers" >&5
    1059910859 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
    1060010860 if test "${ac_cv_type_signal+set}" = set; then
    … …  
    1060310863   cat >conftest.$ac_ext <<_ACEOF
    1060410864-#line 13676 "configure"
    10605 +#line 14023 "configure"
     10865+#line 14054 "configure"
    1060610866 #include "confdefs.h"
    1060710867 #include <sys/types.h>
    1060810868 #include <signal.h>
    10609 @@ -13695,16 +14042,16 @@
     10869@@ -13695,16 +14073,16 @@
    1061010870 }
    1061110871 _ACEOF
    1061210872 rm -f conftest.$ac_objext
    1061310873-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
    10614 +if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
     10874+if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5
    1061510875   (eval $ac_compile) 2>&5
    1061610876   ac_status=$?
    1061710877-  echo "$as_me:13701: \$? = $ac_status" >&5
    10618 +  echo "$as_me:14048: \$? = $ac_status" >&5
     10878+  echo "$as_me:14079: \$? = $ac_status" >&5
    1061910879   (exit $ac_status); } &&
    1062010880          { ac_try='test -s conftest.$ac_objext'
    1062110881-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
    10622 +  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
     10882+  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
    1062310883   (eval $ac_try) 2>&5
    1062410884   ac_status=$?
    1062510885-  echo "$as_me:13707: \$? = $ac_status" >&5
    10626 +  echo "$as_me:14054: \$? = $ac_status" >&5
     10886+  echo "$as_me:14085: \$? = $ac_status" >&5
    1062710887   (exit $ac_status); }; }; then
    1062810888   ac_cv_type_signal=void
    1062910889 else
    10630 @@ -13714,21 +14061,21 @@
     10890@@ -13714,21 +14092,21 @@
    1063110891 fi
    1063210892 rm -f conftest.$ac_objext conftest.$ac_ext
    1063310893 fi
    1063410894-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
    10635 +echo "$as_me:14064: result: $ac_cv_type_signal" >&5
     10895+echo "$as_me:14095: result: $ac_cv_type_signal" >&5
    1063610896 echo "${ECHO_T}$ac_cv_type_signal" >&6
    1063710897 
    … …  
    1064110901 
    1064210902-echo "$as_me:13724: checking for type sigaction_t" >&5
    10643 +echo "$as_me:14071: checking for type sigaction_t" >&5
     10903+echo "$as_me:14102: checking for type sigaction_t" >&5
    1064410904 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
    1064510905 if test "${cf_cv_type_sigaction+set}" = set; then
    … …  
    1064910909        cat >conftest.$ac_ext <<_ACEOF
    1065010910-#line 13731 "configure"
    10651 +#line 14078 "configure"
     10911+#line 14109 "configure"
    1065210912 #include "confdefs.h"
    1065310913 
    1065410914 #include <signal.h>
    10655 @@ -13741,16 +14088,16 @@
     10915@@ -13741,16 +14119,16 @@
    1065610916 }
    1065710917 _ACEOF
    1065810918 rm -f conftest.$ac_objext
    1065910919-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
    10660 +if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5
     10920+if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
    1066110921   (eval $ac_compile) 2>&5
    1066210922   ac_status=$?
    1066310923-  echo "$as_me:13747: \$? = $ac_status" >&5
    10664 +  echo "$as_me:14094: \$? = $ac_status" >&5
     10924+  echo "$as_me:14125: \$? = $ac_status" >&5
    1066510925   (exit $ac_status); } &&
    1066610926          { ac_try='test -s conftest.$ac_objext'
    1066710927-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
    10668 +  { (eval echo "$as_me:14097: \"$ac_try\"") >&5
     10928+  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
    1066910929   (eval $ac_try) 2>&5
    1067010930   ac_status=$?
    1067110931-  echo "$as_me:13753: \$? = $ac_status" >&5
    10672 +  echo "$as_me:14100: \$? = $ac_status" >&5
     10932+  echo "$as_me:14131: \$? = $ac_status" >&5
    1067310933   (exit $ac_status); }; }; then
    1067410934   cf_cv_type_sigaction=yes
    1067510935 else
    10676 @@ -13761,13 +14108,13 @@
     10936@@ -13761,13 +14139,13 @@
    1067710937 rm -f conftest.$ac_objext conftest.$ac_ext
    1067810938 fi
    1067910939 
    1068010940-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
    10681 +echo "$as_me:14111: result: $cf_cv_type_sigaction" >&5
     10941+echo "$as_me:14142: result: $cf_cv_type_sigaction" >&5
    1068210942 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
    1068310943 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
    … …  
    1068610946 
    1068710947-echo "$as_me:13770: checking declaration of size-change" >&5
    10688 +echo "$as_me:14117: checking declaration of size-change" >&5
     10948+echo "$as_me:14148: checking declaration of size-change" >&5
    1068910949 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
    1069010950 if test "${cf_cv_sizechange+set}" = set; then
    1069110951   echo $ECHO_N "(cached) $ECHO_C" >&6
    10692 @@ -13782,7 +14129,7 @@
     10952@@ -13782,7 +14160,7 @@
    1069310953     CPPFLAGS="$cf_save_CPPFLAGS"
    1069410954     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
    1069510955     cat >conftest.$ac_ext <<_ACEOF
    1069610956-#line 13785 "configure"
    10697 +#line 14132 "configure"
     10957+#line 14163 "configure"
    1069810958 #include "confdefs.h"
    1069910959 #include <sys/types.h>
    1070010960 #ifdef HAVE_TERMIOS_H
    10701 @@ -13826,16 +14173,16 @@
     10961@@ -13826,16 +14204,16 @@
    1070210962 }
    1070310963 _ACEOF
    1070410964 rm -f conftest.$ac_objext
    1070510965-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
    10706 +if { (eval echo "$as_me:14176: \"$ac_compile\"") >&5
     10966+if { (eval echo "$as_me:14207: \"$ac_compile\"") >&5
    1070710967   (eval $ac_compile) 2>&5
    1070810968   ac_status=$?
    1070910969-  echo "$as_me:13832: \$? = $ac_status" >&5
    10710 +  echo "$as_me:14179: \$? = $ac_status" >&5
     10970+  echo "$as_me:14210: \$? = $ac_status" >&5
    1071110971   (exit $ac_status); } &&
    1071210972          { ac_try='test -s conftest.$ac_objext'
    1071310973-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
    10714 +  { (eval echo "$as_me:14182: \"$ac_try\"") >&5
     10974+  { (eval echo "$as_me:14213: \"$ac_try\"") >&5
    1071510975   (eval $ac_try) 2>&5
    1071610976   ac_status=$?
    1071710977-  echo "$as_me:13838: \$? = $ac_status" >&5
    10718 +  echo "$as_me:14185: \$? = $ac_status" >&5
     10978+  echo "$as_me:14216: \$? = $ac_status" >&5
    1071910979   (exit $ac_status); }; }; then
    1072010980   cf_cv_sizechange=yes
    1072110981 else
    10722 @@ -13854,7 +14201,7 @@
     10982@@ -13854,7 +14232,7 @@
    1072310983 done
    1072410984 
    1072510985 fi
    1072610986-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
    10727 +echo "$as_me:14204: result: $cf_cv_sizechange" >&5
     10987+echo "$as_me:14235: result: $cf_cv_sizechange" >&5
    1072810988 echo "${ECHO_T}$cf_cv_sizechange" >&6
    1072910989 if test "$cf_cv_sizechange" != no ; then
    1073010990        cat >>confdefs.h <<\EOF
    10731 @@ -13871,13 +14218,13 @@
     10991@@ -13871,13 +14249,13 @@
    1073210992        esac
    1073310993 fi
    1073410994 
    1073510995-echo "$as_me:13874: checking for memmove" >&5
    10736 +echo "$as_me:14221: checking for memmove" >&5
     10996+echo "$as_me:14252: checking for memmove" >&5
    1073710997 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
    1073810998 if test "${ac_cv_func_memmove+set}" = set; then
    … …  
    1074111001   cat >conftest.$ac_ext <<_ACEOF
    1074211002-#line 13880 "configure"
    10743 +#line 14227 "configure"
     11003+#line 14258 "configure"
    1074411004 #include "confdefs.h"
    1074511005 /* System header to define __stub macros and hopefully few prototypes,
    1074611006     which can conflict with char memmove (); below.  */
    10747 @@ -13908,16 +14255,16 @@
     11007@@ -13908,16 +14286,16 @@
    1074811008 }
    1074911009 _ACEOF
    1075011010 rm -f conftest.$ac_objext conftest$ac_exeext
    1075111011-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
    10752 +if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
     11012+if { (eval echo "$as_me:14289: \"$ac_link\"") >&5
    1075311013   (eval $ac_link) 2>&5
    1075411014   ac_status=$?
    1075511015-  echo "$as_me:13914: \$? = $ac_status" >&5
    10756 +  echo "$as_me:14261: \$? = $ac_status" >&5
     11016+  echo "$as_me:14292: \$? = $ac_status" >&5
    1075711017   (exit $ac_status); } &&
    1075811018          { ac_try='test -s conftest$ac_exeext'
    1075911019-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
    10760 +  { (eval echo "$as_me:14264: \"$ac_try\"") >&5
     11020+  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
    1076111021   (eval $ac_try) 2>&5
    1076211022   ac_status=$?
    1076311023-  echo "$as_me:13920: \$? = $ac_status" >&5
    10764 +  echo "$as_me:14267: \$? = $ac_status" >&5
     11024+  echo "$as_me:14298: \$? = $ac_status" >&5
    1076511025   (exit $ac_status); }; }; then
    1076611026   ac_cv_func_memmove=yes
    1076711027 else
    10768 @@ -13927,19 +14274,19 @@
     11028@@ -13927,19 +14305,19 @@
    1076911029 fi
    1077011030 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1077111031 fi
    1077211032-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
    10773 +echo "$as_me:14277: result: $ac_cv_func_memmove" >&5
     11033+echo "$as_me:14308: result: $ac_cv_func_memmove" >&5
    1077411034 echo "${ECHO_T}$ac_cv_func_memmove" >&6
    1077511035 if test $ac_cv_func_memmove = yes; then
    … …  
    1077811038 
    1077911039-echo "$as_me:13936: checking for bcopy" >&5
    10780 +echo "$as_me:14283: checking for bcopy" >&5
     11040+echo "$as_me:14314: checking for bcopy" >&5
    1078111041 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
    1078211042 if test "${ac_cv_func_bcopy+set}" = set; then
    … …  
    1078511045   cat >conftest.$ac_ext <<_ACEOF
    1078611046-#line 13942 "configure"
    10787 +#line 14289 "configure"
     11047+#line 14320 "configure"
    1078811048 #include "confdefs.h"
    1078911049 /* System header to define __stub macros and hopefully few prototypes,
    1079011050     which can conflict with char bcopy (); below.  */
    10791 @@ -13970,16 +14317,16 @@
     11051@@ -13970,16 +14348,16 @@
    1079211052 }
    1079311053 _ACEOF
    1079411054 rm -f conftest.$ac_objext conftest$ac_exeext
    1079511055-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
    10796 +if { (eval echo "$as_me:14320: \"$ac_link\"") >&5
     11056+if { (eval echo "$as_me:14351: \"$ac_link\"") >&5
    1079711057   (eval $ac_link) 2>&5
    1079811058   ac_status=$?
    1079911059-  echo "$as_me:13976: \$? = $ac_status" >&5
    10800 +  echo "$as_me:14323: \$? = $ac_status" >&5
     11060+  echo "$as_me:14354: \$? = $ac_status" >&5
    1080111061   (exit $ac_status); } &&
    1080211062          { ac_try='test -s conftest$ac_exeext'
    1080311063-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
    10804 +  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
     11064+  { (eval echo "$as_me:14357: \"$ac_try\"") >&5
    1080511065   (eval $ac_try) 2>&5
    1080611066   ac_status=$?
    1080711067-  echo "$as_me:13982: \$? = $ac_status" >&5
    10808 +  echo "$as_me:14329: \$? = $ac_status" >&5
     11068+  echo "$as_me:14360: \$? = $ac_status" >&5
    1080911069   (exit $ac_status); }; }; then
    1081011070   ac_cv_func_bcopy=yes
    1081111071 else
    10812 @@ -13989,11 +14336,11 @@
     11072@@ -13989,11 +14367,11 @@
    1081311073 fi
    1081411074 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1081511075 fi
    1081611076-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
    10817 +echo "$as_me:14339: result: $ac_cv_func_bcopy" >&5
     11077+echo "$as_me:14370: result: $ac_cv_func_bcopy" >&5
    1081811078 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
    1081911079 if test $ac_cv_func_bcopy = yes; then
    1082011080 
    1082111081-       echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
    10822 +       echo "$as_me:14343: checking if bcopy does overlapping moves" >&5
     11082+       echo "$as_me:14374: checking if bcopy does overlapping moves" >&5
    1082311083 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
    1082411084 if test "${cf_cv_good_bcopy+set}" = set; then
    1082511085   echo $ECHO_N "(cached) $ECHO_C" >&6
    10826 @@ -14003,7 +14350,7 @@
     11086@@ -14003,7 +14381,7 @@
    1082711087   cf_cv_good_bcopy=unknown
    1082811088 else
    1082911089   cat >conftest.$ac_ext <<_ACEOF
    1083011090-#line 14006 "configure"
    10831 +#line 14353 "configure"
     11091+#line 14384 "configure"
    1083211092 #include "confdefs.h"
    1083311093 
    1083411094 int main() {
    10835 @@ -14017,15 +14364,15 @@
     11095@@ -14017,15 +14395,15 @@
    1083611096 
    1083711097 _ACEOF
    1083811098 rm -f conftest$ac_exeext
    1083911099-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
    10840 +if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
     11100+if { (eval echo "$as_me:14398: \"$ac_link\"") >&5
    1084111101   (eval $ac_link) 2>&5
    1084211102   ac_status=$?
    1084311103-  echo "$as_me:14023: \$? = $ac_status" >&5
    10844 +  echo "$as_me:14370: \$? = $ac_status" >&5
     11104+  echo "$as_me:14401: \$? = $ac_status" >&5
    1084511105   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1084611106-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
    10847 +  { (eval echo "$as_me:14372: \"$ac_try\"") >&5
     11107+  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
    1084811108   (eval $ac_try) 2>&5
    1084911109   ac_status=$?
    1085011110-  echo "$as_me:14028: \$? = $ac_status" >&5
    10851 +  echo "$as_me:14375: \$? = $ac_status" >&5
     11111+  echo "$as_me:14406: \$? = $ac_status" >&5
    1085211112   (exit $ac_status); }; }; then
    1085311113   cf_cv_good_bcopy=yes
    1085411114 else
    10855 @@ -14038,7 +14385,7 @@
     11115@@ -14038,7 +14416,7 @@
    1085611116 fi
    1085711117 
    1085811118 fi
    1085911119-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
    10860 +echo "$as_me:14388: result: $cf_cv_good_bcopy" >&5
     11120+echo "$as_me:14419: result: $cf_cv_good_bcopy" >&5
    1086111121 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
    1086211122 
    1086311123 else
    10864 @@ -14059,7 +14406,7 @@
     11124@@ -14059,7 +14437,7 @@
    1086511125 
    1086611126 fi
    1086711127 
    1086811128-echo "$as_me:14062: checking if poll really works" >&5
    10869 +echo "$as_me:14409: checking if poll really works" >&5
     11129+echo "$as_me:14440: checking if poll really works" >&5
    1087011130 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
    1087111131 if test "${cf_cv_working_poll+set}" = set; then
    1087211132   echo $ECHO_N "(cached) $ECHO_C" >&6
    10873 @@ -14069,7 +14416,7 @@
     11133@@ -14069,7 +14447,7 @@
    1087411134   cf_cv_working_poll=unknown
    1087511135 else
    1087611136   cat >conftest.$ac_ext <<_ACEOF
    1087711137-#line 14072 "configure"
    10878 +#line 14419 "configure"
     11138+#line 14450 "configure"
    1087911139 #include "confdefs.h"
    1088011140 
    1088111141 #include <stdio.h>
    10882 @@ -14090,15 +14437,15 @@
     11142@@ -14090,15 +14468,15 @@
    1088311143 }
    1088411144 _ACEOF
    1088511145 rm -f conftest$ac_exeext
    1088611146-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
    10887 +if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
     11147+if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
    1088811148   (eval $ac_link) 2>&5
    1088911149   ac_status=$?
    1089011150-  echo "$as_me:14096: \$? = $ac_status" >&5
    10891 +  echo "$as_me:14443: \$? = $ac_status" >&5
     11151+  echo "$as_me:14474: \$? = $ac_status" >&5
    1089211152   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1089311153-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
    10894 +  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
     11154+  { (eval echo "$as_me:14476: \"$ac_try\"") >&5
    1089511155   (eval $ac_try) 2>&5
    1089611156   ac_status=$?
    1089711157-  echo "$as_me:14101: \$? = $ac_status" >&5
    10898 +  echo "$as_me:14448: \$? = $ac_status" >&5
     11158+  echo "$as_me:14479: \$? = $ac_status" >&5
    1089911159   (exit $ac_status); }; }; then
    1090011160   cf_cv_working_poll=yes
    1090111161 else
    10902 @@ -14110,7 +14457,7 @@
     11162@@ -14110,7 +14488,7 @@
    1090311163 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1090411164 fi
    1090511165 fi
    1090611166-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
    10907 +echo "$as_me:14460: result: $cf_cv_working_poll" >&5
     11167+echo "$as_me:14491: result: $cf_cv_working_poll" >&5
    1090811168 echo "${ECHO_T}$cf_cv_working_poll" >&6
    1090911169 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
    1091011170 #define HAVE_WORKING_POLL 1
    10911 @@ -14118,7 +14465,7 @@
     11171@@ -14118,7 +14496,7 @@
    1091211172 
    1091311173 # special check for test/ditto.c
    1091411174 
    1091511175-echo "$as_me:14121: checking for openpty in -lutil" >&5
    10916 +echo "$as_me:14468: checking for openpty in -lutil" >&5
     11176+echo "$as_me:14499: checking for openpty in -lutil" >&5
    1091711177 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
    1091811178 if test "${ac_cv_lib_util_openpty+set}" = set; then
    1091911179   echo $ECHO_N "(cached) $ECHO_C" >&6
    10920 @@ -14126,7 +14473,7 @@
     11180@@ -14126,7 +14504,7 @@
    1092111181   ac_check_lib_save_LIBS=$LIBS
    1092211182 LIBS="-lutil  $LIBS"
    1092311183 cat >conftest.$ac_ext <<_ACEOF
    1092411184-#line 14129 "configure"
    10925 +#line 14476 "configure"
     11185+#line 14507 "configure"
    1092611186 #include "confdefs.h"
    1092711187 
    1092811188 /* Override any gcc2 internal prototype to avoid an error.  */
    10929 @@ -14145,16 +14492,16 @@
     11189@@ -14145,16 +14523,16 @@
    1093011190 }
    1093111191 _ACEOF
    1093211192 rm -f conftest.$ac_objext conftest$ac_exeext
    1093311193-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
    10934 +if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
     11194+if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
    1093511195   (eval $ac_link) 2>&5
    1093611196   ac_status=$?
    1093711197-  echo "$as_me:14151: \$? = $ac_status" >&5
    10938 +  echo "$as_me:14498: \$? = $ac_status" >&5
     11198+  echo "$as_me:14529: \$? = $ac_status" >&5
    1093911199   (exit $ac_status); } &&
    1094011200          { ac_try='test -s conftest$ac_exeext'
    1094111201-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
    10942 +  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
     11202+  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
    1094311203   (eval $ac_try) 2>&5
    1094411204   ac_status=$?
    1094511205-  echo "$as_me:14157: \$? = $ac_status" >&5
    10946 +  echo "$as_me:14504: \$? = $ac_status" >&5
     11206+  echo "$as_me:14535: \$? = $ac_status" >&5
    1094711207   (exit $ac_status); }; }; then
    1094811208   ac_cv_lib_util_openpty=yes
    1094911209 else
    10950 @@ -14165,7 +14512,7 @@
     11210@@ -14165,7 +14543,7 @@
    1095111211 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1095211212 LIBS=$ac_check_lib_save_LIBS
    1095311213 fi
    1095411214-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
    10955 +echo "$as_me:14515: result: $ac_cv_lib_util_openpty" >&5
     11215+echo "$as_me:14546: result: $ac_cv_lib_util_openpty" >&5
    1095611216 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
    1095711217 if test $ac_cv_lib_util_openpty = yes; then
    1095811218   cf_cv_lib_util=yes
    10959 @@ -14173,7 +14520,7 @@
     11219@@ -14173,7 +14551,7 @@
    1096011220   cf_cv_lib_util=no
    1096111221 fi
    1096211222 
    1096311223-echo "$as_me:14176: checking for openpty header" >&5
    10964 +echo "$as_me:14523: checking for openpty header" >&5
     11224+echo "$as_me:14554: checking for openpty header" >&5
    1096511225 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
    1096611226 if test "${cf_cv_func_openpty+set}" = set; then
    1096711227   echo $ECHO_N "(cached) $ECHO_C" >&6
    10968 @@ -14184,7 +14531,7 @@
     11228@@ -14184,7 +14562,7 @@
    1096911229     for cf_header in pty.h libutil.h util.h
    1097011230     do
    1097111231     cat >conftest.$ac_ext <<_ACEOF
    1097211232-#line 14187 "configure"
    10973 +#line 14534 "configure"
     11233+#line 14565 "configure"
    1097411234 #include "confdefs.h"
    1097511235 
    1097611236 #include <$cf_header>
    10977 @@ -14201,16 +14548,16 @@
     11237@@ -14201,16 +14579,16 @@
    1097811238 }
    1097911239 _ACEOF
    1098011240 rm -f conftest.$ac_objext conftest$ac_exeext
    1098111241-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
    10982 +if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
     11242+if { (eval echo "$as_me:14582: \"$ac_link\"") >&5
    1098311243   (eval $ac_link) 2>&5
    1098411244   ac_status=$?
    1098511245-  echo "$as_me:14207: \$? = $ac_status" >&5
    10986 +  echo "$as_me:14554: \$? = $ac_status" >&5
     11246+  echo "$as_me:14585: \$? = $ac_status" >&5
    1098711247   (exit $ac_status); } &&
    1098811248          { ac_try='test -s conftest$ac_exeext'
    1098911249-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
    10990 +  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
     11250+  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
    1099111251   (eval $ac_try) 2>&5
    1099211252   ac_status=$?
    1099311253-  echo "$as_me:14213: \$? = $ac_status" >&5
    10994 +  echo "$as_me:14560: \$? = $ac_status" >&5
     11254+  echo "$as_me:14591: \$? = $ac_status" >&5
    1099511255   (exit $ac_status); }; }; then
    1099611256 
    1099711257         cf_cv_func_openpty=$cf_header
    10998 @@ -14228,7 +14575,7 @@
     11258@@ -14228,7 +14606,7 @@
    1099911259     LIBS="$cf_save_LIBS"
    1100011260 
    1100111261 fi
    1100211262-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
    11003 +echo "$as_me:14578: result: $cf_cv_func_openpty" >&5
     11263+echo "$as_me:14609: result: $cf_cv_func_openpty" >&5
    1100411264 echo "${ECHO_T}$cf_cv_func_openpty" >&6
    1100511265 
    1100611266 if test "$cf_cv_func_openpty" != no ; then
    11007 @@ -14274,13 +14621,13 @@
     11267@@ -14274,13 +14652,13 @@
    1100811268                fi
    1100911269 
    … …  
    1101711277                          cat >conftest.$ac_ext <<_ACEOF
    1101811278-#line 14283 "configure"
    11019 +#line 14630 "configure"
     11279+#line 14661 "configure"
    1102011280 #include "confdefs.h"
    1102111281 #include <stdio.h>
    1102211282 int
    11023 @@ -14292,16 +14639,16 @@
     11283@@ -14292,16 +14670,16 @@
    1102411284 }
    1102511285 _ACEOF
    1102611286 rm -f conftest.$ac_objext
    1102711287-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
    11028 +if { (eval echo "$as_me:14642: \"$ac_compile\"") >&5
     11288+if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5
    1102911289   (eval $ac_compile) 2>&5
    1103011290   ac_status=$?
    1103111291-  echo "$as_me:14298: \$? = $ac_status" >&5
    11032 +  echo "$as_me:14645: \$? = $ac_status" >&5
     11292+  echo "$as_me:14676: \$? = $ac_status" >&5
    1103311293   (exit $ac_status); } &&
    1103411294          { ac_try='test -s conftest.$ac_objext'
    1103511295-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
    11036 +  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
     11296+  { (eval echo "$as_me:14679: \"$ac_try\"") >&5
    1103711297   (eval $ac_try) 2>&5
    1103811298   ac_status=$?
    1103911299-  echo "$as_me:14304: \$? = $ac_status" >&5
    11040 +  echo "$as_me:14651: \$? = $ac_status" >&5
     11300+  echo "$as_me:14682: \$? = $ac_status" >&5
    1104111301   (exit $ac_status); }; }; then
    1104211302   :
    1104311303 else
    11044 @@ -14318,13 +14665,13 @@
     11304@@ -14318,13 +14696,13 @@
    1104511305                if test "$cf_have_incdir" = no ; then
    1104611306                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    1104711307 
    1104811308-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
    11049 +echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
    11050  
    11051                   CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     11309+echo "${as_me-configure}:14699: testing adding $cf_add_incdir to include-path ..." 1>&5
     11310 
     11311-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     11312+                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    1105211313 
    1105311314-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
    … …  
    1106011321                  break
    1106111322                fi
    11062 @@ -14352,7 +14699,7 @@
     11323@@ -14352,7 +14730,7 @@
    1106311324       if test "$cf_have_libdir" = no ; then
    1106411325         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    1106511326 
    1106611327-echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
    11067 +echo "${as_me-configure}:14702: 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
    1106811329 
    1106911330         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    1107011331       fi
    11071 @@ -14363,23 +14710,23 @@
     11332@@ -14363,23 +14741,23 @@
    1107211333     fi
    1107311334 esac
    1107411335 
    1107511336-echo "$as_me:14366: checking for db.h" >&5
    11076 +echo "$as_me:14713: checking for db.h" >&5
     11337+echo "$as_me:14744: checking for db.h" >&5
    1107711338 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
    1107811339 if test "${ac_cv_header_db_h+set}" = set; then
    … …  
    1108111342   cat >conftest.$ac_ext <<_ACEOF
    1108211343-#line 14372 "configure"
    11083 +#line 14719 "configure"
     11344+#line 14750 "configure"
    1108411345 #include "confdefs.h"
    1108511346 #include <db.h>
    1108611347 _ACEOF
    1108711348-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
    11088 +if { (eval echo "$as_me:14723: \"$ac_cpp conftest.$ac_ext\"") >&5
     11349+if { (eval echo "$as_me:14754: \"$ac_cpp conftest.$ac_ext\"") >&5
    1108911350   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1109011351   ac_status=$?
    … …  
    1109311354   cat conftest.err >&5
    1109411355-  echo "$as_me:14382: \$? = $ac_status" >&5
    11095 +  echo "$as_me:14729: \$? = $ac_status" >&5
     11356+  echo "$as_me:14760: \$? = $ac_status" >&5
    1109611357   (exit $ac_status); } >/dev/null; then
    1109711358   if test -s conftest.err; then
    1109811359     ac_cpp_err=$ac_c_preproc_warn_flag
    11099 @@ -14398,11 +14745,11 @@
     11360@@ -14398,11 +14776,11 @@
    1110011361 fi
    1110111362 rm -f conftest.err conftest.$ac_ext
    1110211363 fi
    1110311364-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
    11104 +echo "$as_me:14748: result: $ac_cv_header_db_h" >&5
     11365+echo "$as_me:14779: result: $ac_cv_header_db_h" >&5
    1110511366 echo "${ECHO_T}$ac_cv_header_db_h" >&6
    1110611367 if test $ac_cv_header_db_h = yes; then
    1110711368 
    1110811369-echo "$as_me:14405: checking for version of db" >&5
    11109 +echo "$as_me:14752: checking for version of db" >&5
     11370+echo "$as_me:14783: checking for version of db" >&5
    1111011371 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
    1111111372 if test "${cf_cv_hashed_db_version+set}" = set; then
    1111211373   echo $ECHO_N "(cached) $ECHO_C" >&6
    11113 @@ -14413,10 +14760,10 @@
     11374@@ -14413,10 +14791,10 @@
    1111411375 for cf_db_version in 1 2 3 4 5
    1111511376 do
    1111611377 
    1111711378-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
    11118 +echo "${as_me-configure}:14763: 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
    1111911380 
    1112011381        cat >conftest.$ac_ext <<_ACEOF
    1112111382-#line 14419 "configure"
    11122 +#line 14766 "configure"
     11383+#line 14797 "configure"
    1112311384 #include "confdefs.h"
    1112411385 
    1112511386 $ac_includes_default
    11126 @@ -14446,16 +14793,16 @@
     11387@@ -14446,16 +14824,16 @@
    1112711388 }
    1112811389 _ACEOF
    1112911390 rm -f conftest.$ac_objext
    1113011391-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
    11131 +if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
     11392+if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
    1113211393   (eval $ac_compile) 2>&5
    1113311394   ac_status=$?
    1113411395-  echo "$as_me:14452: \$? = $ac_status" >&5
    11135 +  echo "$as_me:14799: \$? = $ac_status" >&5
     11396+  echo "$as_me:14830: \$? = $ac_status" >&5
    1113611397   (exit $ac_status); } &&
    1113711398          { ac_try='test -s conftest.$ac_objext'
    1113811399-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
    11139 +  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
     11400+  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    1114011401   (eval $ac_try) 2>&5
    1114111402   ac_status=$?
    1114211403-  echo "$as_me:14458: \$? = $ac_status" >&5
    11143 +  echo "$as_me:14805: \$? = $ac_status" >&5
     11404+  echo "$as_me:14836: \$? = $ac_status" >&5
    1114411405   (exit $ac_status); }; }; then
    1114511406 
    1114611407        cf_cv_hashed_db_version=$cf_db_version
    11147 @@ -14469,16 +14816,16 @@
     11408@@ -14469,16 +14847,16 @@
    1114811409 done
    1114911410 
    1115011411 fi
    1115111412-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
    11152 +echo "$as_me:14819: result: $cf_cv_hashed_db_version" >&5
     11413+echo "$as_me:14850: result: $cf_cv_hashed_db_version" >&5
    1115311414 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
    1115411415 
    1115511416 if test "$cf_cv_hashed_db_version" = unknown ; then
    1115611417-       { { echo "$as_me:14476: error: Cannot determine version of db" >&5
    11157 +       { { echo "$as_me:14823: error: Cannot determine version of db" >&5
     11418+       { { echo "$as_me:14854: error: Cannot determine version of db" >&5
    1115811419 echo "$as_me: error: Cannot determine version of db" >&2;}
    1115911420    { (exit 1); exit 1; }; }
    … …  
    1116111422 
    1116211423-echo "$as_me:14481: checking for db libraries" >&5
    11163 +echo "$as_me:14828: checking for db libraries" >&5
     11424+echo "$as_me:14859: checking for db libraries" >&5
    1116411425 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
    1116511426 if test "${cf_cv_hashed_db_libs+set}" = set; then
    1116611427   echo $ECHO_N "(cached) $ECHO_C" >&6
    11167 @@ -14492,10 +14839,10 @@
     11428@@ -14492,10 +14870,10 @@
    1116811429                LIBS="-l$cf_db_libs $LIBS"
    1116911430        fi
    1117011431 
    1117111432-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
    11172 +echo "${as_me-configure}:14842: testing checking for library "$cf_db_libs" ..." 1>&5
     11433+echo "${as_me-configure}:14873: testing checking for library "$cf_db_libs" ..." 1>&5
    1117311434 
    1117411435        cat >conftest.$ac_ext <<_ACEOF
    1117511436-#line 14498 "configure"
    11176 +#line 14845 "configure"
     11437+#line 14876 "configure"
    1117711438 #include "confdefs.h"
    1117811439 
    1117911440 $ac_includes_default
    11180 @@ -14550,16 +14897,16 @@
     11441@@ -14550,16 +14928,16 @@
    1118111442 }
    1118211443 _ACEOF
    1118311444 rm -f conftest.$ac_objext conftest$ac_exeext
    1118411445-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
    11185 +if { (eval echo "$as_me:14900: \"$ac_link\"") >&5
     11446+if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    1118611447   (eval $ac_link) 2>&5
    1118711448   ac_status=$?
    1118811449-  echo "$as_me:14556: \$? = $ac_status" >&5
    11189 +  echo "$as_me:14903: \$? = $ac_status" >&5
     11450+  echo "$as_me:14934: \$? = $ac_status" >&5
    1119011451   (exit $ac_status); } &&
    1119111452          { ac_try='test -s conftest$ac_exeext'
    1119211453-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
    11193 +  { (eval echo "$as_me:14906: \"$ac_try\"") >&5
     11454+  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    1119411455   (eval $ac_try) 2>&5
    1119511456   ac_status=$?
    1119611457-  echo "$as_me:14562: \$? = $ac_status" >&5
    11197 +  echo "$as_me:14909: \$? = $ac_status" >&5
     11458+  echo "$as_me:14940: \$? = $ac_status" >&5
    1119811459   (exit $ac_status); }; }; then
    1119911460 
    1120011461        if test -n "$cf_db_libs" ; then
    11201 @@ -14579,11 +14926,11 @@
     11462@@ -14579,11 +14957,11 @@
    1120211463 done
    1120311464 
    1120411465 fi
    1120511466-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
    11206 +echo "$as_me:14929: result: $cf_cv_hashed_db_libs" >&5
     11467+echo "$as_me:14960: result: $cf_cv_hashed_db_libs" >&5
    1120711468 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
    1120811469 
    1120911470        if test "$cf_cv_hashed_db_libs" = unknown ; then
    1121011471-               { { echo "$as_me:14586: error: Cannot determine library for db" >&5
    11211 +               { { echo "$as_me:14933: error: Cannot determine library for db" >&5
     11472+               { { echo "$as_me:14964: error: Cannot determine library for db" >&5
    1121211473 echo "$as_me: error: Cannot determine library for db" >&2;}
    1121311474    { (exit 1); exit 1; }; }
    1121411475        elif test "$cf_cv_hashed_db_libs" != default ; then
    11215 @@ -14593,7 +14940,7 @@
     11476@@ -14593,7 +14971,7 @@
    1121611477 
    1121711478 else
    1121811479 
    1121911480-       { { echo "$as_me:14596: error: Cannot find db.h" >&5
    11220 +       { { echo "$as_me:14943: error: Cannot find db.h" >&5
     11481+       { { echo "$as_me:14974: error: Cannot find db.h" >&5
    1122111482 echo "$as_me: error: Cannot find db.h" >&2;}
    1122211483    { (exit 1); exit 1; }; }
    1122311484 
    11224 @@ -14608,7 +14955,7 @@
     11485@@ -14608,7 +14986,7 @@
    1122511486 
    1122611487 # Just in case, check if the C compiler has a bool type.
    1122711488 
    1122811489-echo "$as_me:14611: checking if we should include stdbool.h" >&5
    11229 +echo "$as_me:14958: checking if we should include stdbool.h" >&5
     11490+echo "$as_me:14989: checking if we should include stdbool.h" >&5
    1123011491 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1123111492 
    1123211493 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11233 @@ -14616,7 +14963,7 @@
     11494@@ -14616,7 +14994,7 @@
    1123411495 else
    1123511496 
    1123611497        cat >conftest.$ac_ext <<_ACEOF
    1123711498-#line 14619 "configure"
    11238 +#line 14966 "configure"
     11499+#line 14997 "configure"
    1123911500 #include "confdefs.h"
    1124011501 
    1124111502 int
    11242 @@ -14628,23 +14975,23 @@
     11503@@ -14628,23 +15006,23 @@
    1124311504 }
    1124411505 _ACEOF
    1124511506 rm -f conftest.$ac_objext
    1124611507-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
    11247 +if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5
     11508+if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5
    1124811509   (eval $ac_compile) 2>&5
    1124911510   ac_status=$?
    1125011511-  echo "$as_me:14634: \$? = $ac_status" >&5
    11251 +  echo "$as_me:14981: \$? = $ac_status" >&5
     11512+  echo "$as_me:15012: \$? = $ac_status" >&5
    1125211513   (exit $ac_status); } &&
    1125311514          { ac_try='test -s conftest.$ac_objext'
    1125411515-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
    11255 +  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
     11516+  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
    1125611517   (eval $ac_try) 2>&5
    1125711518   ac_status=$?
    1125811519-  echo "$as_me:14640: \$? = $ac_status" >&5
    11259 +  echo "$as_me:14987: \$? = $ac_status" >&5
     11520+  echo "$as_me:15018: \$? = $ac_status" >&5
    1126011521   (exit $ac_status); }; }; then
    1126111522   cf_cv_header_stdbool_h=0
    … …  
    1126511526 cat >conftest.$ac_ext <<_ACEOF
    1126611527-#line 14647 "configure"
    11267 +#line 14994 "configure"
     11528+#line 15025 "configure"
    1126811529 #include "confdefs.h"
    1126911530 
    1127011531 #ifndef __BEOS__
    11271 @@ -14660,16 +15007,16 @@
     11532@@ -14660,16 +15038,16 @@
    1127211533 }
    1127311534 _ACEOF
    1127411535 rm -f conftest.$ac_objext
    1127511536-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
    11276 +if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
     11537+if { (eval echo "$as_me:15041: \"$ac_compile\"") >&5
    1127711538   (eval $ac_compile) 2>&5
    1127811539   ac_status=$?
    1127911540-  echo "$as_me:14666: \$? = $ac_status" >&5
    11280 +  echo "$as_me:15013: \$? = $ac_status" >&5
     11541+  echo "$as_me:15044: \$? = $ac_status" >&5
    1128111542   (exit $ac_status); } &&
    1128211543          { ac_try='test -s conftest.$ac_objext'
    1128311544-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
    11284 +  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
     11545+  { (eval echo "$as_me:15047: \"$ac_try\"") >&5
    1128511546   (eval $ac_try) 2>&5
    1128611547   ac_status=$?
    1128711548-  echo "$as_me:14672: \$? = $ac_status" >&5
    11288 +  echo "$as_me:15019: \$? = $ac_status" >&5
     11549+  echo "$as_me:15050: \$? = $ac_status" >&5
    1128911550   (exit $ac_status); }; }; then
    1129011551   cf_cv_header_stdbool_h=1
    1129111552 else
    11292 @@ -14683,13 +15030,13 @@
     11553@@ -14683,13 +15061,13 @@
    1129311554 fi
    1129411555 
    1129511556 if test "$cf_cv_header_stdbool_h" = 1
    1129611557-then   echo "$as_me:14686: result: yes" >&5
    11297 +then   echo "$as_me:15033: result: yes" >&5
     11558+then   echo "$as_me:15064: result: yes" >&5
    1129811559 echo "${ECHO_T}yes" >&6
    1129911560-else   echo "$as_me:14688: result: no" >&5
    11300 +else   echo "$as_me:15035: result: no" >&5
     11561+else   echo "$as_me:15066: result: no" >&5
    1130111562 echo "${ECHO_T}no" >&6
    1130211563 fi
    1130311564 
    1130411565-echo "$as_me:14692: checking for builtin bool type" >&5
    11305 +echo "$as_me:15039: checking for builtin bool type" >&5
     11566+echo "$as_me:15070: checking for builtin bool type" >&5
    1130611567 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1130711568 
    1130811569 if test "${cf_cv_cc_bool_type+set}" = set; then
    11309 @@ -14697,7 +15044,7 @@
     11570@@ -14697,7 +15075,7 @@
    1131011571 else
    1131111572 
    1131211573        cat >conftest.$ac_ext <<_ACEOF
    1131311574-#line 14700 "configure"
    11314 +#line 15047 "configure"
     11575+#line 15078 "configure"
    1131511576 #include "confdefs.h"
    1131611577 
    1131711578 #include <stdio.h>
    11318 @@ -14712,16 +15059,16 @@
     11579@@ -14712,16 +15090,16 @@
    1131911580 }
    1132011581 _ACEOF
    1132111582 rm -f conftest.$ac_objext
    1132211583-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
    11323 +if { (eval echo "$as_me:15062: \"$ac_compile\"") >&5
     11584+if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
    1132411585   (eval $ac_compile) 2>&5
    1132511586   ac_status=$?
    1132611587-  echo "$as_me:14718: \$? = $ac_status" >&5
    11327 +  echo "$as_me:15065: \$? = $ac_status" >&5
     11588+  echo "$as_me:15096: \$? = $ac_status" >&5
    1132811589   (exit $ac_status); } &&
    1132911590          { ac_try='test -s conftest.$ac_objext'
    1133011591-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
    11331 +  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
     11592+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
    1133211593   (eval $ac_try) 2>&5
    1133311594   ac_status=$?
    1133411595-  echo "$as_me:14724: \$? = $ac_status" >&5
    11335 +  echo "$as_me:15071: \$? = $ac_status" >&5
     11596+  echo "$as_me:15102: \$? = $ac_status" >&5
    1133611597   (exit $ac_status); }; }; then
    1133711598   cf_cv_cc_bool_type=1
    1133811599 else
    11339 @@ -14734,9 +15081,9 @@
     11600@@ -14734,9 +15112,9 @@
    1134011601 fi
    1134111602 
    1134211603 if test "$cf_cv_cc_bool_type" = 1
    1134311604-then   echo "$as_me:14737: result: yes" >&5
    11344 +then   echo "$as_me:15084: result: yes" >&5
     11605+then   echo "$as_me:15115: result: yes" >&5
    1134511606 echo "${ECHO_T}yes" >&6
    1134611607-else   echo "$as_me:14739: result: no" >&5
    11347 +else   echo "$as_me:15086: result: no" >&5
     11608+else   echo "$as_me:15117: result: no" >&5
    1134811609 echo "${ECHO_T}no" >&6
    1134911610 fi
    1135011611 
    11351 @@ -14758,7 +15105,7 @@
     11612@@ -14758,7 +15136,7 @@
    1135211613        cf_stdcpp_libname=stdc++
    1135311614        ;;
    1135411615 esac
    1135511616-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
    11356 +echo "$as_me:15108: checking for library $cf_stdcpp_libname" >&5
     11617+echo "$as_me:15139: checking for library $cf_stdcpp_libname" >&5
    1135711618 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
    1135811619 if test "${cf_cv_libstdcpp+set}" = set; then
    1135911620   echo $ECHO_N "(cached) $ECHO_C" >&6
    11360 @@ -14767,7 +15114,7 @@
     11621@@ -14767,7 +15145,7 @@
    1136111622        cf_save="$LIBS"
    1136211623        LIBS="$LIBS -l$cf_stdcpp_libname"
    1136311624 cat >conftest.$ac_ext <<_ACEOF
    1136411625-#line 14770 "configure"
    11365 +#line 15117 "configure"
     11626+#line 15148 "configure"
    1136611627 #include "confdefs.h"
    1136711628 
    1136811629 #include <strstream.h>
    11369 @@ -14783,16 +15130,16 @@
     11630@@ -14783,16 +15161,16 @@
    1137011631 }
    1137111632 _ACEOF
    1137211633 rm -f conftest.$ac_objext conftest$ac_exeext
    1137311634-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
    11374 +if { (eval echo "$as_me:15133: \"$ac_link\"") >&5
     11635+if { (eval echo "$as_me:15164: \"$ac_link\"") >&5
    1137511636   (eval $ac_link) 2>&5
    1137611637   ac_status=$?
    1137711638-  echo "$as_me:14789: \$? = $ac_status" >&5
    11378 +  echo "$as_me:15136: \$? = $ac_status" >&5
     11639+  echo "$as_me:15167: \$? = $ac_status" >&5
    1137911640   (exit $ac_status); } &&
    1138011641          { ac_try='test -s conftest$ac_exeext'
    1138111642-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
    11382 +  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
     11643+  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
    1138311644   (eval $ac_try) 2>&5
    1138411645   ac_status=$?
    1138511646-  echo "$as_me:14795: \$? = $ac_status" >&5
    11386 +  echo "$as_me:15142: \$? = $ac_status" >&5
     11647+  echo "$as_me:15173: \$? = $ac_status" >&5
    1138711648   (exit $ac_status); }; }; then
    1138811649   cf_cv_libstdcpp=yes
    1138911650 else
    11390 @@ -14804,12 +15151,12 @@
     11651@@ -14804,12 +15182,12 @@
    1139111652        LIBS="$cf_save"
    1139211653 
    1139311654 fi
    1139411655-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
    11395 +echo "$as_me:15154: result: $cf_cv_libstdcpp" >&5
     11656+echo "$as_me:15185: result: $cf_cv_libstdcpp" >&5
    1139611657 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
    1139711658 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
    … …  
    1139911660 
    1140011661-       echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
    11401 +       echo "$as_me:15159: checking whether $CXX understands -c and -o together" >&5
     11662+       echo "$as_me:15190: checking whether $CXX understands -c and -o together" >&5
    1140211663 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
    1140311664 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
    1140411665   echo $ECHO_N "(cached) $ECHO_C" >&6
    11405 @@ -14825,15 +15172,15 @@
     11666@@ -14825,15 +15203,15 @@
    1140611667 # We do the test twice because some compilers refuse to overwrite an
    1140711668 # existing .o file with -o, though they will create one.
    1140811669 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    1140911670-if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
    11410 +if { (eval echo "$as_me:15175: \"$ac_try\"") >&5
     11671+if { (eval echo "$as_me:15206: \"$ac_try\"") >&5
    1141111672   (eval $ac_try) 2>&5
    1141211673   ac_status=$?
    1141311674-  echo "$as_me:14831: \$? = $ac_status" >&5
    11414 +  echo "$as_me:15178: \$? = $ac_status" >&5
     11675+  echo "$as_me:15209: \$? = $ac_status" >&5
    1141511676   (exit $ac_status); } &&
    1141611677-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    11417 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:15180: \"$ac_try\"") >&5
     11678+  test -f conftest2.$ac_objext && { (eval echo "$as_me:15211: \"$ac_try\"") >&5
    1141811679   (eval $ac_try) 2>&5
    1141911680   ac_status=$?
    1142011681-  echo "$as_me:14836: \$? = $ac_status" >&5
    11421 +  echo "$as_me:15183: \$? = $ac_status" >&5
     11682+  echo "$as_me:15214: \$? = $ac_status" >&5
    1142211683   (exit $ac_status); };
    1142311684 then
    1142411685   eval cf_cv_prog_CXX_c_o=yes
    11425 @@ -14844,10 +15191,10 @@
     11686@@ -14844,10 +15222,10 @@
    1142611687 
    1142711688 fi
    1142811689 if test $cf_cv_prog_CXX_c_o = yes; then
    1142911690-  echo "$as_me:14847: result: yes" >&5
    11430 +  echo "$as_me:15194: result: yes" >&5
     11691+  echo "$as_me:15225: result: yes" >&5
    1143111692 echo "${ECHO_T}yes" >&6
    1143211693 else
    1143311694-  echo "$as_me:14850: result: no" >&5
    11434 +  echo "$as_me:15197: result: no" >&5
     11695+  echo "$as_me:15228: result: no" >&5
    1143511696 echo "${ECHO_T}no" >&6
    1143611697 fi
    1143711698 
    11438 @@ -14867,12 +15214,12 @@
     11699@@ -14867,12 +15245,12 @@
    1143911700        ;;
    1144011701 esac
    1144111702 if test "$GXX" = yes; then
    1144211703-       echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
    11443 +       echo "$as_me:15217: checking for lib$cf_gpp_libname" >&5
     11704+       echo "$as_me:15248: checking for lib$cf_gpp_libname" >&5
    1144411705 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
    1144511706        cf_save="$LIBS"
    … …  
    1144711708        cat >conftest.$ac_ext <<_ACEOF
    1144811709-#line 14875 "configure"
    11449 +#line 15222 "configure"
     11710+#line 15253 "configure"
    1145011711 #include "confdefs.h"
    1145111712 
    1145211713 #include <$cf_gpp_libname/builtin.h>
    11453 @@ -14886,16 +15233,16 @@
     11714@@ -14886,16 +15264,16 @@
    1145411715 }
    1145511716 _ACEOF
    1145611717 rm -f conftest.$ac_objext conftest$ac_exeext
    1145711718-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
    11458 +if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
     11719+if { (eval echo "$as_me:15267: \"$ac_link\"") >&5
    1145911720   (eval $ac_link) 2>&5
    1146011721   ac_status=$?
    1146111722-  echo "$as_me:14892: \$? = $ac_status" >&5
    11462 +  echo "$as_me:15239: \$? = $ac_status" >&5
     11723+  echo "$as_me:15270: \$? = $ac_status" >&5
    1146311724   (exit $ac_status); } &&
    1146411725          { ac_try='test -s conftest$ac_exeext'
    1146511726-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
    11466 +  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
     11727+  { (eval echo "$as_me:15273: \"$ac_try\"") >&5
    1146711728   (eval $ac_try) 2>&5
    1146811729   ac_status=$?
    1146911730-  echo "$as_me:14898: \$? = $ac_status" >&5
    11470 +  echo "$as_me:15245: \$? = $ac_status" >&5
     11731+  echo "$as_me:15276: \$? = $ac_status" >&5
    1147111732   (exit $ac_status); }; }; then
    1147211733   cf_cxx_library=yes
    1147311734         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11474 @@ -14914,7 +15261,7 @@
     11735@@ -14914,7 +15292,7 @@
    1147511736   echo "$as_me: failed program was:" >&5
    1147611737 cat conftest.$ac_ext >&5
    1147711738 cat >conftest.$ac_ext <<_ACEOF
    1147811739-#line 14917 "configure"
    11479 +#line 15264 "configure"
     11740+#line 15295 "configure"
    1148011741 #include "confdefs.h"
    1148111742 
    1148211743 #include <builtin.h>
    11483 @@ -14928,16 +15275,16 @@
     11744@@ -14928,16 +15306,16 @@
    1148411745 }
    1148511746 _ACEOF
    1148611747 rm -f conftest.$ac_objext conftest$ac_exeext
    1148711748-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    11488 +if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
     11749+if { (eval echo "$as_me:15309: \"$ac_link\"") >&5
    1148911750   (eval $ac_link) 2>&5
    1149011751   ac_status=$?
    1149111752-  echo "$as_me:14934: \$? = $ac_status" >&5
    11492 +  echo "$as_me:15281: \$? = $ac_status" >&5
     11753+  echo "$as_me:15312: \$? = $ac_status" >&5
    1149311754   (exit $ac_status); } &&
    1149411755          { ac_try='test -s conftest$ac_exeext'
    1149511756-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    11496 +  { (eval echo "$as_me:15284: \"$ac_try\"") >&5
     11757+  { (eval echo "$as_me:15315: \"$ac_try\"") >&5
    1149711758   (eval $ac_try) 2>&5
    1149811759   ac_status=$?
    1149911760-  echo "$as_me:14940: \$? = $ac_status" >&5
    11500 +  echo "$as_me:15287: \$? = $ac_status" >&5
     11761+  echo "$as_me:15318: \$? = $ac_status" >&5
    1150111762   (exit $ac_status); }; }; then
    1150211763   cf_cxx_library=yes
    1150311764         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11504 @@ -14954,7 +15301,7 @@
     11765@@ -14954,7 +15332,7 @@
    1150511766 fi
    1150611767 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1150711768        LIBS="$cf_save"
    1150811769-       echo "$as_me:14957: result: $cf_cxx_library" >&5
    11509 +       echo "$as_me:15304: result: $cf_cxx_library" >&5
     11770+       echo "$as_me:15335: result: $cf_cxx_library" >&5
    1151011771 echo "${ECHO_T}$cf_cxx_library" >&6
    1151111772 fi
    1151211773 
    11513 @@ -14970,7 +15317,7 @@
     11774@@ -14970,7 +15348,7 @@
    1151411775 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    1151511776 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1151611777 ac_main_return=return
    1151711778-echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
    11518 +echo "$as_me:15320: checking how to run the C++ preprocessor" >&5
     11779+echo "$as_me:15351: checking how to run the C++ preprocessor" >&5
    1151911780 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
    1152011781 if test -z "$CXXCPP"; then
    1152111782   if test "${ac_cv_prog_CXXCPP+set}" = set; then
    11522 @@ -14987,18 +15334,18 @@
     11783@@ -14987,18 +15365,18 @@
    1152311784   # On the NeXT, cc -E runs the code through the compiler's parser,
    1152411785   # not just through cpp. "Syntax error" is here to catch this case.
    1152511786   cat >conftest.$ac_ext <<_ACEOF
    1152611787-#line 14990 "configure"
    11527 +#line 15337 "configure"
     11788+#line 15368 "configure"
    1152811789 #include "confdefs.h"
    1152911790 #include <assert.h>
    … …  
    1153111792 _ACEOF
    1153211793-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
    11533 +if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
     11794+if { (eval echo "$as_me:15373: \"$ac_cpp conftest.$ac_ext\"") >&5
    1153411795   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1153511796   ac_status=$?
    … …  
    1153811799   cat conftest.err >&5
    1153911800-  echo "$as_me:15001: \$? = $ac_status" >&5
    11540 +  echo "$as_me:15348: \$? = $ac_status" >&5
     11801+  echo "$as_me:15379: \$? = $ac_status" >&5
    1154111802   (exit $ac_status); } >/dev/null; then
    1154211803   if test -s conftest.err; then
    1154311804     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11544 @@ -15021,17 +15368,17 @@
     11805@@ -15021,17 +15399,17 @@
    1154511806   # OK, works on sane cases.  Now check whether non-existent headers
    1154611807   # can be detected and how.
    1154711808   cat >conftest.$ac_ext <<_ACEOF
    1154811809-#line 15024 "configure"
    11549 +#line 15371 "configure"
     11810+#line 15402 "configure"
    1155011811 #include "confdefs.h"
    1155111812 #include <ac_nonexistent.h>
    1155211813 _ACEOF
    1155311814-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
    11554 +if { (eval echo "$as_me:15375: \"$ac_cpp conftest.$ac_ext\"") >&5
     11815+if { (eval echo "$as_me:15406: \"$ac_cpp conftest.$ac_ext\"") >&5
    1155511816   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1155611817   ac_status=$?
    … …  
    1155911820   cat conftest.err >&5
    1156011821-  echo "$as_me:15034: \$? = $ac_status" >&5
    11561 +  echo "$as_me:15381: \$? = $ac_status" >&5
     11822+  echo "$as_me:15412: \$? = $ac_status" >&5
    1156211823   (exit $ac_status); } >/dev/null; then
    1156311824   if test -s conftest.err; then
    1156411825     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11565 @@ -15068,7 +15415,7 @@
     11826@@ -15068,7 +15446,7 @@
    1156611827 else
    1156711828   ac_cv_prog_CXXCPP=$CXXCPP
    1156811829 fi
    1156911830-echo "$as_me:15071: result: $CXXCPP" >&5
    11570 +echo "$as_me:15418: result: $CXXCPP" >&5
     11831+echo "$as_me:15449: result: $CXXCPP" >&5
    1157111832 echo "${ECHO_T}$CXXCPP" >&6
    1157211833 ac_preproc_ok=false
    1157311834 for ac_cxx_preproc_warn_flag in '' yes
    11574 @@ -15078,18 +15425,18 @@
     11835@@ -15078,18 +15456,18 @@
    1157511836   # On the NeXT, cc -E runs the code through the compiler's parser,
    1157611837   # not just through cpp. "Syntax error" is here to catch this case.
    1157711838   cat >conftest.$ac_ext <<_ACEOF
    1157811839-#line 15081 "configure"
    11579 +#line 15428 "configure"
     11840+#line 15459 "configure"
    1158011841 #include "confdefs.h"
    1158111842 #include <assert.h>
    … …  
    1158311844 _ACEOF
    1158411845-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
    11585 +if { (eval echo "$as_me:15433: \"$ac_cpp conftest.$ac_ext\"") >&5
     11846+if { (eval echo "$as_me:15464: \"$ac_cpp conftest.$ac_ext\"") >&5
    1158611847   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1158711848   ac_status=$?
    … …  
    1159011851   cat conftest.err >&5
    1159111852-  echo "$as_me:15092: \$? = $ac_status" >&5
    11592 +  echo "$as_me:15439: \$? = $ac_status" >&5
     11853+  echo "$as_me:15470: \$? = $ac_status" >&5
    1159311854   (exit $ac_status); } >/dev/null; then
    1159411855   if test -s conftest.err; then
    1159511856     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11596 @@ -15112,17 +15459,17 @@
     11857@@ -15112,17 +15490,17 @@
    1159711858   # OK, works on sane cases.  Now check whether non-existent headers
    1159811859   # can be detected and how.
    1159911860   cat >conftest.$ac_ext <<_ACEOF
    1160011861-#line 15115 "configure"
    11601 +#line 15462 "configure"
     11862+#line 15493 "configure"
    1160211863 #include "confdefs.h"
    1160311864 #include <ac_nonexistent.h>
    1160411865 _ACEOF
    1160511866-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
    11606 +if { (eval echo "$as_me:15466: \"$ac_cpp conftest.$ac_ext\"") >&5
     11867+if { (eval echo "$as_me:15497: \"$ac_cpp conftest.$ac_ext\"") >&5
    1160711868   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1160811869   ac_status=$?
    … …  
    1161111872   cat conftest.err >&5
    1161211873-  echo "$as_me:15125: \$? = $ac_status" >&5
    11613 +  echo "$as_me:15472: \$? = $ac_status" >&5
     11874+  echo "$as_me:15503: \$? = $ac_status" >&5
    1161411875   (exit $ac_status); } >/dev/null; then
    1161511876   if test -s conftest.err; then
    1161611877     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11617 @@ -15150,7 +15497,7 @@
     11878@@ -15150,7 +15528,7 @@
    1161811879 if $ac_preproc_ok; then
    1161911880   :
    1162011881 else
    1162111882-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    11622 +  { { echo "$as_me:15500: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
     11883+  { { echo "$as_me:15531: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    1162311884 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    1162411885    { (exit 1); exit 1; }; }
    1162511886 fi
    11626 @@ -15165,23 +15512,23 @@
     11887@@ -15165,23 +15543,23 @@
    1162711888 for ac_header in iostream typeinfo
    1162811889 do
    1162911890 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1163011891-echo "$as_me:15168: checking for $ac_header" >&5
    11631 +echo "$as_me:15515: checking for $ac_header" >&5
     11892+echo "$as_me:15546: checking for $ac_header" >&5
    1163211893 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1163311894 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    … …  
    1163611897   cat >conftest.$ac_ext <<_ACEOF
    1163711898-#line 15174 "configure"
    11638 +#line 15521 "configure"
     11899+#line 15552 "configure"
    1163911900 #include "confdefs.h"
    1164011901 #include <$ac_header>
    1164111902 _ACEOF
    1164211903-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
    11643 +if { (eval echo "$as_me:15525: \"$ac_cpp conftest.$ac_ext\"") >&5
     11904+if { (eval echo "$as_me:15556: \"$ac_cpp conftest.$ac_ext\"") >&5
    1164411905   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1164511906   ac_status=$?
    … …  
    1164811909   cat conftest.err >&5
    1164911910-  echo "$as_me:15184: \$? = $ac_status" >&5
    11650 +  echo "$as_me:15531: \$? = $ac_status" >&5
     11911+  echo "$as_me:15562: \$? = $ac_status" >&5
    1165111912   (exit $ac_status); } >/dev/null; then
    1165211913   if test -s conftest.err; then
    1165311914     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11654 @@ -15200,7 +15547,7 @@
     11915@@ -15200,7 +15578,7 @@
    1165511916 fi
    1165611917 rm -f conftest.err conftest.$ac_ext
    1165711918 fi
    1165811919-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
    11659 +echo "$as_me:15550: result: `eval echo '${'$as_ac_Header'}'`" >&5
     11920+echo "$as_me:15581: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1166011921 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1166111922 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1166211923   cat >>confdefs.h <<EOF
    11663 @@ -15211,10 +15558,10 @@
     11924@@ -15211,10 +15589,10 @@
    1166411925 done
    1166511926 
    1166611927     if test x"$ac_cv_header_iostream" = xyes ; then
    1166711928-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
    11668 +        echo "$as_me:15561: checking if iostream uses std-namespace" >&5
     11929+        echo "$as_me:15592: checking if iostream uses std-namespace" >&5
    1166911930 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
    1167011931         cat >conftest.$ac_ext <<_ACEOF
    1167111932-#line 15217 "configure"
    11672 +#line 15564 "configure"
     11933+#line 15595 "configure"
    1167311934 #include "confdefs.h"
    1167411935 
    1167511936 #include <iostream>
    11676 @@ -15231,16 +15578,16 @@
     11937@@ -15231,16 +15609,16 @@
    1167711938 }
    1167811939 _ACEOF
    1167911940 rm -f conftest.$ac_objext
    1168011941-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
    11681 +if { (eval echo "$as_me:15581: \"$ac_compile\"") >&5
     11942+if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5
    1168211943   (eval $ac_compile) 2>&5
    1168311944   ac_status=$?
    1168411945-  echo "$as_me:15237: \$? = $ac_status" >&5
    11685 +  echo "$as_me:15584: \$? = $ac_status" >&5
     11946+  echo "$as_me:15615: \$? = $ac_status" >&5
    1168611947   (exit $ac_status); } &&
    1168711948          { ac_try='test -s conftest.$ac_objext'
    1168811949-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
    11689 +  { (eval echo "$as_me:15587: \"$ac_try\"") >&5
     11950+  { (eval echo "$as_me:15618: \"$ac_try\"") >&5
    1169011951   (eval $ac_try) 2>&5
    1169111952   ac_status=$?
    1169211953-  echo "$as_me:15243: \$? = $ac_status" >&5
    11693 +  echo "$as_me:15590: \$? = $ac_status" >&5
     11954+  echo "$as_me:15621: \$? = $ac_status" >&5
    1169411955   (exit $ac_status); }; }; then
    1169511956   cf_iostream_namespace=yes
    1169611957 else
    11697 @@ -15249,7 +15596,7 @@
     11958@@ -15249,7 +15627,7 @@
    1169811959 cf_iostream_namespace=no
    1169911960 fi
    1170011961 rm -f conftest.$ac_objext conftest.$ac_ext
    1170111962-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
    11702 +        echo "$as_me:15599: result: $cf_iostream_namespace" >&5
     11963+        echo "$as_me:15630: result: $cf_iostream_namespace" >&5
    1170311964 echo "${ECHO_T}$cf_iostream_namespace" >&6
    1170411965         if test "$cf_iostream_namespace" = yes ; then
    1170511966             cat >>confdefs.h <<\EOF
    11706 @@ -15259,7 +15606,7 @@
     11967@@ -15259,7 +15637,7 @@
    1170711968         fi
    1170811969     fi
    1170911970 
    1171011971-echo "$as_me:15262: checking if we should include stdbool.h" >&5
    11711 +echo "$as_me:15609: checking if we should include stdbool.h" >&5
     11972+echo "$as_me:15640: checking if we should include stdbool.h" >&5
    1171211973 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1171311974 
    1171411975 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11715 @@ -15267,7 +15614,7 @@
     11976@@ -15267,7 +15645,7 @@
    1171611977 else
    1171711978 
    1171811979        cat >conftest.$ac_ext <<_ACEOF
    1171911980-#line 15270 "configure"
    11720 +#line 15617 "configure"
     11981+#line 15648 "configure"
    1172111982 #include "confdefs.h"
    1172211983 
    1172311984 int
    11724 @@ -15279,23 +15626,23 @@
     11985@@ -15279,23 +15657,23 @@
    1172511986 }
    1172611987 _ACEOF
    1172711988 rm -f conftest.$ac_objext
    1172811989-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
    11729 +if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
     11990+if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5
    1173011991   (eval $ac_compile) 2>&5
    1173111992   ac_status=$?
    1173211993-  echo "$as_me:15285: \$? = $ac_status" >&5
    11733 +  echo "$as_me:15632: \$? = $ac_status" >&5
     11994+  echo "$as_me:15663: \$? = $ac_status" >&5
    1173411995   (exit $ac_status); } &&
    1173511996          { ac_try='test -s conftest.$ac_objext'
    1173611997-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
    11737 +  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
     11998+  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
    1173811999   (eval $ac_try) 2>&5
    1173912000   ac_status=$?
    1174012001-  echo "$as_me:15291: \$? = $ac_status" >&5
    11741 +  echo "$as_me:15638: \$? = $ac_status" >&5
     12002+  echo "$as_me:15669: \$? = $ac_status" >&5
    1174212003   (exit $ac_status); }; }; then
    1174312004   cf_cv_header_stdbool_h=0
    … …  
    1174712008 cat >conftest.$ac_ext <<_ACEOF
    1174812009-#line 15298 "configure"
    11749 +#line 15645 "configure"
     12010+#line 15676 "configure"
    1175012011 #include "confdefs.h"
    1175112012 
    1175212013 #ifndef __BEOS__
    11753 @@ -15311,16 +15658,16 @@
     12014@@ -15311,16 +15689,16 @@
    1175412015 }
    1175512016 _ACEOF
    1175612017 rm -f conftest.$ac_objext
    1175712018-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
    11758 +if { (eval echo "$as_me:15661: \"$ac_compile\"") >&5
     12019+if { (eval echo "$as_me:15692: \"$ac_compile\"") >&5
    1175912020   (eval $ac_compile) 2>&5
    1176012021   ac_status=$?
    1176112022-  echo "$as_me:15317: \$? = $ac_status" >&5
    11762 +  echo "$as_me:15664: \$? = $ac_status" >&5
     12023+  echo "$as_me:15695: \$? = $ac_status" >&5
    1176312024   (exit $ac_status); } &&
    1176412025          { ac_try='test -s conftest.$ac_objext'
    1176512026-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
    11766 +  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
     12027+  { (eval echo "$as_me:15698: \"$ac_try\"") >&5
    1176712028   (eval $ac_try) 2>&5
    1176812029   ac_status=$?
    1176912030-  echo "$as_me:15323: \$? = $ac_status" >&5
    11770 +  echo "$as_me:15670: \$? = $ac_status" >&5
     12031+  echo "$as_me:15701: \$? = $ac_status" >&5
    1177112032   (exit $ac_status); }; }; then
    1177212033   cf_cv_header_stdbool_h=1
    1177312034 else
    11774 @@ -15334,13 +15681,13 @@
     12035@@ -15334,13 +15712,13 @@
    1177512036 fi
    1177612037 
    1177712038 if test "$cf_cv_header_stdbool_h" = 1
    1177812039-then   echo "$as_me:15337: result: yes" >&5
    11779 +then   echo "$as_me:15684: result: yes" >&5
     12040+then   echo "$as_me:15715: result: yes" >&5
    1178012041 echo "${ECHO_T}yes" >&6
    1178112042-else   echo "$as_me:15339: result: no" >&5
    11782 +else   echo "$as_me:15686: result: no" >&5
     12043+else   echo "$as_me:15717: result: no" >&5
    1178312044 echo "${ECHO_T}no" >&6
    1178412045 fi
    1178512046 
    1178612047-echo "$as_me:15343: checking for builtin bool type" >&5
    11787 +echo "$as_me:15690: checking for builtin bool type" >&5
     12048+echo "$as_me:15721: checking for builtin bool type" >&5
    1178812049 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1178912050 
    1179012051 if test "${cf_cv_builtin_bool+set}" = set; then
    11791 @@ -15348,7 +15695,7 @@
     12052@@ -15348,7 +15726,7 @@
    1179212053 else
    1179312054 
    1179412055        cat >conftest.$ac_ext <<_ACEOF
    1179512056-#line 15351 "configure"
    11796 +#line 15698 "configure"
     12057+#line 15729 "configure"
    1179712058 #include "confdefs.h"
    1179812059 
    1179912060 #include <stdio.h>
    11800 @@ -15363,16 +15710,16 @@
     12061@@ -15363,16 +15741,16 @@
    1180112062 }
    1180212063 _ACEOF
    1180312064 rm -f conftest.$ac_objext
    1180412065-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
    11805 +if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
     12066+if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
    1180612067   (eval $ac_compile) 2>&5
    1180712068   ac_status=$?
    1180812069-  echo "$as_me:15369: \$? = $ac_status" >&5
    11809 +  echo "$as_me:15716: \$? = $ac_status" >&5
     12070+  echo "$as_me:15747: \$? = $ac_status" >&5
    1181012071   (exit $ac_status); } &&
    1181112072          { ac_try='test -s conftest.$ac_objext'
    1181212073-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
    11813 +  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
     12074+  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
    1181412075   (eval $ac_try) 2>&5
    1181512076   ac_status=$?
    1181612077-  echo "$as_me:15375: \$? = $ac_status" >&5
    11817 +  echo "$as_me:15722: \$? = $ac_status" >&5
     12078+  echo "$as_me:15753: \$? = $ac_status" >&5
    1181812079   (exit $ac_status); }; }; then
    1181912080   cf_cv_builtin_bool=1
    1182012081 else
    11821 @@ -15385,13 +15732,13 @@
     12082@@ -15385,13 +15763,13 @@
    1182212083 fi
    1182312084 
    1182412085 if test "$cf_cv_builtin_bool" = 1
    1182512086-then   echo "$as_me:15388: result: yes" >&5
    11826 +then   echo "$as_me:15735: result: yes" >&5
     12087+then   echo "$as_me:15766: result: yes" >&5
    1182712088 echo "${ECHO_T}yes" >&6
    1182812089-else   echo "$as_me:15390: result: no" >&5
    11829 +else   echo "$as_me:15737: result: no" >&5
     12090+else   echo "$as_me:15768: result: no" >&5
    1183012091 echo "${ECHO_T}no" >&6
    1183112092 fi
    1183212093 
    1183312094-echo "$as_me:15394: checking for size of bool" >&5
    11834 +echo "$as_me:15741: checking for size of bool" >&5
     12095+echo "$as_me:15772: checking for size of bool" >&5
    1183512096 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1183612097 if test "${cf_cv_type_of_bool+set}" = set; then
    1183712098   echo $ECHO_N "(cached) $ECHO_C" >&6
    11838 @@ -15402,7 +15749,7 @@
     12099@@ -15402,7 +15780,7 @@
    1183912100   cf_cv_type_of_bool=unknown
    1184012101 else
    1184112102   cat >conftest.$ac_ext <<_ACEOF
    1184212103-#line 15405 "configure"
    11843 +#line 15752 "configure"
     12104+#line 15783 "configure"
    1184412105 #include "confdefs.h"
    1184512106 
    1184612107 #include <stdlib.h>
    11847 @@ -15444,15 +15791,15 @@
     12108@@ -15444,15 +15822,15 @@
    1184812109 
    1184912110 _ACEOF
    1185012111 rm -f conftest$ac_exeext
    1185112112-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
    11852 +if { (eval echo "$as_me:15794: \"$ac_link\"") >&5
     12113+if { (eval echo "$as_me:15825: \"$ac_link\"") >&5
    1185312114   (eval $ac_link) 2>&5
    1185412115   ac_status=$?
    1185512116-  echo "$as_me:15450: \$? = $ac_status" >&5
    11856 +  echo "$as_me:15797: \$? = $ac_status" >&5
     12117+  echo "$as_me:15828: \$? = $ac_status" >&5
    1185712118   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1185812119-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
    11859 +  { (eval echo "$as_me:15799: \"$ac_try\"") >&5
     12120+  { (eval echo "$as_me:15830: \"$ac_try\"") >&5
    1186012121   (eval $ac_try) 2>&5
    1186112122   ac_status=$?
    1186212123-  echo "$as_me:15455: \$? = $ac_status" >&5
    11863 +  echo "$as_me:15802: \$? = $ac_status" >&5
     12124+  echo "$as_me:15833: \$? = $ac_status" >&5
    1186412125   (exit $ac_status); }; }; then
    1186512126   cf_cv_type_of_bool=`cat cf_test.out`
    1186612127                 if test -z "$cf_cv_type_of_bool"; then
    11867 @@ -15470,18 +15817,18 @@
     12128@@ -15470,18 +15848,18 @@
    1186812129 fi
    1186912130 
    1187012131        rm -f cf_test.out
    1187112132-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
    11872 +echo "$as_me:15820: result: $cf_cv_type_of_bool" >&5
     12133+echo "$as_me:15851: result: $cf_cv_type_of_bool" >&5
    1187312134 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1187412135 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1187712138        esac
    1187812139-       { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    11879 +       { echo "$as_me:15826: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     12140+       { echo "$as_me:15857: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1188012141 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1188112142        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1188312144 
    1188412145-echo "$as_me:15484: checking for special defines needed for etip.h" >&5
    11885 +echo "$as_me:15831: checking for special defines needed for etip.h" >&5
     12146+echo "$as_me:15862: checking for special defines needed for etip.h" >&5
    1188612147 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
    1188712148 cf_save_CXXFLAGS="$CXXFLAGS"
    1188812149 cf_result="none"
    11889 @@ -15493,7 +15840,7 @@
     12150@@ -15493,7 +15871,7 @@
    1189012151        test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
    1189112152        test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
    1189212153 cat >conftest.$ac_ext <<_ACEOF
    1189312154-#line 15496 "configure"
    11894 +#line 15843 "configure"
     12155+#line 15874 "configure"
    1189512156 #include "confdefs.h"
    1189612157 
    1189712158 #include <etip.h.in>
    11898 @@ -15507,16 +15854,16 @@
     12159@@ -15507,16 +15885,16 @@
    1189912160 }
    1190012161 _ACEOF
    1190112162 rm -f conftest.$ac_objext
    1190212163-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
    11903 +if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
     12164+if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5
    1190412165   (eval $ac_compile) 2>&5
    1190512166   ac_status=$?
    1190612167-  echo "$as_me:15513: \$? = $ac_status" >&5
    11907 +  echo "$as_me:15860: \$? = $ac_status" >&5
     12168+  echo "$as_me:15891: \$? = $ac_status" >&5
    1190812169   (exit $ac_status); } &&
    1190912170          { ac_try='test -s conftest.$ac_objext'
    1191012171-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
    11911 +  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
     12172+  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
    1191212173   (eval $ac_try) 2>&5
    1191312174   ac_status=$?
    1191412175-  echo "$as_me:15519: \$? = $ac_status" >&5
    11915 +  echo "$as_me:15866: \$? = $ac_status" >&5
     12176+  echo "$as_me:15897: \$? = $ac_status" >&5
    1191612177   (exit $ac_status); }; }; then
    1191712178 
    1191812179        test -n "$cf_math" && cat >>confdefs.h <<EOF
    11919 @@ -15537,12 +15884,12 @@
     12180@@ -15537,12 +15915,12 @@
    1192012181 rm -f conftest.$ac_objext conftest.$ac_ext
    1192112182 done
    1192212183 done
    1192312184-echo "$as_me:15540: result: $cf_result" >&5
    11924 +echo "$as_me:15887: result: $cf_result" >&5
     12185+echo "$as_me:15918: result: $cf_result" >&5
    1192512186 echo "${ECHO_T}$cf_result" >&6
    1192612187 CXXFLAGS="$cf_save_CXXFLAGS"
    … …  
    1192812189 if test -n "$CXX"; then
    1192912190-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
    11930 +echo "$as_me:15892: checking if $CXX accepts parameter initialization" >&5
     12191+echo "$as_me:15923: checking if $CXX accepts parameter initialization" >&5
    1193112192 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
    1193212193 if test "${cf_cv_cpp_param_init+set}" = set; then
    1193312194   echo $ECHO_N "(cached) $ECHO_C" >&6
    11934 @@ -15559,7 +15906,7 @@
     12195@@ -15559,7 +15937,7 @@
    1193512196   cf_cv_cpp_param_init=unknown
    1193612197 else
    1193712198   cat >conftest.$ac_ext <<_ACEOF
    1193812199-#line 15562 "configure"
    11939 +#line 15909 "configure"
     12200+#line 15940 "configure"
    1194012201 #include "confdefs.h"
    1194112202 
    1194212203 class TEST {
    11943 @@ -15578,15 +15925,15 @@
     12204@@ -15578,15 +15956,15 @@
    1194412205 
    1194512206 _ACEOF
    1194612207 rm -f conftest$ac_exeext
    1194712208-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
    11948 +if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
     12209+if { (eval echo "$as_me:15959: \"$ac_link\"") >&5
    1194912210   (eval $ac_link) 2>&5
    1195012211   ac_status=$?
    1195112212-  echo "$as_me:15584: \$? = $ac_status" >&5
    11952 +  echo "$as_me:15931: \$? = $ac_status" >&5
     12213+  echo "$as_me:15962: \$? = $ac_status" >&5
    1195312214   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1195412215-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
    11955 +  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
     12216+  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
    1195612217   (eval $ac_try) 2>&5
    1195712218   ac_status=$?
    1195812219-  echo "$as_me:15589: \$? = $ac_status" >&5
    11959 +  echo "$as_me:15936: \$? = $ac_status" >&5
     12220+  echo "$as_me:15967: \$? = $ac_status" >&5
    1196012221   (exit $ac_status); }; }; then
    1196112222   cf_cv_cpp_param_init=yes
    1196212223 else
    11963 @@ -15605,7 +15952,7 @@
     12224@@ -15605,7 +15983,7 @@
    1196412225 ac_main_return=return
    1196512226 
    1196612227 fi
    1196712228-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
    11968 +echo "$as_me:15955: result: $cf_cv_cpp_param_init" >&5
     12229+echo "$as_me:15986: result: $cf_cv_cpp_param_init" >&5
    1196912230 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
    1197012231 fi
    1197112232 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
    11972 @@ -15614,7 +15961,7 @@
     12233@@ -15614,7 +15992,7 @@
    1197312234 
    1197412235 if test -n "$CXX"; then
    1197512236 
    1197612237-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
    11977 +echo "$as_me:15964: checking if $CXX accepts static_cast" >&5
     12238+echo "$as_me:15995: checking if $CXX accepts static_cast" >&5
    1197812239 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
    1197912240 if test "${cf_cv_cpp_static_cast+set}" = set; then
    1198012241   echo $ECHO_N "(cached) $ECHO_C" >&6
    11981 @@ -15628,7 +15975,7 @@
     12242@@ -15628,7 +16006,7 @@
    1198212243 ac_main_return=return
    1198312244 
    1198412245        cat >conftest.$ac_ext <<_ACEOF
    1198512246-#line 15631 "configure"
    11986 +#line 15978 "configure"
     12247+#line 16009 "configure"
    1198712248 #include "confdefs.h"
    1198812249 
    1198912250 class NCursesPanel
    11990 @@ -15672,16 +16019,16 @@
     12251@@ -15672,16 +16050,16 @@
    1199112252 }
    1199212253 _ACEOF
    1199312254 rm -f conftest.$ac_objext
    1199412255-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
    11995 +if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
     12256+if { (eval echo "$as_me:16053: \"$ac_compile\"") >&5
    1199612257   (eval $ac_compile) 2>&5
    1199712258   ac_status=$?
    1199812259-  echo "$as_me:15678: \$? = $ac_status" >&5
    11999 +  echo "$as_me:16025: \$? = $ac_status" >&5
     12260+  echo "$as_me:16056: \$? = $ac_status" >&5
    1200012261   (exit $ac_status); } &&
    1200112262          { ac_try='test -s conftest.$ac_objext'
    1200212263-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
    12003 +  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
     12264+  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
    1200412265   (eval $ac_try) 2>&5
    1200512266   ac_status=$?
    1200612267-  echo "$as_me:15684: \$? = $ac_status" >&5
    12007 +  echo "$as_me:16031: \$? = $ac_status" >&5
     12268+  echo "$as_me:16062: \$? = $ac_status" >&5
    1200812269   (exit $ac_status); }; }; then
    1200912270   cf_cv_cpp_static_cast=yes
    1201012271 else
    12011 @@ -15699,7 +16046,7 @@
     12272@@ -15699,7 +16077,7 @@
    1201212273 ac_main_return=return
    1201312274 
    1201412275 fi
    1201512276-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
    12016 +echo "$as_me:16049: result: $cf_cv_cpp_static_cast" >&5
     12277+echo "$as_me:16080: result: $cf_cv_cpp_static_cast" >&5
    1201712278 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
    1201812279 
    1201912280 fi
    12020 @@ -15709,12 +16056,12 @@
     12281@@ -15709,12 +16087,12 @@
    1202112282 EOF
    1202212283 
    … …  
    1203312294            ;;
    1203412295        sco3.2v5*) #(vi
    12035 @@ -15723,7 +16070,7 @@
     12296@@ -15723,7 +16101,7 @@
    1203612297        solaris2*)
    1203712298            if test "$GXX" != yes ; then
    … …  
    1204212303            ;;
    1204312304        esac
    12044 @@ -15747,7 +16094,7 @@
     12305@@ -15747,7 +16125,7 @@
    1204512306        else
    1204612307                if test "$cf_cv_header_stdbool_h" = 1 ; then
    1204712308 
    1204812309-echo "$as_me:15750: checking for size of bool" >&5
    12049 +echo "$as_me:16097: checking for size of bool" >&5
     12310+echo "$as_me:16128: checking for size of bool" >&5
    1205012311 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1205112312 if test "${cf_cv_type_of_bool+set}" = set; then
    1205212313   echo $ECHO_N "(cached) $ECHO_C" >&6
    12053 @@ -15758,7 +16105,7 @@
     12314@@ -15758,7 +16136,7 @@
    1205412315   cf_cv_type_of_bool=unknown
    1205512316 else
    1205612317   cat >conftest.$ac_ext <<_ACEOF
    1205712318-#line 15761 "configure"
    12058 +#line 16108 "configure"
     12319+#line 16139 "configure"
    1205912320 #include "confdefs.h"
    1206012321 
    1206112322 #include <stdlib.h>
    12062 @@ -15800,15 +16147,15 @@
     12323@@ -15800,15 +16178,15 @@
    1206312324 
    1206412325 _ACEOF
    1206512326 rm -f conftest$ac_exeext
    1206612327-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
    12067 +if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
     12328+if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
    1206812329   (eval $ac_link) 2>&5
    1206912330   ac_status=$?
    1207012331-  echo "$as_me:15806: \$? = $ac_status" >&5
    12071 +  echo "$as_me:16153: \$? = $ac_status" >&5
     12332+  echo "$as_me:16184: \$? = $ac_status" >&5
    1207212333   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1207312334-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
    12074 +  { (eval echo "$as_me:16155: \"$ac_try\"") >&5
     12335+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
    1207512336   (eval $ac_try) 2>&5
    1207612337   ac_status=$?
    1207712338-  echo "$as_me:15811: \$? = $ac_status" >&5
    12078 +  echo "$as_me:16158: \$? = $ac_status" >&5
     12339+  echo "$as_me:16189: \$? = $ac_status" >&5
    1207912340   (exit $ac_status); }; }; then
    1208012341   cf_cv_type_of_bool=`cat cf_test.out`
    1208112342                 if test -z "$cf_cv_type_of_bool"; then
    12082 @@ -15826,25 +16173,25 @@
     12343@@ -15826,25 +16204,25 @@
    1208312344 fi
    1208412345 
    1208512346        rm -f cf_test.out
    1208612347-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
    12087 +echo "$as_me:16176: result: $cf_cv_type_of_bool" >&5
     12348+echo "$as_me:16207: result: $cf_cv_type_of_bool" >&5
    1208812349 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1208912350 if test "$cf_cv_type_of_bool" = unknown ; then
    … …  
    1209212353        esac
    1209312354-       { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    12094 +       { echo "$as_me:16182: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
     12355+       { echo "$as_me:16213: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    1209512356 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1209612357        cf_cv_type_of_bool=$NCURSES_BOOL
    … …  
    1209912360                else
    1210012361-                       echo "$as_me:15841: checking for fallback type of bool" >&5
    12101 +                       echo "$as_me:16188: checking for fallback type of bool" >&5
     12362+                       echo "$as_me:16219: checking for fallback type of bool" >&5
    1210212363 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
    1210312364                        case "$host_cpu" in #(vi
    … …  
    1210612367                        esac
    1210712368-                       echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
    12108 +                       echo "$as_me:16194: result: $cf_cv_type_of_bool" >&5
     12369+                       echo "$as_me:16225: result: $cf_cv_type_of_bool" >&5
    1210912370 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1211012371                fi
    1211112372        fi
    12112 @@ -15873,7 +16220,7 @@
     12373@@ -15873,7 +16251,7 @@
    1211312374 
    1211412375 if test "$cf_with_ada" != "no" ; then
    1211512376     if test "$with_libtool" != "no"; then
    1211612377-       { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
    12117 +       { echo "$as_me:16223: WARNING: libtool does not support Ada - disabling feature" >&5
     12378+       { echo "$as_me:16254: WARNING: libtool does not support Ada - disabling feature" >&5
    1211812379 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
    1211912380        cf_with_ada=no
    1212012381     fi
    12121 @@ -15883,7 +16230,7 @@
     12382@@ -15883,7 +16261,7 @@
    1212212383 cf_ada_make=gnatmake
    1212312384 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
    1212412385 set dummy $cf_ada_make; ac_word=$2
    1212512386-echo "$as_me:15886: checking for $ac_word" >&5
    12126 +echo "$as_me:16233: checking for $ac_word" >&5
     12387+echo "$as_me:16264: checking for $ac_word" >&5
    1212712388 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1212812389 if test "${ac_cv_prog_gnat_exists+set}" = set; then
    1212912390   echo $ECHO_N "(cached) $ECHO_C" >&6
    12130 @@ -15898,7 +16245,7 @@
     12391@@ -15898,7 +16276,7 @@
    1213112392   test -z "$ac_dir" && ac_dir=.
    1213212393   $as_executable_p "$ac_dir/$ac_word" || continue
    1213312394 ac_cv_prog_gnat_exists="yes"
    1213412395-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
    12135 +echo "$as_me:16248: found $ac_dir/$ac_word" >&5
     12396+echo "$as_me:16279: found $ac_dir/$ac_word" >&5
    1213612397 break
    1213712398 done
    1213812399 
    12139 @@ -15907,10 +16254,10 @@
     12400@@ -15907,10 +16285,10 @@
    1214012401 fi
    1214112402 gnat_exists=$ac_cv_prog_gnat_exists
    1214212403 if test -n "$gnat_exists"; then
    1214312404-  echo "$as_me:15910: result: $gnat_exists" >&5
    12144 +  echo "$as_me:16257: result: $gnat_exists" >&5
     12405+  echo "$as_me:16288: result: $gnat_exists" >&5
    1214512406 echo "${ECHO_T}$gnat_exists" >&6
    1214612407 else
    1214712408-  echo "$as_me:15913: result: no" >&5
    12148 +  echo "$as_me:16260: result: no" >&5
     12409+  echo "$as_me:16291: result: no" >&5
    1214912410 echo "${ECHO_T}no" >&6
    1215012411 fi
    1215112412 
    12152 @@ -15918,11 +16265,11 @@
     12413@@ -15918,11 +16296,11 @@
    1215312414    cf_ada_make=
    1215412415 else
    1215512416 
    1215612417-echo "$as_me:15921: checking for gnat version" >&5
    12157 +echo "$as_me:16268: checking for gnat version" >&5
     12418+echo "$as_me:16299: checking for gnat version" >&5
    1215812419 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
    1215912420 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
    1216012421   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
    1216112422-echo "$as_me:15925: result: $cf_gnat_version" >&5
    12162 +echo "$as_me:16272: result: $cf_gnat_version" >&5
     12423+echo "$as_me:16303: result: $cf_gnat_version" >&5
    1216312424 echo "${ECHO_T}$cf_gnat_version" >&6
    1216412425 
    1216512426 case $cf_gnat_version in
    12166 @@ -15945,7 +16292,7 @@
     12427@@ -15945,7 +16323,7 @@
    1216712428 
    1216812429    # Extract the first word of "m4", so it can be a program name with args.
    1216912430 set dummy m4; ac_word=$2
    1217012431-echo "$as_me:15948: checking for $ac_word" >&5
    12171 +echo "$as_me:16295: checking for $ac_word" >&5
     12432+echo "$as_me:16326: checking for $ac_word" >&5
    1217212433 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1217312434 if test "${ac_cv_prog_M4_exists+set}" = set; then
    1217412435   echo $ECHO_N "(cached) $ECHO_C" >&6
    12175 @@ -15960,7 +16307,7 @@
     12436@@ -15960,7 +16338,7 @@
    1217612437   test -z "$ac_dir" && ac_dir=.
    1217712438   $as_executable_p "$ac_dir/$ac_word" || continue
    1217812439 ac_cv_prog_M4_exists="yes"
    1217912440-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
    12180 +echo "$as_me:16310: found $ac_dir/$ac_word" >&5
     12441+echo "$as_me:16341: found $ac_dir/$ac_word" >&5
    1218112442 break
    1218212443 done
    1218312444 
    12184 @@ -15969,10 +16316,10 @@
     12445@@ -15969,10 +16347,10 @@
    1218512446 fi
    1218612447 M4_exists=$ac_cv_prog_M4_exists
    1218712448 if test -n "$M4_exists"; then
    1218812449-  echo "$as_me:15972: result: $M4_exists" >&5
    12189 +  echo "$as_me:16319: result: $M4_exists" >&5
     12450+  echo "$as_me:16350: result: $M4_exists" >&5
    1219012451 echo "${ECHO_T}$M4_exists" >&6
    1219112452 else
    1219212453-  echo "$as_me:15975: result: no" >&5
    12193 +  echo "$as_me:16322: result: no" >&5
     12454+  echo "$as_me:16353: result: no" >&5
    1219412455 echo "${ECHO_T}no" >&6
    1219512456 fi
    1219612457 
    12197 @@ -15981,7 +16328,7 @@
     12458@@ -15981,7 +16359,7 @@
    1219812459       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    1219912460    fi
    1220012461    if test "$cf_cv_prog_gnat_correct" = yes; then
    1220112462-      echo "$as_me:15984: checking if GNAT works" >&5
    12202 +      echo "$as_me:16331: checking if GNAT works" >&5
     12463+      echo "$as_me:16362: checking if GNAT works" >&5
    1220312464 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
    1220412465 
    1220512466 rm -f conftest*
    12206 @@ -16009,14 +16356,14 @@
     12467@@ -16009,14 +16387,14 @@
    1220712468 fi
    1220812469 rm -f conftest*
    1220912470 
    1221012471-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
    12211 +      echo "$as_me:16359: result: $cf_cv_prog_gnat_correct" >&5
     12472+      echo "$as_me:16390: result: $cf_cv_prog_gnat_correct" >&5
    1221212473 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    1221312474    fi
    … …  
    1221712478 
    1221812479-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
    12219 +   echo "$as_me:16366: checking if GNAT pragma Unreferenced works" >&5
     12480+   echo "$as_me:16397: checking if GNAT pragma Unreferenced works" >&5
    1222012481 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
    1222112482 
    1222212483 rm -f conftest*
    12223 @@ -16043,7 +16390,7 @@
     12484@@ -16043,7 +16421,7 @@
    1222412485 fi
    1222512486 rm -f conftest*
    1222612487 
    1222712488-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
    12228 +   echo "$as_me:16393: result: $cf_cv_pragma_unreferenced" >&5
     12489+   echo "$as_me:16424: result: $cf_cv_pragma_unreferenced" >&5
    1222912490 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
    1223012491 
    1223112492    # if the pragma is supported, use it (needed in the Trace code).
    12232 @@ -16096,7 +16443,7 @@
     12493@@ -16096,7 +16474,7 @@
    1223312494   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1223412495   ;;
    1223512496 *)
    1223612497-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
    12237 +  { { echo "$as_me:16446: error: expected a pathname, not \"$withval\"" >&5
     12498+  { { echo "$as_me:16477: error: expected a pathname, not \"$withval\"" >&5
    1223812499 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1223912500    { (exit 1); exit 1; }; }
    1224012501   ;;
    12241 @@ -16138,7 +16485,7 @@
     12502@@ -16138,7 +16516,7 @@
    1224212503   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1224312504   ;;
    1224412505 *)
    1224512506-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
    12246 +  { { echo "$as_me:16488: error: expected a pathname, not \"$withval\"" >&5
     12507+  { { echo "$as_me:16519: error: expected a pathname, not \"$withval\"" >&5
    1224712508 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1224812509    { (exit 1); exit 1; }; }
    1224912510   ;;
    12250 @@ -16163,7 +16510,7 @@
     12511@@ -16163,7 +16541,7 @@
    1225112512 ### chooses to split module lists into libraries.
    1225212513 ###
    1225312514 ### (see CF_LIB_RULES).
    1225412515-echo "$as_me:16166: checking for library subsets" >&5
    12255 +echo "$as_me:16513: checking for library subsets" >&5
     12516+echo "$as_me:16544: checking for library subsets" >&5
    1225612517 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
    1225712518 LIB_SUBSETS=
    1225812519 
    12259 @@ -16188,7 +16535,7 @@
     12520@@ -16176,7 +16554,17 @@
     12521        fi
     12522 fi
     12523 
     12524-LIB_SUBSETS="${LIB_SUBSETS}termlib"
     12525+LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers"
     12526+
     12527+case $cf_cv_system_name in #(vi
     12528+*mingw32*) #(vi
     12529+       LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con"
     12530+       ;;
     12531+*) #(vi
     12532+       LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo"
     12533+       ;;
     12534+esac
     12535+
     12536 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
     12537 if test "$with_termlib" != no ; then
     12538        LIB_SUBSETS="${LIB_SUBSETS} "
     12539@@ -16185,17 +16573,18 @@
     12540 fi
     12541 
     12542 LIB_SUBSETS="${LIB_SUBSETS}base"
     12543+
    1226012544 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
    1226112545 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
    1226212546 
    1226312547-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
    12264 +echo "$as_me:16538: result: $LIB_SUBSETS" >&5
     12548+echo "$as_me:16580: result: $LIB_SUBSETS" >&5
    1226512549 echo "${ECHO_T}$LIB_SUBSETS" >&6
    1226612550 
    1226712551 ### Construct the list of include-directories to be generated
    12268 @@ -16226,7 +16573,7 @@
     12552 
     12553-CPPFLAGS="-I. -I../include $CPPFLAGS"
     12554+CPPFLAGS="$CPPFLAGS -I. -I../include"
     12555 if test "$srcdir" != "."; then
     12556-       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
     12557+       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
     12558 fi
     12559 if test "$GCC" != yes; then
     12560        CPPFLAGS="$CPPFLAGS -I\${includedir}"
     12561@@ -16226,7 +16615,7 @@
    1226912562 fi
    1227012563 
    1227112564 ### Build up pieces for makefile rules
    1227212565-echo "$as_me:16229: checking default library suffix" >&5
    12273 +echo "$as_me:16576: checking default library suffix" >&5
     12566+echo "$as_me:16618: checking default library suffix" >&5
    1227412567 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
    1227512568 
    1227612569        case $DFT_LWR_MODEL in
    12277 @@ -16237,46 +16584,50 @@
     12570@@ -16237,46 +16626,50 @@
    1227812571        shared)  DFT_ARG_SUFFIX=''   ;;
    1227912572        esac
    1228012573        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
    1228112574-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
    12282 +echo "$as_me:16587: result: $DFT_ARG_SUFFIX" >&5
     12575+echo "$as_me:16629: result: $DFT_ARG_SUFFIX" >&5
    1228312576 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
    1228412577 
    1228512578-echo "$as_me:16243: checking default library-dependency suffix" >&5
    12286 +echo "$as_me:16590: checking default library-dependency suffix" >&5
     12579+echo "$as_me:16632: checking default library-dependency suffix" >&5
    1228712580 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
    1228812581 
    … …  
    1233912632                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
    1234012633                                ;;
    12341 @@ -16289,10 +16640,10 @@
     12634@@ -16289,10 +16682,10 @@
    1234212635        esac
    1234312636        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
    1234412637        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
    1234512638-echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
    12346 +echo "$as_me:16643: result: $DFT_DEP_SUFFIX" >&5
     12639+echo "$as_me:16685: result: $DFT_DEP_SUFFIX" >&5
    1234712640 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
    1234812641 
    1234912642-echo "$as_me:16295: checking default object directory" >&5
    12350 +echo "$as_me:16646: checking default object directory" >&5
     12643+echo "$as_me:16688: checking default object directory" >&5
    1235112644 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
    1235212645 
    1235312646        case $DFT_LWR_MODEL in
    12354 @@ -16308,51 +16659,55 @@
     12647@@ -16308,51 +16701,55 @@
    1235512648                        DFT_OBJ_SUBDIR='obj_s' ;;
    1235612649                esac
    1235712650        esac
    1235812651-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
    12359 +echo "$as_me:16662: result: $DFT_OBJ_SUBDIR" >&5
     12652+echo "$as_me:16704: result: $DFT_OBJ_SUBDIR" >&5
    1236012653 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
    1236112654 
    … …  
    1236312656 if test "$cf_with_cxx" = yes ; then
    1236412657-echo "$as_me:16316: checking c++ library-dependency suffix" >&5
    12365 +echo "$as_me:16667: checking c++ library-dependency suffix" >&5
     12658+echo "$as_me:16709: checking c++ library-dependency suffix" >&5
    1236612659 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
    1236712660 if test "$with_libtool" != "no"; then
    … …  
    1242112714                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
    1242212715                                ;;
    12423 @@ -16366,7 +16721,7 @@
     12716@@ -16366,7 +16763,7 @@
    1242412717        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
    1242512718        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
    1242612719 fi
    1242712720-echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
    12428 +echo "$as_me:16724: result: $CXX_LIB_SUFFIX" >&5
     12721+echo "$as_me:16766: result: $CXX_LIB_SUFFIX" >&5
    1242912722 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
    1243012723 
    1243112724 fi
    12432 @@ -16480,7 +16835,7 @@
     12725@@ -16480,7 +16877,7 @@
    1243312726 
    1243412727 if test "$GCC" = yes ; then
    … …  
    1243912732                LDFLAGS_SHARED=
    1244012733                ;;
    12441 @@ -16491,7 +16846,7 @@
     12734@@ -16491,7 +16888,7 @@
    1244212735     esac
    1244312736 else
    … …  
    1244812741                LDFLAGS_SHARED=-bdynamic
    1244912742                ;;
    12450 @@ -16519,12 +16874,12 @@
     12743@@ -16519,12 +16916,12 @@
    1245112744        ;;
    1245212745 esac
    1245312746 
    1245412747-echo "$as_me:16522: checking where we will install curses.h" >&5
    12455 +echo "$as_me:16877: checking where we will install curses.h" >&5
     12748+echo "$as_me:16919: checking where we will install curses.h" >&5
    1245612749 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
    1245712750 test "$with_overwrite" = no && \
    … …  
    1245912752        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
    1246012753-echo "$as_me:16527: result: $includedir" >&5
    12461 +echo "$as_me:16882: result: $includedir" >&5
     12754+echo "$as_me:16924: result: $includedir" >&5
    1246212755 echo "${ECHO_T}$includedir" >&6
    1246312756 
    1246412757 ### Resolve a conflict between normal and wide-curses by forcing applications
    12465 @@ -16532,10 +16887,11 @@
     12758@@ -16532,10 +16929,11 @@
    1246612759 if test "$with_overwrite" != no ; then
    1246712760 if test "$NCURSES_LIBUTF8" = 1 ; then
    1246812761        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
    1246912762-       { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    12470 +       { echo "$as_me:16890: 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
    1247112764 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
    1247212765 fi
    … …  
    1247612769 # used to separate tack out of the tree
    1247712770 NCURSES_TREE=
    12478 @@ -16548,7 +16904,7 @@
     12771@@ -16548,7 +16946,7 @@
    1247912772 ### Construct the list of subdirectories for which we'll customize makefiles
    1248012773 ### with the appropriate compile-rules.
    1248112774 
    1248212775-echo "$as_me:16551: checking for src modules" >&5
    12483 +echo "$as_me:16907: checking for src modules" >&5
     12776+echo "$as_me:16949: checking for src modules" >&5
    1248412777 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
    1248512778 
    1248612779 # dependencies and linker-arguments for test-programs
    12487 @@ -16611,13 +16967,17 @@
     12780@@ -16611,13 +17009,17 @@
    1248812781                fi
    1248912782        fi
    1249012783 done
    1249112784-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
    12492 +echo "$as_me:16970: result: $cf_cv_src_modules" >&5
     12785+echo "$as_me:17012: result: $cf_cv_src_modules" >&5
    1249312786 echo "${ECHO_T}$cf_cv_src_modules" >&6
    1249412787 
    … …  
    1250512798 do
    1250612799        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    12507 @@ -16628,8 +16988,8 @@
     12800@@ -16628,8 +17030,8 @@
    1250812801 
    1250912802 ADA_SUBDIRS=
    … …  
    1251612809 
    1251712810 SUB_MAKEFILES=
    12518 @@ -16639,15 +16999,15 @@
     12811@@ -16639,15 +17041,15 @@
    1251912812 done
    1252012813 
    … …  
    1253712830 
    1253812831 DIRS_TO_MAKE="lib"
    12539 @@ -16760,18 +17120,18 @@
     12832@@ -16680,7 +17082,7 @@
     12833 done
     12834 
     12835 cat >>confdefs.h <<EOF
     12836-#define NCURSES_PATHSEP '$PATHSEP'
     12837+#define NCURSES_PATHSEP '$PATH_SEPARATOR'
     12838 EOF
     12839 
     12840 cat >>confdefs.h <<EOF
     12841@@ -16749,7 +17151,7 @@
     12842 
     12843 if test -n "$cf_new_cppflags" ; then
     12844 
     12845-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
     12846+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
     12847 fi
     12848 
     12849 if test -n "$cf_new_extra_cppflags" ; then
     12850@@ -16760,18 +17162,18 @@
    1254012851 ### If we're building with rpath, try to link non-standard libs that way too.
    1254112852 if test "$DFT_LWR_MODEL" = "shared"; then
    1254212853 
    1254312854-echo "$as_me:16763: checking for updated LDFLAGS" >&5
    12544 +echo "$as_me:17123: checking for updated LDFLAGS" >&5
     12855+echo "$as_me:17165: checking for updated LDFLAGS" >&5
    1254512856 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
    1254612857 if test -n "$LDFLAGS" ; then
    1254712858-echo "$as_me:16766: result: maybe" >&5
    12548 +echo "$as_me:17126: result: maybe" >&5
     12859+echo "$as_me:17168: result: maybe" >&5
    1254912860 echo "${ECHO_T}maybe" >&6
    1255012861 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
    1255112862 
    1255212863-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    12553 +echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
     12864+echo "${as_me-configure}:17172: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    1255412865 
    1255512866 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1255612867 
    1255712868-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12558 +echo "${as_me-configure}:17134: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     12869+echo "${as_me-configure}:17176: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1255912870 
    1256012871 case "$EXTRA_LDFLAGS" in #(vi
    1256112872 -Wl,-rpath,*) #(vi
    12562 @@ -16793,7 +17153,7 @@
     12873@@ -16793,7 +17195,7 @@
    1256312874        do
    1256412875                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
    1256512876 
    1256612877-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
    12567 +echo "${as_me-configure}:17156: testing Filtering $cf_rpath_src ..." 1>&5
     12878+echo "${as_me-configure}:17198: testing Filtering $cf_rpath_src ..." 1>&5
    1256812879 
    1256912880                case $cf_rpath_src in #(vi
    1257012881                -L*) #(vi
    12571 @@ -16804,7 +17164,7 @@
     12882@@ -16804,7 +17206,7 @@
    1257212883                        fi
    1257312884                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
    1257412885 
    1257512886-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
    12576 +echo "${as_me-configure}:17167: testing ...Filter $cf_rpath_tmp ..." 1>&5
     12887+echo "${as_me-configure}:17209: testing ...Filter $cf_rpath_tmp ..." 1>&5
    1257712888 
    1257812889                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
    1257912890                        ;;
    12580 @@ -16814,15 +17174,15 @@
     12891@@ -16814,15 +17216,15 @@
    1258112892        LDFLAGS=$cf_rpath_dst
    1258212893        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
    1258312894 
    1258412895-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    12585 +echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
     12896+echo "${as_me-configure}:17219: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    1258612897 
    1258712898        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1258812899 
    1258912900-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12590 +echo "${as_me-configure}:17181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
     12901+echo "${as_me-configure}:17223: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    1259112902 
    1259212903 fi
    1259312904 else
    1259412905-echo "$as_me:16825: result: no" >&5
    12595 +echo "$as_me:17185: result: no" >&5
     12906+echo "$as_me:17227: result: no" >&5
    1259612907 echo "${ECHO_T}no" >&6
    1259712908 fi
    1259812909 
    12599 @@ -16849,8 +17209,18 @@
     12910@@ -16849,8 +17251,18 @@
    1260012911 fi
    1260112912 
    … …  
    1261712928 ac_config_commands="$ac_config_commands default"
    1261812929 cat >confcache <<\_ACEOF
    12619 @@ -16932,7 +17302,7 @@
     12930@@ -16932,7 +17344,7 @@
    1262012931 : ${CONFIG_STATUS=./config.status}
    1262112932 ac_clean_files_save=$ac_clean_files
    1262212933 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    1262312934-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
    12624 +{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5
     12935+{ echo "$as_me:17347: creating $CONFIG_STATUS" >&5
    1262512936 echo "$as_me: creating $CONFIG_STATUS" >&6;}
    1262612937 cat >$CONFIG_STATUS <<_ACEOF
    1262712938 #! $SHELL
    12628 @@ -17064,7 +17434,7 @@
     12939@@ -17064,7 +17476,7 @@
    1262912940 cat >>$CONFIG_STATUS <<EOF
    1263012941 ac_cs_version="\\
    … …  
    1263512946 
    1263612947 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
    12637 @@ -17108,7 +17478,7 @@
     12948@@ -17108,7 +17520,7 @@
    1263812949     echo "$ac_cs_version"; exit 0 ;;
    1263912950   --he | --h)
    1264012951     # Conflict between --help and --header
    1264112952-    { { echo "$as_me:17111: error: ambiguous option: $1
    12642 +    { { echo "$as_me:17481: error: ambiguous option: $1
     12953+    { { echo "$as_me:17523: error: ambiguous option: $1
    1264312954 Try \`$0 --help' for more information." >&5
    1264412955 echo "$as_me: error: ambiguous option: $1
    1264512956 Try \`$0 --help' for more information." >&2;}
    12646 @@ -17127,7 +17497,7 @@
     12957@@ -17127,7 +17539,7 @@
    1264712958     ac_need_defaults=false;;
    1264812959 
    1264912960   # This is an error.
    1265012961-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
    12651 +  -*) { { echo "$as_me:17500: error: unrecognized option: $1
     12962+  -*) { { echo "$as_me:17542: error: unrecognized option: $1
    1265212963 Try \`$0 --help' for more information." >&5
    1265312964 echo "$as_me: error: unrecognized option: $1
    1265412965 Try \`$0 --help' for more information." >&2;}
    12655 @@ -17146,7 +17516,7 @@
     12966@@ -17146,7 +17558,7 @@
    1265612967 ## Running config.status.  ##
    1265712968 ## ----------------------- ##
    … …  
    1266212973   CONFIG_HEADERS  = $CONFIG_HEADERS
    1266312974   CONFIG_LINKS    = $CONFIG_LINKS
    12664 @@ -17181,13 +17551,13 @@
     12975@@ -17181,13 +17593,13 @@
    1266512976 NCURSES_PATCH="$NCURSES_PATCH"
    1266612977 SRC_SUBDIRS="$SRC_SUBDIRS"
    … …  
    1267912990 WITH_ECHO="$with_echo"
    1268012991 WITH_OVERWRITE="$with_overwrite"
    12681 @@ -17206,6 +17576,7 @@
     12992@@ -17206,6 +17618,7 @@
    1268212993 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1268312994 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1268712998 target="$target"
    1268812999 
    12689 @@ -17224,7 +17595,7 @@
     13000@@ -17224,7 +17637,7 @@
    1269013001   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1269113002   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    1269213003   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
    1269313004-  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
    12694 +  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5
     13005+  *) { { echo "$as_me:17640: error: invalid argument: $ac_config_target" >&5
    1269513006 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    1269613007    { (exit 1); exit 1; }; };;
    1269713008   esac
    12698 @@ -17349,6 +17720,8 @@
     13009@@ -17349,6 +17762,8 @@
    1269913010 s,@LINT@,$LINT,;t t
    1270013011 s,@LINT_OPTS@,$LINT_OPTS,;t t
    … …  
    1270513016 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
    1270613017 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
    12707 @@ -17359,7 +17732,7 @@
     13018@@ -17359,7 +17774,7 @@
    1270813019 s,@ac_ct_LD@,$ac_ct_LD,;t t
    1270913020 s,@AR@,$AR,;t t
    … …  
    1271413025 s,@BUILD_CC@,$BUILD_CC,;t t
    1271513026 s,@BUILD_CPP@,$BUILD_CPP,;t t
    12716 @@ -17392,6 +17765,7 @@
     13027@@ -17392,6 +17807,7 @@
    1271713028 s,@CXX_G_OPT@,$CXX_G_OPT,;t t
    1271813029 s,@LD_MODEL@,$LD_MODEL,;t t
    … …  
    1272213033 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
    1272313034 s,@LINK_PROGS@,$LINK_PROGS,;t t
    12724 @@ -17425,6 +17799,7 @@
     13035@@ -17401,7 +17817,6 @@
     13036 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
     13037 s,@INSTALL_LIB@,$INSTALL_LIB,;t t
     13038 s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t
     13039-s,@PATHSEP@,$PATHSEP,;t t
     13040 s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
     13041 s,@WHICH_XTERM@,$WHICH_XTERM,;t t
     13042 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
     13043@@ -17425,6 +17840,9 @@
    1272513044 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
    1272613045 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
    1272713046 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
    1272813047+s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
     13048+s,@NCURSES_SP_FUNCS@,$NCURSES_SP_FUNCS,;t t
     13049+s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t
    1272913050 s,@NCURSES_CONST@,$NCURSES_CONST,;t t
    1273013051 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
    1273113052 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
    12732 @@ -17449,7 +17824,7 @@
     13053@@ -17449,7 +17867,7 @@
    1273313054 s,@CXXCPP@,$CXXCPP,;t t
    1273413055 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
    … …  
    1273913060 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
    1274013061 s,@gnat_exists@,$gnat_exists,;t t
    12741 @@ -17493,6 +17868,7 @@
     13062@@ -17493,6 +17911,7 @@
    1274213063 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
    1274313064 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
    … …  
    1274713068 
    1274813069 EOF
    12749 @@ -17607,7 +17983,7 @@
     13070@@ -17607,7 +18026,7 @@
    1275013071   esac
    1275113072 
    1275213073   if test x"$ac_file" != x-; then
    1275313074-    { echo "$as_me:17610: creating $ac_file" >&5
    12754 +    { echo "$as_me:17986: creating $ac_file" >&5
     13075+    { echo "$as_me:18029: creating $ac_file" >&5
    1275513076 echo "$as_me: creating $ac_file" >&6;}
    1275613077     rm -f "$ac_file"
    1275713078   fi
    12758 @@ -17625,7 +18001,7 @@
     13079@@ -17625,7 +18044,7 @@
    1275913080       -) echo $tmp/stdin ;;
    1276013081       [\\/$]*)
    1276113082          # Absolute (can't be DOS-style, as IFS=:)
    1276213083-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
    12763 +         test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5
     13084+         test -f "$f" || { { echo "$as_me:18047: error: cannot find input file: $f" >&5
    1276413085 echo "$as_me: error: cannot find input file: $f" >&2;}
    1276513086    { (exit 1); exit 1; }; }
    1276613087          echo $f;;
    12767 @@ -17638,7 +18014,7 @@
     13088@@ -17638,7 +18057,7 @@
    1276813089            echo $srcdir/$f
    1276913090          else
    1277013091            # /dev/null tree
    1277113092-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
    12772 +           { { echo "$as_me:18017: error: cannot find input file: $f" >&5
     13093+           { { echo "$as_me:18060: error: cannot find input file: $f" >&5
    1277313094 echo "$as_me: error: cannot find input file: $f" >&2;}
    1277413095    { (exit 1); exit 1; }; }
    1277513096          fi;;
    12776 @@ -17704,7 +18080,7 @@
     13097@@ -17704,7 +18123,7 @@
    1277713098   * )   ac_file_in=$ac_file.in ;;
    1277813099   esac
    1277913100 
    1278013101-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
    12781 +  test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5
     13102+  test x"$ac_file" != x- && { echo "$as_me:18126: creating $ac_file" >&5
    1278213103 echo "$as_me: creating $ac_file" >&6;}
    1278313104 
    1278413105   # First look for the input files in the build tree, otherwise in the
    12785 @@ -17715,7 +18091,7 @@
     13106@@ -17715,7 +18134,7 @@
    1278613107       -) echo $tmp/stdin ;;
    1278713108       [\\/$]*)
    1278813109          # Absolute (can't be DOS-style, as IFS=:)
    1278913110-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
    12790 +         test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5
     13111+         test -f "$f" || { { echo "$as_me:18137: error: cannot find input file: $f" >&5
    1279113112 echo "$as_me: error: cannot find input file: $f" >&2;}
    1279213113    { (exit 1); exit 1; }; }
    1279313114          echo $f;;
    12794 @@ -17728,7 +18104,7 @@
     13115@@ -17728,7 +18147,7 @@
    1279513116            echo $srcdir/$f
    1279613117          else
    1279713118            # /dev/null tree
    1279813119-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
    12799 +           { { echo "$as_me:18107: error: cannot find input file: $f" >&5
     13120+           { { echo "$as_me:18150: error: cannot find input file: $f" >&5
    1280013121 echo "$as_me: error: cannot find input file: $f" >&2;}
    1280113122    { (exit 1); exit 1; }; }
    1280213123          fi;;
    12803 @@ -17786,7 +18162,7 @@
     13124@@ -17786,7 +18205,7 @@
    1280413125   rm -f $tmp/in
    1280513126   if test x"$ac_file" != x-; then
    1280613127     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
    1280713128-      { echo "$as_me:17789: $ac_file is unchanged" >&5
    12808 +      { echo "$as_me:18165: $ac_file is unchanged" >&5
     13129+      { echo "$as_me:18208: $ac_file is unchanged" >&5
    1280913130 echo "$as_me: $ac_file is unchanged" >&6;}
    1281013131     else
    1281113132       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    12812 @@ -17873,40 +18249,44 @@
     13133@@ -17873,40 +18292,44 @@
    1281313134                for cf_item in $cf_LIST_MODELS
    1281413135                do
    … …  
    1286613187                                cf_depsuf=$cf_suffix
    1286713188                                ;;
    12868 @@ -18020,40 +18400,44 @@
     13189@@ -18020,40 +18443,44 @@
    1286913190 
    1287013191 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    … …  
    1292213243                                cf_depsuf=$cf_suffix
    1292313244                                ;;
    12924 @@ -18234,18 +18618,28 @@
     13245@@ -18234,18 +18661,28 @@
    1292513246 install.libs uninstall.libs \\
    1292613247 install.data uninstall.data ::
    … …  
    1295113272 if test -f $srcdir/$tack.h; then
    1295213273 cat >> Makefile <<CF_EOF
    12953 @@ -18256,6 +18650,7 @@
     13274@@ -18256,6 +18693,7 @@
    1295413275 CF_EOF
    1295513276 fi
    … …  
    1296113282diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
    1296213283--- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
    12963 +++ ncurses-5.7/configure.in    2009-01-27 16:45:02.344642827 -0800
     13284+++ ncurses-5.7/configure.in    2009-02-28 20:38:57.043235088 -0800
    1296413285@@ -1,5 +1,5 @@
    1296513286 dnl***************************************************************************
    … …  
    1297413295 dnl
    1297513296-dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
    12976 +dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 tom Exp $
     13297+dnl $Id: configure.in,v 1.466 2009/02/15 00:19:01 tom Exp $
    1297713298 dnl Process this file with autoconf to produce a configure script.
    1297813299 dnl
    … …  
    1298213303 AC_PREREQ(2.13.20020210)
    1298313304-AC_REVISION($Revision: 1.454 $)
    12984 +AC_REVISION($Revision: 1.464 $)
     13305+AC_REVISION($Revision: 1.466 $)
    1298513306 AC_INIT(ncurses/base/lib_initscr.c)
    1298613307 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
    … …  
    1305013371 ###############################################################################
    1305113372 CF_HELP_MESSAGE(Extensions:)
    13052 @@ -828,10 +860,13 @@
     13373@@ -828,10 +860,30 @@
    1305313374        AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
    1305413375        AC_DEFINE(HAVE_WRESIZE)
    … …  
    1306113382 AC_SUBST(NCURSES_EXT_FUNCS)
    1306213383+AC_SUBST(GENERATED_EXT_FUNCS)
     13384+
     13385+AC_MSG_CHECKING(if you want to build with experimental SCREEN extensions)
     13386+AC_ARG_ENABLE(sp-funcs,
     13387+       [  --enable-sp-funcs       disable experimental SCREEN-extensions],
     13388+       [with_sp_funcs=$enableval],
     13389+       [with_sp_funcs=no])
     13390+AC_MSG_RESULT($with_sp_funcs)
     13391+if test "$with_sp_funcs" = yes ; then
     13392+       NCURSES_SP_FUNCS=1
     13393+       AC_DEFINE(NCURSES_SP_FUNCS)
     13394+       GENERATED_SP_FUNCS=generated
     13395+else
     13396+       NCURSES_SP_FUNCS=0
     13397+       GENERATED_SP_FUNCS=
     13398+fi
     13399+AC_SUBST(NCURSES_SP_FUNCS)
     13400+AC_SUBST(GENERATED_SP_FUNCS)
    1306313401 
    1306413402 ###   use option --enable-const to turn on use of const beyond that in XSI.
    1306513403 AC_MSG_CHECKING(for extended use of const keyword)
    13066 @@ -1354,12 +1389,12 @@
     13404@@ -1165,12 +1217,18 @@
     13405 AC_SUBST(ADA_TRACE)
     13406 
     13407 ###    Checks for libraries.
     13408+case $cf_cv_system_name in #(vi
     13409+*mingw32*) #(vi
     13410+       ;;
     13411+*)
     13412 AC_CHECK_FUNC(gettimeofday,
     13413        AC_DEFINE(HAVE_GETTIMEOFDAY),[
     13414 
     13415 AC_CHECK_LIB(bsd, gettimeofday,
     13416        AC_DEFINE(HAVE_GETTIMEOFDAY)
     13417        LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday
     13418+       ;;
     13419+esac
     13420 
     13421 CF_MATH_LIB(MATH_LIB,sin(x))
     13422 AC_SUBST(MATH_LIB)
     13423@@ -1354,12 +1412,12 @@
    1306713424        CF_CPP_STATIC_CAST
    1306813425 
    … …  
    1307913436            ;;
    1308013437        sco3.2v5*) #(vi
    13081 @@ -1368,13 +1403,13 @@
     13438@@ -1368,13 +1426,13 @@
    1308213439        solaris2*)
    1308313440            if test "$GXX" != yes ; then
    … …  
    1309513452        cf_cxx_library=no
    1309613453        cf_cv_builtin_bool=1
    13097 @@ -1723,6 +1758,7 @@
     13454@@ -1552,7 +1610,17 @@
     13455        fi
     13456 fi
     13457 
     13458-LIB_SUBSETS="${LIB_SUBSETS}termlib"
     13459+LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers"
     13460+
     13461+case $cf_cv_system_name in #(vi
     13462+*mingw32*) #(vi
     13463+       LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con"
     13464+       ;;
     13465+*) #(vi
     13466+       LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo"
     13467+       ;;
     13468+esac
     13469+
     13470 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
     13471 if test "$with_termlib" != no ; then
     13472        LIB_SUBSETS="${LIB_SUBSETS} "
     13473@@ -1561,6 +1629,7 @@
     13474 fi
     13475 
     13476 LIB_SUBSETS="${LIB_SUBSETS}base"
     13477+
     13478 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
     13479 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
     13480 
     13481@@ -1723,6 +1792,7 @@
    1309813482        AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
    1309913483 fi
    … …  
    1310313487 AC_SUBST(WITH_OVERWRITE)
    1310413488 AC_SUBST(TICS_LIST)
    13105 @@ -1742,7 +1778,7 @@
     13489@@ -1742,12 +1812,12 @@
    1310613490 CF_SRC_MODULES($modules_to_build)
    1310713491 
    … …  
    1311213496 
    1311313497 CF_DIRS_TO_MAKE
    13114 @@ -1765,8 +1801,19 @@
     13498 
     13499-AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP')
     13500+AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR')
     13501 
     13502 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}")
     13503 
     13504@@ -1765,8 +1835,19 @@
    1311513505 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
    1311613506 
    … …  
    1313313523        include/MKterm.h.awk \
    1313413524        include/curses.head:include/curses.h.in \
    13135 @@ -1796,13 +1843,13 @@
     13525@@ -1796,13 +1877,13 @@
    1313613526 NCURSES_PATCH="$NCURSES_PATCH"
    1313713527 SRC_SUBDIRS="$SRC_SUBDIRS"
    … …  
    1315013540 WITH_ECHO="$with_echo"
    1315113541 WITH_OVERWRITE="$with_overwrite"
    13152 @@ -1821,6 +1868,7 @@
     13542@@ -1821,6 +1902,7 @@
    1315313543 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1315413544 cf_cv_system_name="$cf_cv_system_name"
    … …  
    1316013550diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
    1316113551--- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
    13162 +++ ncurses-5.7/dist.mk 2009-01-27 16:45:05.084820505 -0800
     13552+++ ncurses-5.7/dist.mk 2009-02-28 20:38:59.855417236 -0800
    1316313553@@ -25,7 +25,7 @@
    1316413554 # use or other dealings in this Software without prior written               #
    … …  
    1316613556 ##############################################################################
    1316713557-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
    13168 +# $Id: dist.mk,v 1.684 2009/01/24 20:49:01 tom Exp $
     13558+# $Id: dist.mk,v 1.688 2009/02/28 14:49:13 tom Exp $
    1316913559 # Makefile for creating ncurses distributions.
    1317013560 #
    … …  
    1317513565 NCURSES_MINOR = 7
    1317613566-NCURSES_PATCH = 20081102
    13177 +NCURSES_PATCH = 20090124
     13567+NCURSES_PATCH = 20090228
    1317813568 
    1317913569 # We don't append the patch to the version, since this only applies to releases
    1318013570 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
     13571diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c
     13572--- 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
     13574@@ -32,7 +32,7 @@
     13575 
     13576 #include "form.priv.h"
     13577 
     13578-MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $")
     13579+MODULE_ID("$Id: fld_def.c,v 1.37 2009/02/28 19:00:51 juergen Exp $")
     13580 
     13581 /* this can't be readonly */
     13582 static FIELD default_field =
     13583@@ -252,8 +252,8 @@
     13584   if (field->type != 0)
     13585     {
     13586       field->type->ref--;
     13587+      _nc_Free_Argument(field->type, (TypeArgument *)(field->arg));
     13588     }
     13589-  _nc_Free_Argument(field->type, (TypeArgument *)(field->arg));
     13590 }
     13591 
     13592 /*---------------------------------------------------------------------------
    1318113593diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
    1318213594--- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
    13183 +++ ncurses-5.7/form/frm_driver.c       2009-01-27 16:44:49.391812822 -0800
     13595+++ ncurses-5.7/form/frm_driver.c       2009-02-28 20:38:39.770130185 -0800
    1318413596@@ -32,7 +32,7 @@
    1318513597 
    … …  
    1320113613diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
    1320213614--- ncurses-5.7.orig/form/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13203 +++ ncurses-5.7/form/Makefile.in        2009-01-27 16:44:58.024366252 -0800
     13615+++ ncurses-5.7/form/Makefile.in        2009-02-28 20:38:46.310547562 -0800
    1320413616@@ -1,6 +1,6 @@
    1320513617-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
    … …  
    1322013632 LD             = @LD@
    1322113633 LN_S           = @LN_S@
    13222 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
    13223 --- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
    13224 +++ ncurses-5.7/include/curses.h.in     2009-01-27 16:44:52.892037156 -0800
     13634diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c
     13635--- 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
    1322513637@@ -32,7 +32,7 @@
    1322613638  *     and: Thomas E. Dickey                        1996-on                 *
    1322713639  ****************************************************************************/
    1322813640 
     13641-/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */
     13642+/* $Id: capdefaults.c,v 1.14 2008/11/16 00:19:59 juergen Exp $ */
     13643 
     13644     /*
     13645      * Compute obsolete capabilities.  The reason this is an include file is
     13646@@ -44,11 +44,11 @@
     13647      * postprocess_termcap().
     13648      */
     13649 {
     13650-    char *sp;
     13651+    char *strp;
     13652     short capval;
     13653 
     13654 #define EXTRACT_DELAY(str) \
     13655-       (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0)
     13656+       (short) (strp = strchr(str, '*'), strp ? atoi(strp+1) : 0)
     13657 
     13658     /* current (4.4BSD) capabilities marked obsolete */
     13659     if (VALID_STRING(carriage_return)
     13660diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
     13661--- 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
     13663@@ -1,5 +1,5 @@
     13664 /****************************************************************************
     13665- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     13666+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     13667  *                                                                          *
     13668  * Permission is hereby granted, free of charge, to any person obtaining a  *
     13669  * copy of this software and associated documentation files (the            *
     13670@@ -32,7 +32,7 @@
     13671  *     and: Thomas E. Dickey                        1996-on                 *
     13672  ****************************************************************************/
     13673 
    1322913674-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
    13230 +/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
     13675+/* $Id: curses.h.in,v 1.194 2009/02/21 22:44:41 tom Exp $ */
    1323113676 
    1323213677 #ifndef __NCURSES_H
    … …  
    1324513690 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
    1324613691 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
    13247 @@ -856,18 +850,18 @@
     13692@@ -110,6 +104,13 @@
     13693 #endif
     13694 
     13695 /*
     13696+ * The reentrant code relies on the opaque setting, but adds features.
     13697+ */
     13698+#ifndef NCURSES_REENTRANT
     13699+#define NCURSES_REENTRANT @cf_cv_enable_reentrant@
     13700+#endif
     13701+
     13702+/*
     13703  * The internal type used for window dimensions.
     13704  */
     13705 #undef NCURSES_SIZE_T
     13706@@ -224,7 +225,7 @@
     13707 
     13708 /* line graphics */
     13709 
     13710-#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@
     13711+#if @BROKEN_LINKER@ || NCURSES_REENTRANT
     13712 NCURSES_WRAPPED_VAR(chtype*, acs_map);
     13713 #define acs_map (_nc_acs_map())
     13714 #else
     13715@@ -646,7 +647,7 @@
     13716 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);                /* generated */
     13717 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);              /* generated */
     13718 extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int); /* generated */
     13719-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);               /* generated */
     13720+extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);       /* generated */
     13721 extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);              /* generated */
     13722 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)       /* implemented */
     13723                GCC_PRINTFLIKE(4,5);
     13724@@ -654,9 +655,9 @@
     13725                GCC_SCANFLIKE(4,5);
     13726 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);  /* generated */
     13727 extern NCURSES_EXPORT(int) napms (int);                                        /* implemented */
     13728-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);                              /* implemented */
     13729+extern NCURSES_EXPORT(WINDOW *) newpad (int,int);                      /* implemented */
     13730 extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);  /* implemented */
     13731-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);                      /* implemented */
     13732+extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);              /* implemented */
     13733 extern NCURSES_EXPORT(int) nl (void);                                  /* implemented */
     13734 extern NCURSES_EXPORT(int) nocbreak (void);                            /* implemented */
     13735 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);                    /* implemented */
     13736@@ -710,7 +711,7 @@
     13737 extern NCURSES_EXPORT(int) slk_refresh (void);                         /* implemented */
     13738 extern NCURSES_EXPORT(int) slk_restore (void);                         /* implemented */
     13739 extern NCURSES_EXPORT(int) slk_set (int,const char *,int);             /* implemented */
     13740-extern NCURSES_EXPORT(int) slk_touch (void);                           /* implemented */
     13741+extern NCURSES_EXPORT(int) slk_touch (void);                           /* implemented */
     13742 extern NCURSES_EXPORT(int) standout (void);                            /* generated */
     13743 extern NCURSES_EXPORT(int) standend (void);                            /* generated */
     13744 extern NCURSES_EXPORT(int) start_color (void);                         /* implemented */
     13745@@ -856,23 +857,119 @@
    1324813746  * These extensions provide access to information stored in the WINDOW even
    1324913747  * when NCURSES_OPAQUE is set:
    … …  
    1327613774 #else
    1327713775 #define curses_version() NCURSES_VERSION
     13776 #endif
     13777 
     13778+/*
     13779+ * Extra extension-functions, which pass a SCREEN pointer rather than using
     13780+ * a global variable SP.
     13781+ */
     13782+#if @NCURSES_SP_FUNCS@
     13783+#undef  NCURSES_SP_FUNCS
     13784+#define NCURSES_SP_FUNCS @NCURSES_PATCH@
     13785+#define NCURSES_SP_NAME(name) name##_sp
     13786+
     13787+extern NCURSES_EXPORT(SCREEN*) new_prescr(void); /* implemented */
     13788+
     13789+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented */
     13790+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented */
     13791+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented */
     13792+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented */
     13793+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, short, short*, short*, short*); /* implemented */
     13794+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented */
     13795+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented */
     13796+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented */
     13797+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented */
     13798+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented */
     13799+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented */
     13800+extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented */
     13801+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented */
     13802+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented */
     13803+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented */
     13804+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay)(SCREEN*, int); /* implemented */
     13805+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented */
     13806+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented */
     13807+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented */
     13808+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, short, short, short, short); /* implemented */
     13809+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, short, short, short); /* implemented */
     13810+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool);        /* implemented */
     13811+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented */
     13812+extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented */
     13813+extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented */
     13814+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented */
     13815+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented */
     13816+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented */
     13817+extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented */
     13818+extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented */
     13819+extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented */
     13820+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented */
     13821+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented */
     13822+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented */
     13823+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */
     13824+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented */
     13825+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented */
     13826+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented */
     13827+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, short, short*, short*); /* implemented */
     13828+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented */
     13829+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented */
     13830+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented */
     13831+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */
     13832+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */
     13833+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented */
     13834+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented */
     13835+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */
     13836+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */
     13837+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented */
     13838+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented */
     13839+extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented */
     13840+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, short, void*); /* implemented */
     13841+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented */
     13842+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, short); /* implemented */
     13843+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented */
     13844+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented */
     13845+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented */
     13846+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented */
     13847+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented */
     13848+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented */
     13849+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented */
     13850+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented */
     13851+extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented */
     13852+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented */
     13853+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented */
     13854+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented */
     13855+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented */
     13856+#if @NCURSES_EXT_FUNCS@
     13857+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);
     13858+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);
     13859+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);
     13860+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);
     13861+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined)(SCREEN*, const char *);
     13862+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);
     13863+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int);
     13864+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int);
     13865+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*);
     13866+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);
     13867+#endif
     13868+#else
     13869+#undef  NCURSES_SP_FUNCS
     13870+#define NCURSES_SP_FUNCS 0
     13871+#define NCURSES_SP_NAME(name) name
     13872+#endif
     13873+
     13874 /* attributes */
     13875 
     13876 #define NCURSES_ATTR_SHIFT       8
     13877@@ -1173,7 +1270,7 @@
     13878  *        It gives the ESC expire time in milliseconds.
     13879  *     b. ttytype is needed for backward compatibility
     13880  */
     13881-#if @cf_cv_enable_reentrant@
     13882+#if NCURSES_REENTRANT
     13883 
     13884 NCURSES_WRAPPED_VAR(WINDOW *, curscr);
     13885 NCURSES_WRAPPED_VAR(WINDOW *, newscr);
    1327813886diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
    1327913887--- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
    13280 +++ ncurses-5.7/include/curses.tail     2009-01-27 16:44:46.511630953 -0800
     13888+++ ncurses-5.7/include/curses.tail     2009-02-28 20:38:37.161961447 -0800
    1328113889@@ -1,4 +1,4 @@
    1328213890-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
    … …  
    1329513903diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
    1329613904--- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
    13297 +++ ncurses-5.7/include/curses.wide     2009-01-27 16:44:48.051726777 -0800
     13905+++ ncurses-5.7/include/curses.wide     2009-02-28 20:38:38.454044419 -0800
    1329813906@@ -1,9 +1,11 @@
    1329913907-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
    … …  
    1330913917 
    1331013918 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
     13919diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in
     13920--- 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
     13922@@ -1,7 +1,7 @@
     13923 # vile:awkmode
     13924 BEGIN          {
     13925                    print  "/****************************************************************************"
     13926-                   print  " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *"
     13927+                   print  " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *"
     13928                    print  " *                                                                          *"
     13929                    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
     13930                    print  " * copy of this software and associated documentation files (the            *"
     13931@@ -34,7 +34,7 @@
     13932                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
     13933                    print  "/****************************************************************************/"
     13934                    print  ""
     13935-                   print  "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */"
     13936+                   print  "/* $Id: MKterm.h.awk.in,v 1.53 2009/02/28 21:27:45 tom Exp $ */"
     13937                    print  ""
     13938                    print  "/*"
     13939                    print  "**  term.h -- Definition of struct term"
     13940@@ -228,8 +228,16 @@
     13941                        print  "    char *      _termname;      /* used for termname() */"
     13942                        print  "} TERMINAL;"
     13943                        print  ""
     13944-                       print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
     13945+                       print  "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@"
     13946+                       print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
     13947+                       print  "#elif @cf_cv_enable_reentrant@"
     13948                        print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
     13949+                       print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
     13950+                       print  "#else"
     13951+                       print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
     13952+                       print  "#endif"
     13953+                       print  ""
     13954+                       print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
     13955                        print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
     13956                        print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
     13957                        print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
     13958@@ -240,7 +248,6 @@
     13959                        print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
     13960                        print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
     13961                        print  ""
     13962-                       print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
     13963                        print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
     13964                        print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
     13965                        print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
     13966@@ -253,8 +260,6 @@
     13967                        print  ""
     13968                        print  "#else"
     13969                        print  ""
     13970-                       print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
     13971-                       print  ""
     13972                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
     13973                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
     13974                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
    1331113975diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    1331213976--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    13313 +++ ncurses-5.7/INSTALL 2009-01-27 16:44:58.000364576 -0800
     13977+++ ncurses-5.7/INSTALL 2009-02-28 20:38:46.282546444 -0800
    1331413978@@ -1,5 +1,5 @@
    1331513979 -------------------------------------------------------------------------------
    … …  
    1336214026diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
    1336314027--- ncurses-5.7.orig/man/curs_color.3x  2005-12-17 16:00:37.000000000 -0800
    13364 +++ ncurses-5.7/man/curs_color.3x       2009-01-27 16:45:05.084820505 -0800
     14028+++ ncurses-5.7/man/curs_color.3x       2009-02-28 20:38:53.014978628 -0800
    1336514029@@ -1,5 +1,5 @@
    1336614030 .\"***************************************************************************
    … …  
    1339314057diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
    1339414058--- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
    13395 +++ ncurses-5.7/man/curs_mouse.3x       2009-01-27 16:44:46.515630395 -0800
     14059+++ ncurses-5.7/man/curs_mouse.3x       2009-02-28 20:38:37.161961447 -0800
    1339614060@@ -1,6 +1,6 @@
    1339714061 '\" t
    … …  
    1343914103diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
    1344014104--- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
    13441 +++ ncurses-5.7/man/keybound.3x 2009-01-27 16:44:51.023917306 -0800
     14105+++ ncurses-5.7/man/keybound.3x 2009-02-28 20:38:41.374231037 -0800
    1344214106@@ -1,5 +1,5 @@
    1344314107 .\"***************************************************************************
    … …  
    1346014124diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
    1346114125--- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
    13462 +++ ncurses-5.7/man/tabs.1      2009-01-27 16:44:45.091537644 -0800
     14126+++ ncurses-5.7/man/tabs.1      2009-02-28 20:38:35.777872887 -0800
    1346314127@@ -0,0 +1,143 @@
    1346414128+.\"***************************************************************************
    … …  
    1360714271diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
    1360814272--- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
    13609 +++ ncurses-5.7/man/tset.1      2009-01-27 16:44:45.091537644 -0800
     14273+++ ncurses-5.7/man/tset.1      2009-02-28 20:38:35.777872887 -0800
    1361014274@@ -1,5 +1,5 @@
    1361114275 .\"***************************************************************************
    … …  
    1362814292diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    1362914293--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    13630 +++ ncurses-5.7/MANIFEST        2009-01-27 16:44:58.000364576 -0800
     14294+++ ncurses-5.7/MANIFEST        2009-02-28 20:38:46.282546444 -0800
    1363114295@@ -640,6 +640,7 @@
    1363214296 ./man/ncurses.3x
    … …  
    1367114335diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
    1367214336--- ncurses-5.7.orig/menu/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13673 +++ ncurses-5.7/menu/Makefile.in        2009-01-27 16:44:58.024366252 -0800
     14337+++ ncurses-5.7/menu/Makefile.in        2009-02-28 20:38:46.310547562 -0800
    1367414338@@ -1,6 +1,6 @@
    1367514339-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
    … …  
    1369014354 LD             = @LD@
    1369114355 LN_S           = @LN_S@
     14356diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c
     14357--- 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
     14359@@ -1,5 +1,5 @@
     14360 /****************************************************************************
     14361- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
     14362+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     14363  *                                                                          *
     14364  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14365  * copy of this software and associated documentation files (the            *
     14366@@ -37,7 +37,7 @@
     14367 
     14368 #include "menu.priv.h"
     14369 
     14370-MODULE_ID("$Id: m_cursor.c,v 1.20 2005/10/22 23:03:32 tom Exp $")
     14371+MODULE_ID("$Id: m_cursor.c,v 1.21 2009/02/28 21:02:46 juergen Exp $")
     14372 
     14373 /*---------------------------------------------------------------------------
     14374 |   Facility      :  libnmenu
     14375@@ -90,7 +90,7 @@
     14376 
     14377   if (E_OK == err)
     14378     {
     14379-      win = menu->userwin ? menu->userwin : stdscr;
     14380+      win = Get_Menu_UserWin(menu);
     14381       sub = menu->usersub ? menu->usersub : win;
     14382       assert(win && sub);
     14383 
     14384diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c
     14385--- 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
     14387@@ -1,5 +1,5 @@
     14388 /****************************************************************************
     14389- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
     14390+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     14391  *                                                                          *
     14392  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14393  * copy of this software and associated documentation files (the            *
     14394@@ -37,7 +37,7 @@
     14395 
     14396 #include "menu.priv.h"
     14397 
     14398-MODULE_ID("$Id: m_driver.c,v 1.27 2008/08/03 22:08:22 tom Exp $")
     14399+MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $")
     14400 
     14401 /* Macros */
     14402 
     14403@@ -197,7 +197,7 @@
     14404 
     14405 /*---------------------------------------------------------------------------
     14406 |   Facility      :  libnmenu
     14407-|   Function      :  int menu_driver(MENU *menu, int c)
     14408+|   Function      :  int menu_driver(MENU* menu, int c)
     14409 |
     14410 |   Description   :  Central dispatcher for the menu. Translates the logical
     14411 |                    request 'c' into a menu action.
     14412diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h
     14413--- 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
     14415@@ -1,5 +1,5 @@
     14416 /****************************************************************************
     14417- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
     14418+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     14419  *                                                                          *
     14420  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14421  * copy of this software and associated documentation files (the            *
     14422@@ -30,7 +30,7 @@
     14423  *   Author:  Juergen Pfeifer, 1995,1997                                    *
     14424  ****************************************************************************/
     14425 
     14426-/* $Id: menu.priv.h,v 1.22 2005/01/16 01:02:23 tom Exp $ */
     14427+/* $Id: menu.priv.h,v 1.23 2009/02/28 21:02:57 juergen Exp $ */
     14428 
     14429 /***************************************************************************
     14430 * Module menu.priv.h                                                       *
     14431@@ -56,8 +56,12 @@
     14432 /* Normalize menu to default if none was given */
     14433 #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu)
     14434 
     14435+#define Get_Menu_Screen( menu ) (menu->userwin ? \
     14436+                                _nc_screen_of(menu->userwin) : CURRENT_SCREEN)
     14437+
     14438 /* Get the user defined (framing) window of the menu */
     14439-#define Get_Menu_UserWin(menu) ((menu)->userwin ? (menu)->userwin : stdscr)
     14440+#define Get_Menu_UserWin(menu) ((menu)->userwin ? \
     14441+    (menu)->userwin : CURRENT_SCREEN->_stdscr)
     14442 
     14443 /* Normalize menu window */
     14444 #define Get_Menu_Window(  menu ) \
     14445diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c
     14446--- 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
     14448@@ -1,5 +1,5 @@
     14449 /****************************************************************************
     14450- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
     14451+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     14452  *                                                                          *
     14453  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14454  * copy of this software and associated documentation files (the            *
     14455@@ -37,7 +37,7 @@
     14456 
     14457 #include "menu.priv.h"
     14458 
     14459-MODULE_ID("$Id: m_global.c,v 1.23 2005/12/31 21:51:52 tom Exp $")
     14460+MODULE_ID("$Id: m_global.c,v 1.24 2009/02/28 21:02:46 juergen Exp $")
     14461 
     14462 static char mark[] = "-";
     14463 /* *INDENT-OFF* */
     14464@@ -496,7 +496,7 @@
     14465 
     14466 /*---------------------------------------------------------------------------
     14467 |   Facility      :  libnmenu 
     14468-|   Function      :  void _nc_Show_Menu(const MENU *menu)
     14469+|   Function      :  void _nc_Show_Menu(const MENU* menu)
     14470 |   
     14471 |   Description   :  Update the window that is associated with the menu
     14472 |
     14473@@ -543,8 +543,10 @@
     14474 |   Return Values :  -
     14475 +--------------------------------------------------------------------------*/
     14476 NCURSES_EXPORT(void)
     14477-  _nc_New_TopRow_and_CurrentItem
     14478-  (MENU * menu, int new_toprow, ITEM * new_current_item)
     14479+_nc_New_TopRow_and_CurrentItem(
     14480+                               MENU * menu,
     14481+                               int new_toprow,
     14482+                               ITEM * new_current_item)
     14483 {
     14484   ITEM *cur_item;
     14485   bool mterm_called = FALSE;
     14486diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c
     14487--- 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
     14489@@ -1,5 +1,5 @@
     14490 /****************************************************************************
     14491- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
     14492+ * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
     14493  *                                                                          *
     14494  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14495  * copy of this software and associated documentation files (the            *
     14496@@ -37,7 +37,7 @@
     14497 
     14498 #include "menu.priv.h"
     14499 
     14500-MODULE_ID("$Id: m_post.c,v 1.26 2004/12/25 23:57:04 tom Exp $")
     14501+MODULE_ID("$Id: m_post.c,v 1.27 2009/02/28 21:02:46 juergen Exp $")
     14502 
     14503 /*---------------------------------------------------------------------------
     14504 |   Facility      :  libnmenu
     14505@@ -255,7 +255,7 @@
     14506 
     14507 /*---------------------------------------------------------------------------
     14508 |   Facility      :  libnmenu
     14509-|   Function      :  int post_menu(MENU *)
     14510+|   Function      :  int post_menu(MENU* menu)
     14511 |
     14512 |   Description   :  Post a menu to the screen. This makes it visible.
     14513 |
     14514@@ -329,7 +329,7 @@
     14515 
     14516 /*---------------------------------------------------------------------------
     14517 |   Facility      :  libnmenu
     14518-|   Function      :  int unpost_menu(MENU *)
     14519+|   Function      :  int unpost_menu(MENU*)
     14520 |
     14521 |   Description   :  Detach menu from screen
     14522 |
    1369214523diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
    1369314524--- ncurses-5.7.orig/misc/gen-pkgconfig.in      1969-12-31 16:00:00.000000000 -0800
    13694 +++ ncurses-5.7/misc/gen-pkgconfig.in   2009-01-27 16:45:05.084820505 -0800
     14525+++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-28 20:38:53.014978628 -0800
    1369514526@@ -0,0 +1,119 @@
    1369614527+#!@SHELL@
    … …  
    1381514646diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
    1381614647--- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
    13817 +++ ncurses-5.7/misc/Makefile.in        2009-01-27 16:45:05.084820505 -0800
     14648+++ ncurses-5.7/misc/Makefile.in        2009-02-28 20:38:54.335061600 -0800
    1381814649@@ -1,6 +1,6 @@
    1381914650-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
    13820 +# $Id: Makefile.in,v 1.50 2009/01/24 21:42:15 tom Exp $
     14651+# $Id: Makefile.in,v 1.51 2009/02/07 18:17:17 Miroslav.Lichvar Exp $
    1382114652 ##############################################################################
    1382214653-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
    … …  
    1385314684        $(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
    1385414685 
    13855 +@MAKE_PC_FILES@install.libs :: pc-files
    13856 +@MAKE_PC_FILES@        $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
     14686+@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
     14687+@MAKE_PC_FILES@        $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
    1385714688+
    1385814689+@MAKE_PC_FILES@sources :: pc-files
    … …  
    1386414695        echo '** adjusting tabset paths'
    1386514696        sed -f run_tic.sed $(source) >terminfo.tmp
    13866 @@ -130,6 +140,7 @@
     14697@@ -118,7 +128,8 @@
     14698 $(DESTDIR)$(bindir) \
     14699 $(DESTDIR)$(libdir) \
     14700 $(DESTDIR)$(datadir) \
     14701-$(DESTDIR)$(tabsetdir) :
     14702+$(DESTDIR)$(tabsetdir) \
     14703+$(DESTDIR)$(PKG_CONFIG_LIBDIR) :
     14704        $(SHELL) $(top_srcdir)/mkdirs.sh $@
     14705 
     14706 uninstall : uninstall.data uninstall.libs
     14707@@ -130,6 +141,7 @@
    1386714708 
    1386814709 uninstall.libs :
    1386914710        -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
    13870 +@MAKE_PC_FILES@        $(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done'
     14711+@MAKE_PC_FILES@        $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
    1387114712 
    1387214713 tags :
    1387314714 
    13874 @@ -138,11 +149,13 @@
     14715@@ -138,11 +150,13 @@
    1387514716 mostlyclean :
    1387614717        -rm -f terminfo.tmp
    … …  
    1388614727 
    1388714728 realclean : distclean
     14729diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent
     14730--- 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
     14732@@ -26,7 +26,7 @@
     14733 #* sale, use or other dealings in this Software without prior written       *
     14734 #* authorization.                                                           *
     14735 #****************************************************************************/
     14736-# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $
     14737+# $Id: ncu-indent,v 1.20 2009/02/21 20:56:23 tom Exp $
     14738 NOOP=no
     14739 OPTS='
     14740 --blank-lines-after-procedures
     14741@@ -44,6 +44,8 @@
     14742 --swallow-optional-blank-lines
     14743 --tab-size8
     14744 
     14745+-T NCURSES_SP_ARGx
     14746+-T NCURSES_SP_DCLx
     14747 -T NCURSES_EXPORT_VAR
     14748 -T NCURSES_INLINE
     14749 -T SCREEN
     14750@@ -88,11 +90,12 @@
     14751                mv "$name" "$save"
     14752                sed \
     14753                        -e '/EMPTY_MODULE(/s/)$/);/' \
     14754+                       -e 's,\(MODULEID(\),//\1,' \
     14755                        -e '/MODULE_ID(/s/)$/);/' \
     14756                        -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
     14757                        -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
     14758                        -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
     14759-                       -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
     14760+                       -e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \
     14761                        "$save" >"$test"
     14762                cp "$test" "$name"
     14763                chmod u+w "$name"
     14764@@ -100,11 +103,12 @@
     14765                ${INDENT_PROG-indent} -npro $OPTS "$name"
     14766                sed \
     14767                        -e '/EMPTY_MODULE(/s/);$/)/' \
     14768+                       -e 's,//\(MODULEID(\),\1,' \
     14769                        -e '/MODULE_ID(/s/);$/)/' \
     14770                        -e 's,;[        ]*//GCC_NORETURN;, GCC_NORETURN;,' \
     14771                        -e 's,;[        ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
     14772                        -e 's,;[        ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
     14773-                       -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
     14774+                       -e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \
     14775                        "$name" >"$test"
     14776                mv "$test" "$name"
     14777                rm -f "${name}~"
    1388814778diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
    1388914779--- ncurses-5.7.orig/misc/ncurses-config.in     2007-03-17 13:02:19.000000000 -0700
    13890 +++ ncurses-5.7/misc/ncurses-config.in  2009-01-27 16:45:05.084820505 -0800
     14780+++ ncurses-5.7/misc/ncurses-config.in  2009-02-28 20:38:53.014978628 -0800
    1389114781@@ -1,7 +1,7 @@
    1389214782 #!@SHELL@
    … …  
    1401514905diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
    1401614906--- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
    14017 +++ ncurses-5.7/misc/terminfo.src       2009-01-27 16:45:02.352643385 -0800
     14907+++ ncurses-5.7/misc/terminfo.src       2009-02-28 20:38:50.326805978 -0800
    1401814908@@ -6,8 +6,8 @@
    1401914909 # Report bugs and new terminal descriptions to
    … …  
    1418115071diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
    1418215072--- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
    14183 +++ ncurses-5.7/mk-1st.awk      2009-01-27 16:44:59.364453973 -0800
     15073+++ ncurses-5.7/mk-1st.awk      2009-02-28 20:38:47.598636401 -0800
    1418415074@@ -1,6 +1,6 @@
    1418515075-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
    … …  
    1420915099                                if ( host == "vxworks" )
    1421015100                                {
     15101diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c
     15102--- 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
     15104@@ -1,5 +1,5 @@
     15105 /****************************************************************************
     15106- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
     15107+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
     15108  *                                                                          *
     15109  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15110  * copy of this software and associated documentation files (the            *
     15111@@ -27,20 +27,21 @@
     15112  ****************************************************************************/
     15113 
     15114 /****************************************************************************
     15115- *  Author: Thomas E. Dickey                    1997-on                     *
     15116+ *  Author: Thomas E. Dickey                        1997-on                 *
     15117+ *     and: Juergen Pfeifer                         2009                    *
     15118  ****************************************************************************/
     15119 
     15120 #include <curses.priv.h>
     15121 
     15122-MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $")
     15123+MODULE_ID("$Id: define_key.c,v 1.15 2009/02/15 00:30:40 tom Exp $")
     15124 
     15125 NCURSES_EXPORT(int)
     15126-define_key(const char *str, int keycode)
     15127+NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
     15128 {
     15129     int code = ERR;
     15130 
     15131     T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode));
     15132-    if (SP == 0) {
     15133+    if (SP_PARM == 0) {
     15134        code = ERR;
     15135     } else if (keycode > 0) {
     15136        unsigned ukey = (unsigned) keycode;
     15137@@ -48,12 +49,12 @@
     15138        if (str != 0) {
     15139            define_key(str, 0);
     15140        } else if (has_key(keycode)) {
     15141-           while (_nc_remove_key(&(SP->_keytry), ukey))
     15142+           while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
     15143                code = OK;
     15144        }
     15145        if (str != 0) {
     15146            if (key_defined(str) == 0) {
     15147-               if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) {
     15148+               if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) {
     15149                    code = OK;
     15150                } else {
     15151                    code = ERR;
     15152@@ -63,8 +64,16 @@
     15153            }
     15154        }
     15155     } else {
     15156-       while (_nc_remove_string(&(SP->_keytry), str))
     15157+       while (_nc_remove_string(&(SP_PARM->_keytry), str))
     15158            code = OK;
     15159     }
     15160     returnCode(code);
     15161 }
     15162+
     15163+#if NCURSES_SP_FUNCS
     15164+NCURSES_EXPORT(int)
     15165+define_key(const char *str, int keycode)
     15166+{
     15167+    return NCURSES_SP_NAME(define_key) (CURRENT_SCREEN, str, keycode);
     15168+}
     15169+#endif
     15170diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c
     15171--- 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
     15173@@ -1,5 +1,5 @@
     15174 /****************************************************************************
     15175- * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
     15176+ * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc.              *
     15177  *                                                                          *
     15178  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15179  * copy of this software and associated documentation files (the            *
     15180@@ -27,25 +27,34 @@
     15181  ****************************************************************************/
     15182 
     15183 /****************************************************************************
     15184- *  Author: Thomas E. Dickey                 1999-on                        *
     15185+ *  Author: Thomas E. Dickey                        1999-on                 *
     15186+ *     and: Juergen Pfeifer                         2009                    *
     15187  ****************************************************************************/
     15188 
     15189 #include <curses.priv.h>
     15190 
     15191-MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $")
     15192+MODULE_ID("$Id: keybound.c,v 1.9 2009/02/21 16:32:34 tom Exp $")
     15193 
     15194 /*
     15195  * Returns the count'th string definition which is associated with the
     15196  * given keycode.  The result is malloc'd, must be freed by the caller.
     15197  */
     15198 NCURSES_EXPORT(char *)
     15199-keybound(int code, int count)
     15200+NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count)
     15201 {
     15202     char *result = 0;
     15203 
     15204-    T((T_CALLED("keybound(%d,%d)"), code, count));
     15205-    if (SP != 0 && code >= 0) {
     15206-       result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0);
     15207+    T((T_CALLED("keybound(%p, %d,%d)"), SP_PARM, code, count));
     15208+    if (SP_PARM != 0 && code >= 0) {
     15209+       result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0);
     15210     }
     15211     returnPtr(result);
     15212 }
     15213+
     15214+#if NCURSES_SP_FUNCS
     15215+NCURSES_EXPORT(char *)
     15216+keybound(int code, int count)
     15217+{
     15218+    return NCURSES_SP_NAME(keybound) (CURRENT_SCREEN, code, count);
     15219+}
     15220+#endif
     15221diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c
     15222--- 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
     15224@@ -1,5 +1,5 @@
     15225 /****************************************************************************
     15226- * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
     15227+ * Copyright (c) 2003-2006,2009 Free Software Foundation, Inc.              *
     15228  *                                                                          *
     15229  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15230  * copy of this software and associated documentation files (the            *
     15231@@ -32,7 +32,7 @@
     15232 
     15233 #include <curses.priv.h>
     15234 
     15235-MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $")
     15236+MODULE_ID("$Id: key_defined.c,v 1.8 2009/02/21 16:24:26 tom Exp $")
     15237 
     15238 static int
     15239 find_definition(TRIES * tree, const char *str)
     15240@@ -65,14 +65,22 @@
     15241  * Otherwise, return the keycode's value (neither OK/ERR).
     15242  */
     15243 NCURSES_EXPORT(int)
     15244-key_defined(const char *str)
     15245+NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str)
     15246 {
     15247     int code = ERR;
     15248 
     15249-    T((T_CALLED("key_defined(%s)"), _nc_visbuf(str)));
     15250-    if (SP != 0 && str != 0) {
     15251-       code = find_definition(SP->_keytry, str);
     15252+    T((T_CALLED("key_defined(%p, %s)"), SP_PARM, _nc_visbuf(str)));
     15253+    if (SP_PARM != 0 && str != 0) {
     15254+       code = find_definition(SP_PARM->_keytry, str);
     15255     }
     15256 
     15257     returnCode(code);
     15258 }
     15259+
     15260+#if NCURSES_SP_FUNCS
     15261+NCURSES_EXPORT(int)
     15262+key_defined(const char *str)
     15263+{
     15264+    return NCURSES_SP_NAME(key_defined) (CURRENT_SCREEN, str);
     15265+}
     15266+#endif
     15267diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c
     15268--- 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
     15270@@ -1,5 +1,5 @@
     15271 /****************************************************************************
     15272- * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.              *
     15273+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
     15274  *                                                                          *
     15275  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15276  * copy of this software and associated documentation files (the            *
     15277@@ -27,12 +27,13 @@
     15278  ****************************************************************************/
     15279 
     15280 /****************************************************************************
     15281- *  Author: Thomas E. Dickey            1997-on                             *
     15282+ *  Author: Thomas E. Dickey                        1997-on                 *
     15283+ *     and: Juergen Pfeifer                         2009                    *
     15284  ****************************************************************************/
     15285 
     15286 #include <curses.priv.h>
     15287 
     15288-MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $")
     15289+MODULE_ID("$Id: keyok.c,v 1.8 2009/02/15 00:31:38 tom Exp $")
     15290 
     15291 /*
     15292  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
     15293@@ -45,7 +46,7 @@
     15294  */
     15295 
     15296 NCURSES_EXPORT(int)
     15297-keyok(int c, bool flag)
     15298+NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
     15299 {
     15300     int code = ERR;
     15301     int count = 0;
     15302@@ -55,18 +56,18 @@
     15303     if (c >= 0) {
     15304        unsigned ch = (unsigned) c;
     15305        if (flag) {
     15306-           while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0
     15307-                  && _nc_remove_key(&(SP->_key_ok), ch)) {
     15308-               code = _nc_add_to_try(&(SP->_keytry), s, ch);
     15309+           while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0
     15310+                  && _nc_remove_key(&(SP_PARM->_key_ok), ch)) {
     15311+               code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
     15312                free(s);
     15313                count = 0;
     15314                if (code != OK)
     15315                    break;
     15316            }
     15317        } else {
     15318-           while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0
     15319-                  && _nc_remove_key(&(SP->_keytry), ch)) {
     15320-               code = _nc_add_to_try(&(SP->_key_ok), s, ch);
     15321+           while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0
     15322+                  && _nc_remove_key(&(SP_PARM->_keytry), ch)) {
     15323+               code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
     15324                free(s);
     15325                count = 0;
     15326                if (code != OK)
     15327@@ -76,3 +77,11 @@
     15328     }
     15329     returnCode(code);
     15330 }
     15331+
     15332+#if NCURSES_SP_FUNCS
     15333+NCURSES_EXPORT(int)
     15334+keyok(int c, bool flag)
     15335+{
     15336+    return NCURSES_SP_NAME(keyok) (CURRENT_SCREEN, c, flag);
     15337+}
     15338+#endif
     15339diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c
     15340--- 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
     15342@@ -1,5 +1,5 @@
     15343 /****************************************************************************
     15344- * Copyright (c) 2005 Free Software Foundation, Inc.                        *
     15345+ * Copyright (c) 2005,2009 Free Software Foundation, Inc.                   *
     15346  *                                                                          *
     15347  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15348  * copy of this software and associated documentation files (the            *
     15349@@ -27,22 +27,31 @@
     15350  ****************************************************************************/
     15351 
     15352 /****************************************************************************
     15353- *  Author: Thomas E. Dickey                                                *
     15354+ *  Author: Thomas E. Dickey          2005                                  *
     15355+ *          Juergen Pfeifer           2009                                  *
     15356  ****************************************************************************/
     15357 
     15358 #include <curses.priv.h>
     15359 
     15360-MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $")
     15361+MODULE_ID("$Id: legacy_coding.c,v 1.4 2009/02/21 16:16:38 tom Exp $")
     15362 
     15363 NCURSES_EXPORT(int)
     15364-use_legacy_coding(int level)
     15365+NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level)
     15366 {
     15367     int result = ERR;
     15368 
     15369-    T((T_CALLED("use_legacy_coding(%d)"), level));
     15370-    if (level >= 0 && level <= 2 && SP != 0) {
     15371-       result = SP->_legacy_coding;
     15372-       SP->_legacy_coding = level;
     15373+    T((T_CALLED("use_legacy_coding(%p,%d)"), SP_PARM, level));
     15374+    if (level >= 0 && level <= 2 && SP_PARM != 0) {
     15375+       result = SP_PARM->_legacy_coding;
     15376+       SP_PARM->_legacy_coding = level;
     15377     }
     15378     returnCode(result);
     15379 }
     15380+
     15381+#if NCURSES_SP_FUNCS
     15382+NCURSES_EXPORT(int)
     15383+use_legacy_coding(int level)
     15384+{
     15385+    return NCURSES_SP_NAME(use_legacy_coding) (CURRENT_SCREEN, level);
     15386+}
     15387+#endif
    1421115388diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
    1421215389--- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
    14213 +++ ncurses-5.7/ncurses/base/lib_addch.c        2009-01-27 16:45:03.676729990 -0800
     15390+++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-28 20:38:51.642889230 -0800
    1421415391@@ -1,5 +1,5 @@
    1421515392 /****************************************************************************
    … …  
    1426615443            /*
    1426715444             * Check for cells which are orphaned by adding this character, set
     15445diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c
     15446--- 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
     15448@@ -1,5 +1,5 @@
     15449 /****************************************************************************
     15450- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     15451+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     15452  *                                                                          *
     15453  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15454  * copy of this software and associated documentation files (the            *
     15455@@ -30,6 +30,7 @@
     15456  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15457  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15458  *     and: Thomas E. Dickey                        1996-on                 *
     15459+ *     and: Juergen Pfeifer                         2009                    *
     15460  ****************************************************************************/
     15461 
     15462 /*
     15463@@ -42,7 +43,7 @@
     15464 #include <curses.priv.h>
     15465 #include <term.h>              /* beep, flash */
     15466 
     15467-MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $")
     15468+MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $")
     15469 
     15470 /*
     15471  *     beep()
     15472@@ -53,7 +54,7 @@
     15473  */
     15474 
     15475 NCURSES_EXPORT(int)
     15476-beep(void)
     15477+NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
     15478 {
     15479     int res = ERR;
     15480 
     15481@@ -74,3 +75,11 @@
     15482 
     15483     returnCode(res);
     15484 }
     15485+
     15486+#if NCURSES_SP_FUNCS
     15487+NCURSES_EXPORT(int)
     15488+beep(void)
     15489+{
     15490+    return NCURSES_SP_NAME(beep) (CURRENT_SCREEN);
     15491+}
     15492+#endif
    1426815493diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
    1426915494--- ncurses-5.7.orig/ncurses/base/lib_color.c   2007-04-07 10:07:28.000000000 -0700
    14270 +++ ncurses-5.7/ncurses/base/lib_color.c        2009-01-27 16:45:05.088820784 -0800
     15495+++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-28 20:38:57.047235367 -0800
    1427115496@@ -1,5 +1,5 @@
    1427215497 /****************************************************************************
    … …  
    1427615501  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1427715502  * copy of this software and associated documentation files (the            *
    14278 @@ -42,7 +42,7 @@
     15503@@ -30,6 +30,7 @@
     15504  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15505  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15506  *     and: Thomas E. Dickey                        1996-on                 *
     15507+ *     and: Juergen Pfeifer                         2009                    *
     15508  ****************************************************************************/
     15509 
     15510 /* lib_color.c
     15511@@ -42,7 +43,7 @@
    1427915512 #include <term.h>
    1428015513 #include <tic.h>
    1428115514 
    1428215515-MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $")
    14283 +MODULE_ID("$Id: lib_color.c,v 1.87 2009/01/25 00:25:31 tom Exp $")
     15516+MODULE_ID("$Id: lib_color.c,v 1.88 2009/02/15 00:33:02 tom Exp $")
    1428415517 
    1428515518 /*
    1428615519  * These should be screen structure members.  They need to be globals for
    14287 @@ -108,6 +108,13 @@
     15520@@ -108,6 +109,13 @@
    1428815521 };
    1428915522 /* *INDENT-ON* */
    … …  
    1429915532 /*
    1430015533  * These are called from _nc_do_color(), which in turn is called from
    14301 @@ -255,6 +262,15 @@
     15534@@ -237,15 +245,15 @@
     15535 }
     15536 
     15537 NCURSES_EXPORT(int)
     15538-start_color(void)
     15539+NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
     15540 {
     15541     int result = ERR;
     15542 
     15543     T((T_CALLED("start_color()")));
     15544 
     15545-    if (SP == 0) {
     15546+    if (SP_PARM == 0) {
     15547        result = ERR;
     15548-    } else if (SP->_coloron) {
     15549+    } else if (SP_PARM->_coloron) {
     15550        result = OK;
     15551     } else {
     15552 
     15553@@ -255,27 +263,38 @@
    1430215554        }
    1430315555 
    1430415556        if (max_pairs > 0 && max_colors > 0) {
    14305 +           SP->_pair_limit = max_pairs;
     15557-           SP->_pair_count = max_pairs;
     15558-           SP->_color_count = max_colors;
     15559+           SP_PARM->_pair_limit = max_pairs;
    1430615560+
    1430715561+#if NCURSES_EXT_FUNCS
    … …  
    1431015564+            * allow for default-color as a component of a color-pair.
    1431115565+            */
    14312 +           SP->_pair_limit += (1 + (2 * max_colors));
     15566+           SP_PARM->_pair_limit += (1 + (2 * max_colors));
    1431315567+#endif
    14314             SP->_pair_count = max_pairs;
    14315             SP->_color_count = max_colors;
     15568+           SP_PARM->_pair_count = max_pairs;
     15569+           SP_PARM->_color_count = max_colors;
    1431615570 #if !USE_REENTRANT
    14317 @@ -263,7 +279,7 @@
     15571            COLOR_PAIRS = max_pairs;
     15572            COLORS = max_colors;
    1431815573 #endif
    1431915574 
    14320             if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
     15575-           if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
    1432115576-                                               max_pairs)) != 0) {
    14322 +                                               SP->_pair_limit)) != 0) {
    14323                 if ((SP->_color_table = TYPE_CALLOC(color_t,
    14324                                                     max_colors)) != 0) {
    14325                     SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
    14326 @@ -331,21 +347,69 @@
    14327  init_pair(short pair, short f, short b)
     15577-               if ((SP->_color_table = TYPE_CALLOC(color_t,
     15578-                                                   max_colors)) != 0) {
     15579-                   SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
     15580+           SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t,
     15581+                                               SP_PARM->_pair_limit);
     15582+           if (SP_PARM->_color_pairs != 0) {
     15583+               SP_PARM->_color_table = TYPE_CALLOC(color_t, max_colors);
     15584+               if (SP_PARM->_color_table != 0) {
     15585+                   SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(),
     15586+                                                      default_bg());
     15587                    init_color_table();
     15588 
     15589                    T(("started color: COLORS = %d, COLOR_PAIRS = %d",
     15590                       COLORS, COLOR_PAIRS));
     15591 
     15592-                   SP->_coloron = 1;
     15593+                   SP_PARM->_coloron = 1;
     15594                    result = OK;
     15595-               } else if (SP->_color_pairs != 0) {
     15596-                   FreeAndNull(SP->_color_pairs);
     15597+               } else if (SP_PARM->_color_pairs != 0) {
     15598+                   FreeAndNull(SP_PARM->_color_pairs);
     15599                }
     15600            }
     15601        } else {
     15602@@ -285,6 +304,14 @@
     15603     returnCode(result);
     15604 }
     15605 
     15606+#if NCURSES_SP_FUNCS
     15607+NCURSES_EXPORT(int)
     15608+start_color(void)
     15609+{
     15610+    return NCURSES_SP_NAME(start_color) (CURRENT_SCREEN);
     15611+}
     15612+#endif
     15613+
     15614 /* This function was originally written by Daniel Weaver <danw@znyx.com> */
     15615 static void
     15616 rgb2hls(short r, short g, short b, short *h, short *l, short *s)
     15617@@ -328,24 +355,72 @@
     15618  * values.
     15619  */
     15620 NCURSES_EXPORT(int)
     15621-init_pair(short pair, short f, short b)
     15622+NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b)
    1432815623 {
    1432915624     colorpair_t result;
    … …  
    1433615631        returnCode(ERR);
    1433715632+
    14338 +    previous = SP->_color_pairs[pair];
     15633+    previous = SP_PARM->_color_pairs[pair];
    1433915634 #if NCURSES_EXT_FUNCS
    14340      if (SP->_default_color) {
     15635-    if (SP->_default_color) {
    1434115636-       if (f < 0)
     15637+    if (SP_PARM->_default_color) {
    1434215638+       bool isDefault = FALSE;
    1434315639+       bool wasDefault = FALSE;
    14344 +       int default_pairs = SP->_default_pairs;
     15640+       int default_pairs = SP_PARM->_default_pairs;
    1434515641+
    1434615642+       /*
    … …  
    1439215688+        * with sequentially adding new pairs.
    1439315689+        */
    14394 +       if (pair > (SP->_pair_count + default_pairs)) {
     15690+       if (pair > (SP_PARM->_pair_count + default_pairs)) {
    1439515691            returnCode(ERR);
    1439615692+       }
    14397 +       SP->_default_pairs = default_pairs;
     15693+       SP_PARM->_default_pairs = default_pairs;
    1439815694     } else
    1439915695 #endif
    1440015696     {
    14401 @@ -361,8 +425,8 @@
     15697@@ -361,8 +436,8 @@
    1440215698      * pair colors with the new ones).
    1440315699      */
    … …  
    1441015706 
    1441115707        for (y = 0; y <= curscr->_maxy; y++) {
    14412 @@ -496,11 +560,11 @@
     15708@@ -381,9 +456,9 @@
     15709                _nc_make_oldhash(y);
     15710        }
     15711     }
     15712-    SP->_color_pairs[pair] = result;
     15713-    if (GET_SCREEN_PAIR(SP) == pair)
     15714-       SET_SCREEN_PAIR(SP, (chtype) (~0));     /* force attribute update */
     15715+    SP_PARM->_color_pairs[pair] = result;
     15716+    if (GET_SCREEN_PAIR(SP_PARM) == pair)
     15717+       SET_SCREEN_PAIR(SP_PARM, (chtype) (~0));        /* force attribute update */
     15718 
     15719     if (initialize_pair && InPalette(f) && InPalette(b)) {
     15720        const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
     15721@@ -404,54 +479,79 @@
     15722     returnCode(OK);
     15723 }
     15724 
     15725+#if NCURSES_SP_FUNCS
     15726+NCURSES_EXPORT(int)
     15727+init_pair(short pair, short f, short b)
     15728+{
     15729+    return NCURSES_SP_NAME(init_pair) (CURRENT_SCREEN, pair, f, b);
     15730+}
     15731+#endif
     15732+
     15733 #define okRGB(n) ((n) >= 0 && (n) <= 1000)
     15734 
     15735 NCURSES_EXPORT(int)
     15736-init_color(short color, short r, short g, short b)
     15737+NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx
     15738+                            short color, short r, short g, short b)
     15739 {
     15740     int result = ERR;
     15741 
     15742     T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b));
     15743 
     15744     if (initialize_color != NULL
     15745-       && SP != 0
     15746-       && SP->_coloron
     15747+       && SP_PARM != 0
     15748+       && SP_PARM->_coloron
     15749        && (color >= 0 && OkColorHi(color))
     15750        && (okRGB(r) && okRGB(g) && okRGB(b))) {
     15751 
     15752-       SP->_color_table[color].init = 1;
     15753-       SP->_color_table[color].r = r;
     15754-       SP->_color_table[color].g = g;
     15755-       SP->_color_table[color].b = b;
     15756+       SP_PARM->_color_table[color].init = 1;
     15757+       SP_PARM->_color_table[color].r = r;
     15758+       SP_PARM->_color_table[color].g = g;
     15759+       SP_PARM->_color_table[color].b = b;
     15760 
     15761        if (hue_lightness_saturation) {
     15762            rgb2hls(r, g, b,
     15763-                   &SP->_color_table[color].red,
     15764-                   &SP->_color_table[color].green,
     15765-                   &SP->_color_table[color].blue);
     15766+                   &SP_PARM->_color_table[color].red,
     15767+                   &SP_PARM->_color_table[color].green,
     15768+                   &SP_PARM->_color_table[color].blue);
     15769        } else {
     15770-           SP->_color_table[color].red = r;
     15771-           SP->_color_table[color].green = g;
     15772-           SP->_color_table[color].blue = b;
     15773+           SP_PARM->_color_table[color].red = r;
     15774+           SP_PARM->_color_table[color].green = g;
     15775+           SP_PARM->_color_table[color].blue = b;
     15776        }
     15777 
     15778        TPUTS_TRACE("initialize_color");
     15779        putp(TPARM_4(initialize_color, color, r, g, b));
     15780-       SP->_color_defs = max(color + 1, SP->_color_defs);
     15781+       SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs);
     15782        result = OK;
     15783     }
     15784     returnCode(result);
     15785 }
     15786 
     15787+#if NCURSES_SP_FUNCS
     15788+NCURSES_EXPORT(int)
     15789+init_color(short color, short r, short g, short b)
     15790+{
     15791+    return NCURSES_SP_NAME(init_color) (CURRENT_SCREEN, color, r, g, b);
     15792+}
     15793+#endif
     15794+
     15795 NCURSES_EXPORT(bool)
     15796-can_change_color(void)
     15797+NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL0)
     15798 {
     15799     T((T_CALLED("can_change_color()")));
     15800     returnCode((can_change != 0) ? TRUE : FALSE);
     15801 }
     15802 
     15803+#if NCURSES_SP_FUNCS
     15804 NCURSES_EXPORT(bool)
     15805-has_colors(void)
     15806+can_change_color(void)
     15807+{
     15808+    return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN);
     15809+}
     15810+#endif
     15811+
     15812+NCURSES_EXPORT(bool)
     15813+NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
     15814 {
     15815     T((T_CALLED("has_colors()")));
     15816     returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
     15817@@ -462,18 +562,27 @@
     15818                    || set_color_pair)) ? TRUE : FALSE);
     15819 }
     15820 
     15821+#if NCURSES_SP_FUNCS
     15822+NCURSES_EXPORT(bool)
     15823+has_colors(void)
     15824+{
     15825+    return NCURSES_SP_NAME(has_colors) (CURRENT_SCREEN);
     15826+}
     15827+#endif
     15828+
     15829 NCURSES_EXPORT(int)
     15830-color_content(short color, short *r, short *g, short *b)
     15831+NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx short color, short *r,
     15832+                               short *g, short *b)
     15833 {
     15834     int result;
     15835 
     15836     T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b));
     15837-    if (color < 0 || !OkColorHi(color) || SP == 0 || !SP->_coloron) {
     15838+    if (color < 0 || !OkColorHi(color) || SP_PARM == 0 || !SP_PARM->_coloron) {
     15839        result = ERR;
     15840     } else {
     15841-       NCURSES_COLOR_T c_r = SP->_color_table[color].red;
     15842-       NCURSES_COLOR_T c_g = SP->_color_table[color].green;
     15843-       NCURSES_COLOR_T c_b = SP->_color_table[color].blue;
     15844+       NCURSES_COLOR_T c_r = SP_PARM->_color_table[color].red;
     15845+       NCURSES_COLOR_T c_g = SP_PARM->_color_table[color].green;
     15846+       NCURSES_COLOR_T c_b = SP_PARM->_color_table[color].blue;
     15847 
     15848        if (r)
     15849            *r = c_r;
     15850@@ -489,18 +598,27 @@
     15851     returnCode(result);
     15852 }
     15853 
     15854+#if NCURSES_SP_FUNCS
     15855 NCURSES_EXPORT(int)
     15856-pair_content(short pair, short *f, short *b)
     15857+color_content(short color, short *r, short *g, short *b)
     15858+{
     15859+    return NCURSES_SP_NAME(color_content) (CURRENT_SCREEN, color, r, g, b);
     15860+}
     15861+#endif
     15862+
     15863+NCURSES_EXPORT(int)
     15864+NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx short pair, short *f,
     15865+                              short *b)
     15866 {
     15867     int result;
    1441315868 
    1441415869     T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b));
    … …  
    1442015875-       NCURSES_COLOR_T fg = ((SP->_color_pairs[pair] >> C_SHIFT) & C_MASK);
    1442115876-       NCURSES_COLOR_T bg = (SP->_color_pairs[pair] & C_MASK);
    14422 +       NCURSES_COLOR_T fg = FORE_OF(SP->_color_pairs[pair]);
    14423 +       NCURSES_COLOR_T bg = BACK_OF(SP->_color_pairs[pair]);
     15877+       NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]);
     15878+       NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]);
    1442415879 
    1442515880 #if NCURSES_EXT_FUNCS
    1442615881        if (fg == COLOR_DEFAULT)
    14427 @@ -527,7 +591,7 @@
     15882@@ -520,6 +638,14 @@
     15883     returnCode(result);
     15884 }
     15885 
     15886+#if NCURSES_SP_FUNCS
     15887+NCURSES_EXPORT(int)
     15888+pair_content(short pair, short *f, short *b)
     15889+{
     15890+    return NCURSES_SP_NAME(pair_content) (CURRENT_SCREEN, pair, f, b);
     15891+}
     15892+#endif
     15893+
     15894 NCURSES_EXPORT(void)
     15895 _nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int))
     15896 {
     15897@@ -527,7 +653,7 @@
    1442815898     NCURSES_COLOR_T bg = COLOR_DEFAULT;
    1442915899     NCURSES_COLOR_T old_fg, old_bg;
    … …  
    1443615906diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
    1443715907--- ncurses-5.7.orig/ncurses/base/lib_colorset.c        2005-01-29 13:40:51.000000000 -0800
    14438 +++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-01-27 16:45:05.088820784 -0800
     15908+++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-28 20:38:53.014978628 -0800
    1443915909@@ -1,5 +1,5 @@
    1444015910 /****************************************************************************
    … …  
    1448215952+    returnCode(code);
    1448315953 }
     15954diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c
     15955--- 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
     15957@@ -1,5 +1,5 @@
     15958 /****************************************************************************
     15959- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
     15960+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     15961  *                                                                          *
     15962  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15963  * copy of this software and associated documentation files (the            *
     15964@@ -27,31 +27,40 @@
     15965  ****************************************************************************/
     15966 
     15967 /****************************************************************************
     15968- *  Author: Thomas E. Dickey                                                *
     15969+ *  Author: Thomas E. Dickey          1998-on                               *
     15970+ *          Juergen Pfeifer           2009                                  *
     15971  ****************************************************************************/
     15972 
     15973 #include <curses.priv.h>
     15974 #include <term.h>
     15975 
     15976-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $")
     15977+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.19 2009/02/14 21:53:21 tom Exp $")
     15978 
     15979 /*
     15980  * Modify the behavior of color-pair 0 so that the library doesn't assume that
     15981  * it is white on black.  This is an extension to XSI curses.
     15982  */
     15983 NCURSES_EXPORT(int)
     15984-use_default_colors(void)
     15985+NCURSES_SP_NAME(use_default_colors) (NCURSES_SP_DCL0)
     15986 {
     15987     T((T_CALLED("use_default_colors()")));
     15988-    returnCode(assume_default_colors(-1, -1));
     15989+    returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx - 1, -1));
     15990+}
     15991+
     15992+#if NCURSES_SP_FUNCS
     15993+NCURSES_EXPORT(int)
     15994+use_default_colors(void)
     15995+{
     15996+    return NCURSES_SP_NAME(use_default_colors) (CURRENT_SCREEN);
     15997 }
     15998+#endif
     15999 
     16000 /*
     16001  * Modify the behavior of color-pair 0 so that the library assumes that it
     16002  * is something specific, possibly not white on black.
     16003  */
     16004 NCURSES_EXPORT(int)
     16005-assume_default_colors(int fg, int bg)
     16006+NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg)
     16007 {
     16008     T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg));
     16009 
     16010@@ -61,15 +70,23 @@
     16011     if (initialize_pair)       /* don't know how to handle this */
     16012        returnCode(ERR);
     16013 
     16014-    SP->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
     16015-    SP->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
     16016-    SP->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK);
     16017-    SP->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK);
     16018-    if (SP->_color_pairs != 0) {
     16019-       bool save = SP->_default_color;
     16020-       SP->_default_color = TRUE;
     16021+    SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
     16022+    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
     16023+    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK);
     16024+    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK);
     16025+    if (SP_PARM->_color_pairs != 0) {
     16026+       bool save = SP_PARM->_default_color;
     16027+       SP_PARM->_default_color = TRUE;
     16028        init_pair(0, (short) fg, (short) bg);
     16029-       SP->_default_color = save;
     16030+       SP_PARM->_default_color = save;
     16031     }
     16032     returnCode(OK);
     16033 }
     16034+
     16035+#if NCURSES_SP_FUNCS
     16036+NCURSES_EXPORT(int)
     16037+assume_default_colors(int fg, int bg)
     16038+{
     16039+    return NCURSES_SP_NAME(assume_default_colors) (CURRENT_SCREEN, fg, bg);
     16040+}
     16041+#endif
     16042diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c
     16043--- 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
     16045@@ -1,5 +1,5 @@
     16046 /****************************************************************************
     16047- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     16048+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16049  *                                                                          *
     16050  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16051  * copy of this software and associated documentation files (the            *
     16052@@ -29,6 +29,8 @@
     16053 /****************************************************************************
     16054  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16055  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16056+ *     and: Thomas E. Dickey                        1996-on                 *
     16057+ *     and: Juergen Pfeifer                         2009                    *
     16058  ****************************************************************************/
     16059 
     16060 /*
     16061@@ -42,20 +44,40 @@
     16062 
     16063 #include <curses.priv.h>
     16064 
     16065-MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
     16066+MODULE_ID("$Id: lib_echo.c,v 1.7 2009/02/21 20:20:40 tom Exp $")
     16067 
     16068 NCURSES_EXPORT(int)
     16069+NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
     16070+{
     16071+    T((T_CALLED("echo(%p)"), SP_PARM));
     16072+    if (0 == SP_PARM)
     16073+       returnCode(ERR);
     16074+    SP_PARM->_echo = TRUE;
     16075+    returnCode(OK);
     16076+}
     16077+
     16078+#if NCURSES_SP_FUNCS
     16079+NCURSES_EXPORT(int)
     16080 echo(void)
     16081 {
     16082-    T((T_CALLED("echo()")));
     16083-    SP->_echo = TRUE;
     16084+    return NCURSES_SP_NAME(echo) (CURRENT_SCREEN);
     16085+}
     16086+#endif
     16087+
     16088+NCURSES_EXPORT(int)
     16089+NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
     16090+{
     16091+    T((T_CALLED("noecho(%p)"), SP_PARM));
     16092+    if (0 == SP_PARM)
     16093+       returnCode(ERR);
     16094+    SP_PARM->_echo = FALSE;
     16095     returnCode(OK);
     16096 }
     16097 
     16098+#if NCURSES_SP_FUNCS
     16099 NCURSES_EXPORT(int)
     16100 noecho(void)
     16101 {
     16102-    T((T_CALLED("noecho()")));
     16103-    SP->_echo = FALSE;
     16104-    returnCode(OK);
     16105+    return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN);
     16106 }
     16107+#endif
     16108diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
     16109--- 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
     16111@@ -1,5 +1,5 @@
     16112 /****************************************************************************
     16113- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     16114+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16115  *                                                                          *
     16116  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16117  * copy of this software and associated documentation files (the            *
     16118@@ -29,6 +29,8 @@
     16119 /****************************************************************************
     16120  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16121  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16122+ *     and: Thomas E. Dickey                        1996-on                 *
     16123+ *     and: Juergen Pfeifer                         2009                    *
     16124  ****************************************************************************/
     16125 
     16126 /*
     16127@@ -41,16 +43,16 @@
     16128 #include <curses.priv.h>
     16129 #include <term.h>
     16130 
     16131-MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $")
     16132+MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")
     16133 
     16134 NCURSES_EXPORT(int)
     16135-endwin(void)
     16136+NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
     16137 {
     16138     T((T_CALLED("endwin()")));
     16139 
     16140-    if (SP) {
     16141-       SP->_endwin = TRUE;
     16142-       SP->_mouse_wrap(SP);
     16143+    if (SP_PARM) {
     16144+       SP_PARM->_endwin = TRUE;
     16145+       SP_PARM->_mouse_wrap(SP_PARM);
     16146        _nc_screen_wrap();
     16147        _nc_mvcur_wrap();       /* wrap up cursor addressing */
     16148        returnCode(reset_shell_mode());
     16149@@ -58,3 +60,11 @@
     16150 
     16151     returnCode(ERR);
     16152 }
     16153+
     16154+#if NCURSES_SP_FUNCS
     16155+NCURSES_EXPORT(int)
     16156+endwin(void)
     16157+{
     16158+    return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);
     16159+}
     16160+#endif
     16161diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
     16162--- 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
     16164@@ -1,5 +1,5 @@
     16165 /****************************************************************************
     16166- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     16167+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16168  *                                                                          *
     16169  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16170  * copy of this software and associated documentation files (the            *
     16171@@ -29,6 +29,8 @@
     16172 /****************************************************************************
     16173  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16174  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16175+ *     and: Thomas E. Dickey                        1996-on                 *
     16176+ *     and: Juergen Pfeifer                         2009                    *
     16177  ****************************************************************************/
     16178 
     16179 /*
     16180@@ -41,7 +43,7 @@
     16181 #include <curses.priv.h>
     16182 #include <term.h>              /* beep, flash */
     16183 
     16184-MODULE_ID("$Id: lib_flash.c,v 1.6 2000/12/10 02:43:27 tom Exp $")
     16185+MODULE_ID("$Id: lib_flash.c,v 1.7 2009/02/15 00:35:15 tom Exp $")
     16186 
     16187 /*
     16188  *     flash()
     16189@@ -52,7 +54,7 @@
     16190  */
     16191 
     16192 NCURSES_EXPORT(int)
     16193-flash(void)
     16194+NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)
     16195 {
     16196     int res = ERR;
     16197 
     16198@@ -71,3 +73,11 @@
     16199 
     16200     returnCode(res);
     16201 }
     16202+
     16203+#if NCURSES_SP_FUNCS
     16204+NCURSES_EXPORT(int)
     16205+flash(void)
     16206+{
     16207+    return NCURSES_SP_NAME(flash) (CURRENT_SCREEN);
     16208+}
     16209+#endif
    1448416210diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
    1448516211--- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
    14486 +++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-01-27 16:44:49.391812822 -0800
     16212+++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-28 20:38:39.770130185 -0800
    1448716213@@ -40,7 +40,7 @@
    1448816214 extern int malloc_errfd;       /* FIXME */
    … …  
    1450316229     (void) _nc_printf_string(0, empty_va);
    1450416230 #ifdef TRACE
     16231diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c
     16232--- 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
     16234@@ -1,5 +1,5 @@
     16235 /****************************************************************************
     16236- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16237+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16238  *                                                                          *
     16239  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16240  * copy of this software and associated documentation files (the            *
     16241@@ -30,6 +30,7 @@
     16242  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16243  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16244  *     and: Thomas E. Dickey                        1996-on                 *
     16245+ *     and: Juergen Pfeifer                         2009                    *
     16246  ****************************************************************************/
     16247 
     16248 /*
     16249@@ -41,7 +42,7 @@
     16250 
     16251 #include <curses.priv.h>
     16252 
     16253-MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $")
     16254+MODULE_ID("$Id: lib_getch.c,v 1.101 2009/02/28 19:16:40 tom Exp $")
     16255 
     16256 #include <fifo_defs.h>
     16257 
     16258@@ -54,27 +55,36 @@
     16259 }
     16260 #else
     16261 #define GetEscdelay(sp) ESCDELAY
     16262-NCURSES_EXPORT_VAR(int)
     16263-ESCDELAY = 1000;               /* max interval betw. chars in funkeys, in millisecs */
     16264+NCURSES_EXPORT_VAR (int)
     16265+  ESCDELAY = 1000;             /* max interval betw. chars in funkeys, in millisecs */
     16266 #endif
     16267 
     16268 #if NCURSES_EXT_FUNCS
     16269 NCURSES_EXPORT(int)
     16270-set_escdelay(int value)
     16271+NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value)
     16272 {
     16273     int code = OK;
     16274 #if USE_REENTRANT
     16275-    if (SP) {
     16276-       SP->_ESCDELAY = value;
     16277+    if (SP_PARM) {
     16278+       SP_PARM->_ESCDELAY = value;
     16279     } else {
     16280        code = ERR;
     16281     }
     16282 #else
     16283+    (void) SP_PARM;
     16284     ESCDELAY = value;
     16285 #endif
     16286     return code;
     16287 }
     16288+
     16289+#if NCURSES_SP_FUNCS
     16290+NCURSES_EXPORT(int)
     16291+set_escdelay(int value)
     16292+{
     16293+    return NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
     16294+}
     16295 #endif
     16296+#endif /* NCURSES_EXT_FUNCS */
     16297 
     16298 static int
     16299 _nc_use_meta(WINDOW *win)
     16300@@ -84,9 +94,9 @@
     16301 }
     16302 
     16303 #ifdef NCURSES_WGETCH_EVENTS
     16304-#define TWAIT_MASK 7
     16305+#define TWAIT_MASK (TW_ANY | TW_EVENT)
     16306 #else
     16307-#define TWAIT_MASK 3
     16308+#define TWAIT_MASK TW_ANY
     16309 #endif
     16310 
     16311 /*
     16312@@ -109,7 +119,7 @@
     16313        && (sp->_sysmouse_head < sp->_sysmouse_tail)
     16314        && (rc == 0)
     16315        && (errno == EINTR)) {
     16316-       rc |= 2;
     16317+       rc |= TW_MOUSE;
     16318     }
     16319 #endif
     16320     return rc;
     16321@@ -173,7 +183,7 @@
     16322     } else
     16323        mask = 0;
     16324 
     16325-    if (mask & 4) {
     16326+    if (mask & TW_EVENT) {
     16327        T(("fifo_push: ungetch KEY_EVENT"));
     16328        _nc_ungetch(sp, KEY_EVENT);
     16329        return KEY_EVENT;
     16330@@ -185,7 +195,7 @@
     16331 #endif
     16332 
     16333 #if USE_GPM_SUPPORT || USE_EMX_MOUSE
     16334-    if ((sp->_mouse_fd >= 0) && (mask & 2)) {
     16335+    if ((sp->_mouse_fd >= 0) && (mask & TW_MOUSE)) {
     16336        sp->_mouse_event(sp);
     16337        ch = KEY_MOUSE;
     16338        n = 1;
     16339@@ -260,12 +270,12 @@
     16340 {
     16341 #ifdef USE_PTHREADS
     16342     SCREEN *sp = _nc_screen_of(win);
     16343-    if (_nc_use_pthreads && sp != SP) {
     16344+    if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
     16345        SCREEN *save_SP;
     16346 
     16347        /* temporarily switch to the window's screen to check/refresh */
     16348        _nc_lock_global(curses);
     16349-       save_SP = SP;
     16350+       save_SP = CURRENT_SCREEN;
     16351        _nc_set_screen(sp);
     16352        recur_wrefresh(win);
     16353        _nc_set_screen(save_SP);
     16354@@ -286,12 +296,12 @@
     16355 
     16356     if (sp != 0) {
     16357 #ifdef USE_PTHREADS
     16358-       if (_nc_use_pthreads && sp != SP) {
     16359+       if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
     16360            SCREEN *save_SP;
     16361 
     16362            /* temporarily switch to the window's screen to get cooked input */
     16363            _nc_lock_global(curses);
     16364-           save_SP = SP;
     16365+           save_SP = CURRENT_SCREEN;
     16366            _nc_set_screen(sp);
     16367            rc = recur_wgetnstr(win, buf);
     16368            _nc_set_screen(save_SP);
     16369@@ -402,7 +412,7 @@
     16370            rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl));
     16371 
     16372 #ifdef NCURSES_WGETCH_EVENTS
     16373-           if (rc & 4) {
     16374+           if (rc & TW_EVENT) {
     16375                *result = KEY_EVENT;
     16376                returnCode(KEY_CODE_YES);
     16377            }
     16378@@ -427,7 +437,7 @@
     16379         * increase the wait with mouseinterval().
     16380         */
     16381        int runcount = 0;
     16382-       int rc;
     16383+       int rc = 0;
     16384 
     16385        do {
     16386            ch = kgetch(sp EVENTLIST_2nd(evl));
     16387@@ -442,10 +452,10 @@
     16388            (ch == KEY_MOUSE
     16389             && (((rc = check_mouse_activity(sp, sp->_maxclick
     16390                                             EVENTLIST_2nd(evl))) != 0
     16391-                 && !(rc & 4))
     16392+                 && !(rc & TW_EVENT))
     16393                 || !sp->_mouse_parse(sp, runcount)));
     16394 #ifdef NCURSES_WGETCH_EVENTS
     16395-       if ((rc & 4) && !ch == KEY_EVENT) {
     16396+       if ((rc & TW_EVENT) && !(ch == KEY_EVENT)) {
     16397            _nc_ungetch(sp, ch);
     16398            ch = KEY_EVENT;
     16399        }
     16400@@ -645,7 +655,7 @@
     16401            TR(TRACE_IEVENT, ("waiting for rest of sequence"));
     16402            rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl));
     16403 #ifdef NCURSES_WGETCH_EVENTS
     16404-           if (rc & 4) {
     16405+           if (rc & TW_EVENT) {
     16406                TR(TRACE_IEVENT, ("interrupted by a user event"));
     16407                /* FIXME Should have preserved remainder timeleft for reuse... */
     16408                peek = head;    /* Restart interpreting later */
     16409diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c
     16410--- 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
     16412@@ -1,5 +1,5 @@
     16413 /****************************************************************************
     16414- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     16415+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16416  *                                                                          *
     16417  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16418  * copy of this software and associated documentation files (the            *
     16419@@ -29,6 +29,8 @@
     16420 /****************************************************************************
     16421  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16422  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16423+ *     and: Thomas E. Dickey                        1996-on                 *
     16424+ *     and: Juergen Pfeifer                         2009                    *
     16425  ****************************************************************************/
     16426 
     16427 /*
     16428@@ -40,12 +42,20 @@
     16429 
     16430 #include <curses.priv.h>
     16431 
     16432-MODULE_ID("$Id: lib_isendwin.c,v 1.6 2000/12/10 02:43:27 tom Exp $")
     16433+MODULE_ID("$Id: lib_isendwin.c,v 1.7 2009/02/15 00:36:24 tom Exp $")
     16434 
     16435 NCURSES_EXPORT(bool)
     16436-isendwin(void)
     16437+NCURSES_SP_NAME(isendwin) (NCURSES_SP_DCL0)
     16438 {
     16439-    if (SP == NULL)
     16440+    if (SP_PARM == NULL)
     16441        return FALSE;
     16442-    return SP->_endwin;
     16443+    return SP_PARM->_endwin;
     16444+}
     16445+
     16446+#if NCURSES_SP_FUNCS
     16447+NCURSES_EXPORT(bool)
     16448+isendwin(void)
     16449+{
     16450+    return NCURSES_SP_NAME(isendwin) (CURRENT_SCREEN);
     16451 }
     16452+#endif
    1450516453diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
    1450616454--- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
    14507 +++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-01-27 16:44:49.391812822 -0800
    14508 @@ -79,7 +79,7 @@
     16455+++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-28 20:38:59.859415560 -0800
     16456@@ -1,5 +1,5 @@
     16457 /****************************************************************************
     16458- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16459+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16460  *                                                                          *
     16461  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16462  * copy of this software and associated documentation files (the            *
     16463@@ -79,9 +79,8 @@
    1450916464 
    1451016465 #include <curses.priv.h>
    1451116466 
    1451216467-MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $")
    14513 +MODULE_ID("$Id: lib_mouse.c,v 1.104 2008/11/30 01:37:27 tom Exp $")
    14514  
    14515  #include <term.h>
     16468+MODULE_ID("$Id: lib_mouse.c,v 1.105 2009/02/28 21:09:20 tom Exp $")
     16469 
     16470-#include <term.h>
    1451616471 #include <tic.h>
    14517 @@ -694,11 +694,16 @@
     16472 
     16473 #if USE_GPM_SUPPORT
     16474@@ -150,7 +149,7 @@
     16475 #define LIBGPM_SONAME "libgpm.so"
     16476 #endif
     16477 
     16478-#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP->_dlopen_gpm, #name))
     16479+#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP_PARM->_dlopen_gpm, #name))
     16480 
     16481 #endif                         /* USE_GPM_SUPPORT */
     16482 
     16483@@ -164,13 +163,13 @@
     16484 #define LastEV(sp)     ((sp)->_mouse_events + EV_MAX - 1)
     16485 
     16486 #undef  NEXT
     16487-#define NEXT(ep)       ((ep >= LastEV(sp)) \
     16488-                        ? FirstEV(sp) \
     16489+#define NEXT(ep)       ((ep >= LastEV(SP_PARM)) \
     16490+                        ? FirstEV(SP_PARM) \
     16491                         : ep + 1)
     16492 
     16493 #undef  PREV
     16494-#define PREV(ep)       ((ep <= FirstEV(sp)) \
     16495-                        ? LastEV(sp) \
     16496+#define PREV(ep)       ((ep <= FirstEV(SP_PARM)) \
     16497+                        ? LastEV(SP_PARM) \
     16498                         : ep - 1)
     16499 
     16500 #define IndexEV(sp, ep)        (ep - FirstEV(sp))
     16501@@ -340,7 +339,7 @@
     16502 static void
     16503 handle_sysmouse(int sig GCC_UNUSED)
     16504 {
     16505-    sysmouse_server(SP);
     16506+    sysmouse_server(CURRENT_SCREEN);
     16507 }
     16508 #endif /* USE_SYSMOUSE */
     16509 
     16510@@ -359,7 +358,9 @@
     16511 #if USE_EMX_MOUSE
     16512     sp->_emxmouse_activated = enable;
     16513 #else
     16514-    putp(TPARM_1(sp->_mouse_xtermcap, enable));
     16515+    NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
     16516+                              "xterm-mouse",
     16517+                              TPARM_1(sp->_mouse_xtermcap, enable));
     16518 #endif
     16519     sp->_mouse_active = enable;
     16520 }
     16521@@ -398,7 +399,7 @@
     16522 static void
     16523 unload_gpm_library(SCREEN *sp)
     16524 {
     16525-    if (SP->_dlopen_gpm != 0) {
     16526+    if (sp->_dlopen_gpm != 0) {
     16527        T(("unload GPM library"));
     16528        sp->_mouse_gpm_loaded = FALSE;
     16529        sp->_mouse_fd = -1;
     16530@@ -694,11 +695,16 @@
    1451816531 
    1451916532 #if USE_GPM_SUPPORT
    … …  
    1453416547                eventp->id = NORMAL_EVENT;
    1453516548 
    14536 @@ -731,6 +736,7 @@
     16549@@ -731,6 +737,7 @@
    1453716550                /* bump the next-free pointer into the circular list */
    1453816551                sp->_mouse_eventp = eventp = NEXT(eventp);
    … …  
    1454216555        }
    1454316556        break;
    14544 @@ -1397,10 +1403,16 @@
    14545  
     16557@@ -937,7 +944,7 @@
     16558        switch (sp->_mouse_type) {
     16559        case M_XTERM:
     16560 #if NCURSES_EXT_FUNCS
     16561-           keyok(KEY_MOUSE, on);
     16562+           NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on);
     16563 #endif
     16564            TPUTS_TRACE("xterm mouse initialization");
     16565            enable_xterm_mouse(sp, 1);
     16566@@ -989,7 +996,7 @@
     16567            return;
     16568        }
     16569     }
     16570-    _nc_flush();
     16571+    NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     16572 }
     16573 
     16574 /**************************************************************************
     16575@@ -1264,13 +1271,13 @@
     16576  *
     16577  **************************************************************************/
     16578 
     16579-static int
     16580-_nc_getmouse(SCREEN *sp, MEVENT * aevent)
     16581+NCURSES_EXPORT(int)
     16582+NCURSES_SP_NAME(getmouse) (NCURSES_SP_DCLx MEVENT * aevent)
     16583 {
     16584-    T((T_CALLED("getmouse(%p)"), aevent));
     16585+    T((T_CALLED("getmouse(%p,%p)"), SP_PARM, aevent));
     16586 
     16587-    if ((aevent != 0) && (sp != 0) && (sp->_mouse_type != M_NONE)) {
     16588-       MEVENT *eventp = sp->_mouse_eventp;
     16589+    if ((aevent != 0) && (SP_PARM != 0) && (SP_PARM->_mouse_type != M_NONE)) {
     16590+       MEVENT *eventp = SP_PARM->_mouse_eventp;
     16591        /* compute the current-event pointer */
     16592        MEVENT *prev = PREV(eventp);
     16593 
     16594@@ -1278,8 +1285,8 @@
     16595        *aevent = *prev;
     16596 
     16597        TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld",
     16598-                         _nc_tracemouse(sp, prev),
     16599-                         (long) IndexEV(sp, prev)));
     16600+                         _nc_tracemouse(SP_PARM, prev),
     16601+                         (long) IndexEV(SP_PARM, prev)));
     16602 
     16603        prev->id = INVALID_EVENT;       /* so the queue slot becomes free */
     16604        returnCode(OK);
     16605@@ -1287,57 +1294,61 @@
     16606     returnCode(ERR);
     16607 }
     16608 
     16609+#if NCURSES_SP_FUNCS
     16610 /* grab a copy of the current mouse event */
     16611 NCURSES_EXPORT(int)
     16612 getmouse(MEVENT * aevent)
     16613 {
     16614-    return _nc_getmouse(SP, aevent);
     16615+    return NCURSES_SP_NAME(getmouse) (CURRENT_SCREEN, aevent);
     16616 }
     16617+#endif
     16618 
     16619-static int
     16620-_nc_ungetmouse(SCREEN *sp, MEVENT * aevent)
     16621+NCURSES_EXPORT(int)
     16622+NCURSES_SP_NAME(ungetmouse) (NCURSES_SP_DCLx MEVENT * aevent)
     16623 {
     16624     int result = ERR;
     16625 
     16626-    T((T_CALLED("ungetmouse(%p)"), aevent));
     16627+    T((T_CALLED("ungetmouse(%p,%p)"), SP_PARM, aevent));
     16628 
     16629-    if (aevent != 0 && sp != 0) {
     16630-       MEVENT *eventp = sp->_mouse_eventp;
     16631+    if (aevent != 0 && SP_PARM != 0) {
     16632+       MEVENT *eventp = SP_PARM->_mouse_eventp;
     16633 
     16634        /* stick the given event in the next-free slot */
     16635        *eventp = *aevent;
     16636 
     16637        /* bump the next-free pointer into the circular list */
     16638-       sp->_mouse_eventp = NEXT(eventp);
     16639+       SP_PARM->_mouse_eventp = NEXT(eventp);
     16640 
     16641        /* push back the notification event on the keyboard queue */
     16642-       result = _nc_ungetch(sp, KEY_MOUSE);
     16643+       result = NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx KEY_MOUSE);
     16644     }
     16645     returnCode(result);
     16646 }
     16647 
     16648+#if NCURSES_SP_FUNCS
     16649 /* enqueue a synthesized mouse event to be seen by the next wgetch() */
     16650 NCURSES_EXPORT(int)
     16651 ungetmouse(MEVENT * aevent)
     16652 {
     16653-    return _nc_ungetmouse(SP, aevent);
     16654+    return NCURSES_SP_NAME(ungetmouse) (CURRENT_SCREEN, aevent);
     16655 }
     16656+#endif
     16657 
     16658 NCURSES_EXPORT(mmask_t)
     16659-mousemask(mmask_t newmask, mmask_t * oldmask)
     16660+NCURSES_SP_NAME(mousemask) (NCURSES_SP_DCLx mmask_t newmask, mmask_t * oldmask)
     16661 /* set the mouse event mask */
     16662 {
     16663     mmask_t result = 0;
     16664 
     16665-    T((T_CALLED("mousemask(%#lx,%p)"), (unsigned long) newmask, oldmask));
     16666+    T((T_CALLED("mousemask(%p,%#lx,%p)"), SP_PARM, (unsigned long) newmask, oldmask));
     16667 
     16668-    if (SP != 0) {
     16669+    if (SP_PARM != 0) {
     16670        if (oldmask)
     16671-           *oldmask = SP->_mouse_mask;
     16672+           *oldmask = SP_PARM->_mouse_mask;
     16673 
     16674-       if (newmask || SP->_mouse_initialized) {
     16675-           _nc_mouse_init(SP);
     16676-           if (SP->_mouse_type != M_NONE) {
     16677+       if (newmask || SP_PARM->_mouse_initialized) {
     16678+           _nc_mouse_init(SP_PARM);
     16679+           if (SP_PARM->_mouse_type != M_NONE) {
     16680                result = newmask &
     16681                    (REPORT_MOUSE_POSITION
     16682                     | BUTTON_ALT
     16683@@ -1349,15 +1360,23 @@
     16684                     | BUTTON_DOUBLE_CLICKED
     16685                     | BUTTON_TRIPLE_CLICKED);
     16686 
     16687-               mouse_activate(SP, (bool) (result != 0));
     16688+               mouse_activate(SP_PARM, (bool) (result != 0));
     16689 
     16690-               SP->_mouse_mask = result;
     16691+               SP_PARM->_mouse_mask = result;
     16692            }
     16693        }
     16694     }
     16695     returnBits(result);
     16696 }
     16697 
     16698+#if NCURSES_SP_FUNCS
     16699+NCURSES_EXPORT(mmask_t)
     16700+mousemask(mmask_t newmask, mmask_t * oldmask)
     16701+{
     16702+    return NCURSES_SP_NAME(mousemask) (CURRENT_SCREEN, newmask, oldmask);
     16703+}
     16704+#endif
     16705+
     16706 NCURSES_EXPORT(bool)
     16707 wenclose(const WINDOW *win, int y, int x)
     16708 /* check to see if given window encloses given screen location */
     16709@@ -1377,17 +1396,17 @@
     16710 }
     16711 
     16712 NCURSES_EXPORT(int)
     16713-mouseinterval(int maxclick)
     16714+NCURSES_SP_NAME(mouseinterval) (NCURSES_SP_DCLx int maxclick)
     16715 /* set the maximum mouse interval within which to recognize a click */
     16716 {
     16717     int oldval;
     16718 
     16719-    T((T_CALLED("mouseinterval(%d)"), maxclick));
     16720+    T((T_CALLED("mouseinterval(%p,%d)"), SP_PARM, maxclick));
     16721 
     16722-    if (SP != 0) {
     16723-       oldval = SP->_maxclick;
     16724+    if (SP_PARM != 0) {
     16725+       oldval = SP_PARM->_maxclick;
     16726        if (maxclick >= 0)
     16727-           SP->_maxclick = maxclick;
     16728+           SP_PARM->_maxclick = maxclick;
     16729     } else {
     16730        oldval = DEFAULT_MAXCLICK;
     16731     }
     16732@@ -1395,15 +1414,37 @@
     16733     returnCode(oldval);
     16734 }
     16735 
     16736+#if NCURSES_SP_FUNCS
     16737+NCURSES_EXPORT(int)
     16738+mouseinterval(int maxclick)
     16739+{
     16740+    return NCURSES_SP_NAME(mouseinterval) (CURRENT_SCREEN, maxclick);
     16741+}
     16742+#endif
     16743+
    1454616744 /* This may be used by other routines to ask for the existence of mouse
    1454716745    support */
    … …  
    1455016748+NCURSES_EXPORT(bool)
    1455116749+_nc_has_mouse(SCREEN *sp)
     16750 {
     16751-    return (SP->_mouse_type == M_NONE ? 0 : 1);
     16752+    return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
     16753 }
     16754 
     16755 NCURSES_EXPORT(bool)
     16756+NCURSES_SP_NAME(has_mouse) (NCURSES_SP_DCL0)
    1455216757+{
    14553 +    return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);
     16758+    return _nc_has_mouse(SP_PARM);
    1455416759+}
    1455516760+
     16761+#if NCURSES_SP_FUNCS
    1455616762+NCURSES_EXPORT(bool)
    1455716763+has_mouse(void)
     16764+{
     16765+    return _nc_has_mouse(CURRENT_SCREEN);
     16766+}
     16767+#endif
     16768+
     16769+NCURSES_EXPORT(bool)
     16770 wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen)
    1455816771 {
    14559 -    return (SP->_mouse_type == M_NONE ? 0 : 1);
    14560 +    return _nc_has_mouse(SP);
    14561  }
    14562  
    14563  NCURSES_EXPORT(bool)
     16772     bool result = FALSE;
     16773diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c
     16774--- 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
     16776@@ -1,5 +1,5 @@
     16777 /****************************************************************************
     16778- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16779+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16780  *                                                                          *
     16781  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16782  * copy of this software and associated documentation files (the            *
     16783@@ -30,6 +30,7 @@
     16784  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16785  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16786  *     and: Thomas E. Dickey                        1996-on                 *
     16787+ *     and: Juergen Pfeifer                         2009                    *
     16788  ****************************************************************************/
     16789 
     16790 /*
     16791@@ -48,7 +49,7 @@
     16792 #include <term.h>              /* clear_screen, cup & friends, cur_term */
     16793 #include <tic.h>
     16794 
     16795-MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $")
     16796+MODULE_ID("$Id: lib_newterm.c,v 1.74 2009/02/15 00:37:10 tom Exp $")
     16797 
     16798 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
     16799 #define ONLCR 0
     16800@@ -95,7 +96,7 @@
     16801  * initialized.
     16802  */
     16803 NCURSES_EXPORT(void)
     16804-filter(void)
     16805+NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0)
     16806 {
     16807     START_TRACE();
     16808     T((T_CALLED("filter")));
     16809@@ -103,23 +104,40 @@
     16810     returnVoid;
     16811 }
     16812 
     16813+#if NCURSES_SP_FUNCS
     16814+NCURSES_EXPORT(void)
     16815+filter(void)
     16816+{
     16817+    NCURSES_SP_NAME(filter) (CURRENT_SCREEN);
     16818+}
     16819+#endif
     16820+
     16821 #if NCURSES_EXT_FUNCS
     16822 /*
     16823  * An extension, allowing the application to open a new screen without
     16824  * requiring it to also be filtered.
     16825  */
     16826 NCURSES_EXPORT(void)
     16827-nofilter(void)
     16828+NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0)
     16829 {
     16830     START_TRACE();
     16831     T((T_CALLED("nofilter")));
     16832     _nc_prescreen.filter_mode = FALSE;
     16833     returnVoid;
     16834 }
     16835+
     16836+#if NCURSES_SP_FUNCS
     16837+NCURSES_EXPORT(void)
     16838+nofilter(void)
     16839+{
     16840+    NCURSES_SP_NAME(nofilter) (CURRENT_SCREEN);
     16841+}
     16842 #endif
     16843+#endif /* NCURSES_EXT_FUNCS */
     16844 
     16845 NCURSES_EXPORT(SCREEN *)
     16846-newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
     16847+NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_CONST char *name, FILE
     16848+                         *ofp, FILE *ifp)
     16849 {
     16850     int value;
     16851     int errret;
     16852@@ -133,8 +151,8 @@
     16853     _nc_init_pthreads();
     16854     _nc_lock_global(curses);
     16855 
     16856-    current = SP;
     16857-    its_term = (SP ? SP->_term : 0);
     16858+    current = SP_PARM;
     16859+    its_term = (SP_PARM ? SP_PARM->_term : 0);
     16860 
     16861     /* this loads the capability entry, then sets LINES and COLS */
     16862     if (setupterm(name, fileno(ofp), &errret) != ERR) {
     16863@@ -159,7 +177,7 @@
     16864            _nc_set_screen(current);
     16865            result = 0;
     16866        } else {
     16867-           assert(SP != 0);
     16868+           assert(SP_PARM != 0);
     16869            /*
     16870             * In setupterm() we did a set_curterm(), but it was before we set
     16871             * SP.  So the "current" screen's terminal pointer was overwritten
     16872@@ -233,3 +251,11 @@
     16873     _nc_unlock_global(curses);
     16874     returnSP(result);
     16875 }
     16876+
     16877+#if NCURSES_SP_FUNCS
     16878+NCURSES_EXPORT(SCREEN *)
     16879+newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
     16880+{
     16881+    return NCURSES_SP_NAME(newterm) (CURRENT_SCREEN, name, ofp, ifp);
     16882+}
     16883+#endif
     16884diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c
     16885--- 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
     16887@@ -1,5 +1,5 @@
     16888 /****************************************************************************
     16889- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16890+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16891  *                                                                          *
     16892  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16893  * copy of this software and associated documentation files (the            *
     16894@@ -30,6 +30,7 @@
     16895  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16896  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16897  *     and: Thomas E. Dickey                        1996-on                 *
     16898+ *     and: Juergen Pfeifer                         2009                    *
     16899  ****************************************************************************/
     16900 
     16901 /*
     16902@@ -42,7 +43,7 @@
     16903 #include <curses.priv.h>
     16904 #include <stddef.h>
     16905 
     16906-MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $")
     16907+MODULE_ID("$Id: lib_newwin.c,v 1.53 2009/02/15 00:38:00 tom Exp $")
     16908 
     16909 #define window_is(name) ((sp)->_##name == win)
     16910 
     16911@@ -115,7 +116,8 @@
     16912 }
     16913 
     16914 NCURSES_EXPORT(WINDOW *)
     16915-newwin(int num_lines, int num_columns, int begy, int begx)
     16916+NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
     16917+                        int num_lines, int num_columns, int begy, int begx)
     16918 {
     16919     WINDOW *win;
     16920     NCURSES_CH_T *ptr;
     16921@@ -127,7 +129,7 @@
     16922        returnWin(0);
     16923 
     16924     if (num_lines == 0)
     16925-       num_lines = SP->_lines_avail - begy;
     16926+       num_lines = SP_PARM->_lines_avail - begy;
     16927     if (num_columns == 0)
     16928        num_columns = screen_columns - begx;
     16929 
     16930@@ -149,6 +151,15 @@
     16931     returnWin(win);
     16932 }
     16933 
     16934+#if NCURSES_SP_FUNCS
     16935+NCURSES_EXPORT(WINDOW *)
     16936+newwin(int num_lines, int num_columns, int begy, int begx)
     16937+{
     16938+    return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns,
     16939+                                   begy, begx);
     16940+}
     16941+#endif
     16942+
     16943 NCURSES_EXPORT(WINDOW *)
     16944 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
     16945 {
     16946diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c
     16947--- 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
     16949@@ -1,5 +1,5 @@
     16950 /****************************************************************************
     16951- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
     16952+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16953  *                                                                          *
     16954  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16955  * copy of this software and associated documentation files (the            *
     16956@@ -29,6 +29,8 @@
     16957 /****************************************************************************
     16958  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16959  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16960+ *     and: Thomas E. Dickey                        1996-on                 *
     16961+ *     and: Juergen Pfeifer                         2009                    *
     16962  ****************************************************************************/
     16963 
     16964 /*
     16965@@ -42,38 +44,52 @@
     16966 
     16967 #include <curses.priv.h>
     16968 
     16969-MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $")
     16970+MODULE_ID("$Id: lib_nl.c,v 1.10 2009/02/21 20:58:21 tom Exp $")
     16971 
     16972 #ifdef __EMX__
     16973 #include <io.h>
     16974 #endif
     16975 
     16976 NCURSES_EXPORT(int)
     16977-nl(void)
     16978+NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
     16979 {
     16980-    T((T_CALLED("nl()")));
     16981-
     16982-    SP->_nl = TRUE;
     16983-
     16984+    T((T_CALLED("nl(%p)"), SP_PARM));
     16985+    if (0 == SP_PARM)
     16986+       returnCode(ERR);
     16987+    SP_PARM->_nl = TRUE;
     16988 #ifdef __EMX__
     16989     _nc_flush();
     16990     _fsetmode(NC_OUTPUT, "t");
     16991 #endif
     16992-
     16993     returnCode(OK);
     16994 }
     16995 
     16996+#if NCURSES_SP_FUNCS
     16997 NCURSES_EXPORT(int)
     16998-nonl(void)
     16999+nl(void)
     17000 {
     17001-    T((T_CALLED("nonl()")));
     17002-
     17003-    SP->_nl = FALSE;
     17004+    return NCURSES_SP_NAME(nl) (CURRENT_SCREEN);
     17005+}
     17006+#endif
     17007 
     17008+NCURSES_EXPORT(int)
     17009+NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
     17010+{
     17011+    T((T_CALLED("nonl(%p)"), SP_PARM));
     17012+    if (0 == SP_PARM)
     17013+       returnCode(ERR);
     17014+    SP_PARM->_nl = FALSE;
     17015 #ifdef __EMX__
     17016     _nc_flush();
     17017     _fsetmode(NC_OUTPUT, "b");
     17018 #endif
     17019-
     17020     returnCode(OK);
     17021 }
     17022+
     17023+#if NCURSES_SP_FUNCS
     17024+NCURSES_EXPORT(int)
     17025+nonl(void)
     17026+{
     17027+    return NCURSES_SP_NAME(nonl) (CURRENT_SCREEN);
     17028+}
     17029+#endif
     17030diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c
     17031--- 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
     17033@@ -1,5 +1,5 @@
     17034 /****************************************************************************
     17035- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                   *
     17036+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.                   *
     17037  *                                                                          *
     17038  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17039  * copy of this software and associated documentation files (the            *
     17040@@ -29,6 +29,8 @@
     17041 /****************************************************************************
     17042  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17043  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17044+ *     and: Thomas E. Dickey                        1996-on                 *
     17045+ *     and: Juergen Pfeifer                         2009                    *
     17046  ****************************************************************************/
     17047 
     17048 /*
     17049@@ -40,10 +42,10 @@
     17050 
     17051 #include <curses.priv.h>
     17052 
     17053-MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $")
     17054+MODULE_ID("$Id: lib_pad.c,v 1.42 2009/02/15 00:38:48 tom Exp $")
     17055 
     17056 NCURSES_EXPORT(WINDOW *)
     17057-newpad(int l, int c)
     17058+NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
     17059 {
     17060     WINDOW *win;
     17061     NCURSES_CH_T *ptr;
     17062@@ -70,6 +72,14 @@
     17063     returnWin(win);
     17064 }
     17065 
     17066+#if NCURSES_SP_FUNCS
     17067+NCURSES_EXPORT(WINDOW *)
     17068+newpad(int l, int c)
     17069+{
     17070+    return NCURSES_SP_NAME(newpad) (CURRENT_SCREEN, l, c);
     17071+}
     17072+#endif
     17073+
     17074 NCURSES_EXPORT(WINDOW *)
     17075 subpad(WINDOW *orig, int l, int c, int begy, int begx)
     17076 {
     17077diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c
     17078--- 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
     17080@@ -1,5 +1,5 @@
     17081 /****************************************************************************
     17082- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     17083+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17084  *                                                                          *
     17085  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17086  * copy of this software and associated documentation files (the            *
     17087@@ -30,11 +30,12 @@
     17088  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17089  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17090  *     and: Thomas E. Dickey                        1996 on                 *
     17091+ *     and: Juergen Pfeifer                         2009                    *
     17092  ****************************************************************************/
     17093 
     17094 #include <curses.priv.h>
     17095 
     17096-MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $")
     17097+MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $")
     17098 
     17099 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
     17100 
     17101@@ -141,7 +142,7 @@
     17102 }
     17103 
     17104 NCURSES_EXPORT(int)
     17105-scr_restore(const char *file)
     17106+NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
     17107 {
     17108     FILE *fp = 0;
     17109 
     17110@@ -152,15 +153,23 @@
     17111        returnCode(ERR);
     17112     } else {
     17113        delwin(newscr);
     17114-       SP->_newscr = getwin(fp);
     17115+       SP_PARM->_newscr = getwin(fp);
     17116 #if !USE_REENTRANT
     17117-       newscr = SP->_newscr;
     17118+       newscr = SP_PARM->_newscr;
     17119 #endif
     17120        (void) fclose(fp);
     17121        returnCode(OK);
     17122     }
     17123 }
     17124 
     17125+#if NCURSES_SP_FUNCS
     17126+NCURSES_EXPORT(int)
     17127+scr_restore(const char *file)
     17128+{
     17129+    return NCURSES_SP_NAME(scr_restore) (CURRENT_SCREEN, file);
     17130+}
     17131+#endif
     17132+
     17133 NCURSES_EXPORT(int)
     17134 scr_dump(const char *file)
     17135 {
     17136@@ -179,7 +188,7 @@
     17137 }
     17138 
     17139 NCURSES_EXPORT(int)
     17140-scr_init(const char *file)
     17141+NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
     17142 {
     17143     FILE *fp = 0;
     17144 
     17145@@ -193,17 +202,25 @@
     17146        returnCode(ERR);
     17147     } else {
     17148        delwin(curscr);
     17149-       SP->_curscr = getwin(fp);
     17150+       SP_PARM->_curscr = getwin(fp);
     17151 #if !USE_REENTRANT
     17152-       curscr = SP->_curscr;
     17153+       curscr = SP_PARM->_curscr;
     17154 #endif
     17155        (void) fclose(fp);
     17156        returnCode(OK);
     17157     }
     17158 }
     17159 
     17160+#if NCURSES_SP_FUNCS
     17161 NCURSES_EXPORT(int)
     17162-scr_set(const char *file)
     17163+scr_init(const char *file)
     17164+{
     17165+    return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file);
     17166+}
     17167+#endif
     17168+
     17169+NCURSES_EXPORT(int)
     17170+NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file)
     17171 {
     17172     T((T_CALLED("scr_set(%s)"), _nc_visbuf(file)));
     17173 
     17174@@ -211,10 +228,18 @@
     17175        returnCode(ERR);
     17176     } else {
     17177        delwin(newscr);
     17178-       SP->_newscr = dupwin(curscr);
     17179+       SP_PARM->_newscr = dupwin(curscr);
     17180 #if !USE_REENTRANT
     17181-       newscr = SP->_newscr;
     17182+       newscr = SP_PARM->_newscr;
     17183 #endif
     17184        returnCode(OK);
     17185     }
     17186 }
     17187+
     17188+#if NCURSES_SP_FUNCS
     17189+NCURSES_EXPORT(int)
     17190+scr_set(const char *file)
     17191+{
     17192+    return NCURSES_SP_NAME(scr_set) (CURRENT_SCREEN, file);
     17193+}
     17194+#endif
     17195diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c
     17196--- 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
     17198@@ -1,5 +1,5 @@
     17199 /****************************************************************************
     17200- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     17201+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17202  *                                                                          *
     17203  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17204  * copy of this software and associated documentation files (the            *
     17205@@ -30,6 +30,7 @@
     17206  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17207  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17208  *     and: Thomas E. Dickey                        1996-on                 *
     17209+ *     and: Juergen Pfeifer                         2009                    *
     17210  ****************************************************************************/
     17211 
     17212 /*
     17213@@ -44,7 +45,7 @@
     17214 #include <term.h>              /* cur_term */
     17215 #include <tic.h>
     17216 
     17217-MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $")
     17218+MODULE_ID("$Id: lib_set_term.c,v 1.118 2009/02/15 00:39:46 tom Exp $")
     17219 
     17220 NCURSES_EXPORT(SCREEN *)
     17221 set_term(SCREEN *screenp)
     17222@@ -635,7 +636,9 @@
     17223 }
     17224 
     17225 NCURSES_EXPORT(int)
     17226-ripoffline(int line, int (*init) (WINDOW *, int))
     17227+NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx
     17228+                            int line,
     17229+                            int (*init) (WINDOW *, int))
     17230 {
     17231     START_TRACE();
     17232     T((T_CALLED("ripoffline(%d,%p)"), line, init));
     17233@@ -645,3 +648,11 @@
     17234 
     17235     returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init));
     17236 }
     17237+
     17238+#if NCURSES_SP_FUNCS
     17239+NCURSES_EXPORT(int)
     17240+ripoffline(int line, int (*init) (WINDOW *, int))
     17241+{
     17242+    return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init);
     17243+}
     17244+#endif
     17245diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c
     17246--- 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
     17248@@ -1,5 +1,5 @@
     17249 /****************************************************************************
     17250- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     17251+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     17252  *                                                                          *
     17253  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17254  * copy of this software and associated documentation files (the            *
     17255@@ -38,21 +38,29 @@
     17256  */
     17257 #include <curses.priv.h>
     17258 
     17259-MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $")
     17260+MODULE_ID("$Id: lib_slkatrof.c,v 1.10 2009/02/21 17:35:28 tom Exp $")
     17261 
     17262 NCURSES_EXPORT(int)
     17263-slk_attroff(const chtype attr)
     17264+NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr)
     17265 {
     17266-    T((T_CALLED("slk_attroff(%s)"), _traceattr(attr)));
     17267+    T((T_CALLED("slk_attroff(%p,%s)"), SP_PARM, _traceattr(attr)));
     17268 
     17269-    if (SP != 0 && SP->_slk != 0) {
     17270-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     17271-       RemAttr(SP->_slk->attr, attr);
     17272+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     17273+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17274+       RemAttr(SP_PARM->_slk->attr, attr);
     17275        if ((attr & A_COLOR) != 0) {
     17276-           SetPair(SP->_slk->attr, 0);
     17277+           SetPair(SP_PARM->_slk->attr, 0);
     17278        }
     17279-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     17280+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17281        returnCode(OK);
     17282     } else
     17283        returnCode(ERR);
     17284 }
     17285+
     17286+#if NCURSES_SP_FUNCS
     17287+NCURSES_EXPORT(int)
     17288+slk_attroff(const chtype attr)
     17289+{
     17290+    return NCURSES_SP_NAME(slk_attroff) (CURRENT_SCREEN, attr);
     17291+}
     17292+#endif
     17293diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c
     17294--- 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
     17296@@ -1,5 +1,5 @@
     17297 /****************************************************************************
     17298- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     17299+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     17300  *                                                                          *
     17301  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17302  * copy of this software and associated documentation files (the            *
     17303@@ -38,21 +38,29 @@
     17304  */
     17305 #include <curses.priv.h>
     17306 
     17307-MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $")
     17308+MODULE_ID("$Id: lib_slkatron.c,v 1.10 2009/02/21 18:16:04 tom Exp $")
     17309 
     17310 NCURSES_EXPORT(int)
     17311-slk_attron(const chtype attr)
     17312+NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
     17313 {
     17314-    T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
     17315+    T((T_CALLED("slk_attron(%p,%s)"), SP_PARM, _traceattr(attr)));
     17316 
     17317-    if (SP != 0 && SP->_slk != 0) {
     17318-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     17319-       AddAttr(SP->_slk->attr, attr);
     17320+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     17321+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17322+       AddAttr(SP_PARM->_slk->attr, attr);
     17323        if ((attr & A_COLOR) != 0) {
     17324-           SetPair(SP->_slk->attr, PAIR_NUMBER(attr));
     17325+           SetPair(SP_PARM->_slk->attr, PAIR_NUMBER(attr));
     17326        }
     17327-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     17328+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17329        returnCode(OK);
     17330     } else
     17331        returnCode(ERR);
     17332 }
     17333+
     17334+#if NCURSES_SP_FUNCS
     17335+NCURSES_EXPORT(int)
     17336+slk_attron(const chtype attr)
     17337+{
     17338+    return NCURSES_SP_NAME(slk_attron) (CURRENT_SCREEN, attr);
     17339+}
     17340+#endif
    1456417341diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
    1456517342--- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c      2005-01-28 13:11:53.000000000 -0800
    14566 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-01-27 16:45:05.088820784 -0800
     17343+++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-28 20:38:58.439326442 -0800
    1456717344@@ -1,5 +1,5 @@
    1456817345 /****************************************************************************
    … …  
    1458117358 
    1458217359 /*
    14583 @@ -38,22 +38,27 @@
     17360@@ -38,22 +38,39 @@
    1458417361  */
    1458517362 #include <curses.priv.h>
    1458617363 
    1458717364-MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $")
    14588 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.11 2009/01/25 00:47:15 tom Exp $")
     17365+MODULE_ID("$Id: lib_slkatr_set.c,v 1.13 2009/02/21 17:20:17 tom Exp $")
    1458917366 
    1459017367 NCURSES_EXPORT(int)
    14591  slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     17368-slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     17369+NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
     17370+                              const attr_t attr,
     17371+                              short color_pair_number,
     17372+                              void *opts)
    1459217373 {
     17374-    T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
    1459317375+    int code = ERR;
    1459417376+
    14595      T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
     17377+    T((T_CALLED("slk_attr_set(%p,%s,%d)"), SP_PARM, _traceattr(attr), color_pair_number));
    1459617378 
    1459717379-    if (SP != 0 && SP->_slk != 0 && !opts &&
    1459817380-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
    14599 +    if (SP != 0
    14600 +       && SP->_slk != 0
     17381-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     17382-       SetAttr(SP->_slk->attr, attr);
     17383+    if (SP_PARM != 0
     17384+       && SP_PARM->_slk != 0
    1460117385+       && !opts
    1460217386+       && color_pair_number >= 0
    14603 +       && color_pair_number < SP->_pair_limit) {
    14604         TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
    14605         SetAttr(SP->_slk->attr, attr);
     17387+       && color_pair_number < SP_PARM->_pair_limit) {
     17388+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17389+       SetAttr(SP_PARM->_slk->attr, attr);
    1460617390        if (color_pair_number > 0) {
    14607             SetPair(SP->_slk->attr, color_pair_number);
     17391-           SetPair(SP->_slk->attr, color_pair_number);
     17392+           SetPair(SP_PARM->_slk->attr, color_pair_number);
    1460817393        }
    14609         TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     17394-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
    1461017395-       returnCode(OK);
    1461117396-    } else
    1461217397-       returnCode(ERR);
     17398+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
    1461317399+       code = OK;
    1461417400+    }
    1461517401+    returnCode(code);
    14616  }
     17402+}
     17403+
     17404+#if NCURSES_SP_FUNCS
     17405+NCURSES_EXPORT(int)
     17406+slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     17407+{
     17408+    return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,
     17409+                                         color_pair_number, opts);
     17410 }
     17411+#endif
     17412diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c
     17413--- 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
     17415@@ -1,5 +1,5 @@
     17416 /****************************************************************************
     17417- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     17418+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     17419  *                                                                          *
     17420  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17421  * copy of this software and associated documentation files (the            *
     17422@@ -38,16 +38,24 @@
     17423  */
     17424 #include <curses.priv.h>
     17425 
     17426-MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $")
     17427+MODULE_ID("$Id: lib_slkatrset.c,v 1.9 2009/02/21 17:49:07 tom Exp $")
     17428 
     17429 NCURSES_EXPORT(int)
     17430-slk_attrset(const chtype attr)
     17431+NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr)
     17432 {
     17433-    T((T_CALLED("slk_attrset(%s)"), _traceattr(attr)));
     17434+    T((T_CALLED("slk_attrset(%p,%s)"), SP_PARM, _traceattr(attr)));
     17435 
     17436-    if (SP != 0 && SP->_slk != 0) {
     17437-       SetAttr(SP->_slk->attr, attr);
     17438+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     17439+       SetAttr(SP_PARM->_slk->attr, attr);
     17440        returnCode(OK);
     17441     } else
     17442        returnCode(ERR);
     17443 }
     17444+
     17445+#if NCURSES_SP_FUNCS
     17446+NCURSES_EXPORT(int)
     17447+slk_attrset(const chtype attr)
     17448+{
     17449+    return NCURSES_SP_NAME(slk_attrset) (CURRENT_SCREEN, attr);
     17450+}
     17451+#endif
     17452diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c
     17453--- 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
     17455@@ -1,5 +1,5 @@
     17456 /****************************************************************************
     17457- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     17458+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     17459  *                                                                          *
     17460  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17461  * copy of this software and associated documentation files (the            *
     17462@@ -38,19 +38,27 @@
     17463  */
     17464 #include <curses.priv.h>
     17465 
     17466-MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $")
     17467+MODULE_ID("$Id: lib_slkattr.c,v 1.8 2009/02/21 17:48:14 tom Exp $")
     17468 
     17469 NCURSES_EXPORT(attr_t)
     17470-slk_attr(void)
     17471+NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
     17472 {
     17473-    T((T_CALLED("slk_attr()")));
     17474+    T((T_CALLED("slk_attr(%p)"), SP_PARM));
     17475 
     17476-    if (SP != 0 && SP->_slk != 0) {
     17477-       attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR;
     17478-       int pair = GetPair(SP->_slk->attr);
     17479+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     17480+       attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
     17481+       int pair = GetPair(SP_PARM->_slk->attr);
     17482 
     17483        result |= COLOR_PAIR(pair);
     17484        returnAttr(result);
     17485     } else
     17486        returnAttr(0);
     17487 }
     17488+
     17489+#if NCURSES_SP_FUNCS
     17490+NCURSES_EXPORT(attr_t)
     17491+slk_attr(void)
     17492+{
     17493+    return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN);
     17494+}
     17495+#endif
     17496diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c
     17497--- 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
     17499@@ -1,5 +1,5 @@
     17500 /****************************************************************************
     17501- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
     17502+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17503  *                                                                          *
     17504  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17505  * copy of this software and associated documentation files (the            *
     17506@@ -45,7 +45,7 @@
     17507 #include <ctype.h>
     17508 #include <term.h>              /* num_labels, label_*, plab_norm */
     17509 
     17510-MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $")
     17511+MODULE_ID("$Id: lib_slk.c,v 1.36 2009/02/15 00:33:48 tom Exp $")
     17512 
     17513 /*
     17514  * Free any memory related to soft labels, return an error.
     17515@@ -178,14 +178,22 @@
     17516  * Restore the soft labels on the screen.
     17517  */
     17518 NCURSES_EXPORT(int)
     17519-slk_restore(void)
     17520+NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0)
     17521 {
     17522     T((T_CALLED("slk_restore()")));
     17523 
     17524-    if (SP->_slk == NULL)
     17525+    if (SP_PARM->_slk == NULL)
     17526        return (ERR);
     17527-    SP->_slk->hidden = FALSE;
     17528-    SP->_slk->dirty = TRUE;
     17529+    SP_PARM->_slk->hidden = FALSE;
     17530+    SP_PARM->_slk->dirty = TRUE;
     17531 
     17532     returnCode(slk_refresh());
     17533 }
     17534+
     17535+#if NCURSES_SP_FUNCS
     17536+NCURSES_EXPORT(int)
     17537+slk_restore(void)
     17538+{
     17539+    return NCURSES_SP_NAME(slk_restore) (CURRENT_SCREEN);
     17540+}
     17541+#endif
     17542diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c
     17543--- 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
     17545@@ -1,5 +1,5 @@
     17546 /****************************************************************************
     17547- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
     17548+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     17549  *                                                                          *
     17550  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17551  * copy of this software and associated documentation files (the            *
     17552@@ -40,27 +40,35 @@
     17553  */
     17554 #include <curses.priv.h>
     17555 
     17556-MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $")
     17557+MODULE_ID("$Id: lib_slkclear.c,v 1.12 2009/02/21 17:47:14 tom Exp $")
     17558 
     17559 NCURSES_EXPORT(int)
     17560-slk_clear(void)
     17561+NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
     17562 {
     17563     int rc = ERR;
     17564 
     17565-    T((T_CALLED("slk_clear()")));
     17566+    T((T_CALLED("slk_clear(%p)"), SP_PARM));
     17567 
     17568-    if (SP != NULL && SP->_slk != NULL) {
     17569-       SP->_slk->hidden = TRUE;
     17570+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     17571+       SP_PARM->_slk->hidden = TRUE;
     17572        /* For simulated SLK's it looks much more natural to
     17573           inherit those attributes from the standard screen */
     17574-       SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
     17575-       WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
     17576-       if (SP->_slk->win == stdscr) {
     17577+       SP_PARM->_slk->win->_nc_bkgd = SP_PARM->_stdscr->_nc_bkgd;
     17578+       WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(SP_PARM->_stdscr);
     17579+       if (SP_PARM->_slk->win == SP_PARM->_stdscr) {
     17580            rc = OK;
     17581        } else {
     17582-           werase(SP->_slk->win);
     17583-           rc = wrefresh(SP->_slk->win);
     17584+           werase(SP_PARM->_slk->win);
     17585+           rc = wrefresh(SP_PARM->_slk->win);
     17586        }
     17587     }
     17588     returnCode(rc);
     17589 }
     17590+
     17591+#if NCURSES_SP_FUNCS
     17592+NCURSES_EXPORT(int)
     17593+slk_clear(void)
     17594+{
     17595+    return NCURSES_SP_NAME(slk_clear) (CURRENT_SCREEN);
     17596+}
     17597+#endif
    1461717598diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
    1461817599--- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c        2005-01-28 13:11:53.000000000 -0800
    14619 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-01-27 16:45:05.088820784 -0800
     17600+++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-28 20:38:58.439326442 -0800
    1462017601@@ -1,5 +1,5 @@
    1462117602 /****************************************************************************
    … …  
    1462517606  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1462617607  * copy of this software and associated documentation files (the            *
    14627 @@ -28,7 +28,7 @@
     17608@@ -27,8 +27,8 @@
     17609  ****************************************************************************/
    1462817610 
    1462917611 /****************************************************************************
    14630   *  Author:  Juergen Pfeifer, 1998                                          *
     17612- *  Author:  Juergen Pfeifer, 1998                                          *
    1463117613- *     and:  Thomas E. Dickey 2005                                          *
     17614+ *  Author:  Juergen Pfeifer, 1998,2009                                     *
    1463217615+ *     and:  Thomas E. Dickey 2005-on                                       *
    1463317616  ****************************************************************************/
    1463417617 
    1463517618 /*
    14636 @@ -38,19 +38,23 @@
     17619@@ -38,19 +38,31 @@
    1463717620  */
    1463817621 #include <curses.priv.h>
    1463917622 
    1464017623-MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $")
    14641 +MODULE_ID("$Id: lib_slkcolor.c,v 1.13 2009/01/25 00:48:07 tom Exp $")
     17624+MODULE_ID("$Id: lib_slkcolor.c,v 1.15 2009/02/21 16:59:50 tom Exp $")
    1464217625 
    1464317626 NCURSES_EXPORT(int)
    14644  slk_color(short color_pair_number)
     17627-slk_color(short color_pair_number)
     17628+NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number)
    1464517629 {
     17630-    T((T_CALLED("slk_color(%d)"), color_pair_number));
    1464617631+    int code = ERR;
    1464717632+
    14648      T((T_CALLED("slk_color(%d)"), color_pair_number));
     17633+    T((T_CALLED("slk_color(%p,%d)"), SP_PARM, color_pair_number));
     17634+
     17635+    if (SP_PARM != 0
     17636+       && SP_PARM->_slk != 0
     17637+       && color_pair_number >= 0
     17638+       && color_pair_number < SP_PARM->_pair_limit) {
     17639+       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17640+       SetPair(SP_PARM->_slk->attr, color_pair_number);
     17641+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     17642+       code = OK;
     17643+    }
     17644+    returnCode(code);
     17645+}
    1464917646 
    1465017647-    if (SP != 0 && SP->_slk != 0 &&
    1465117648-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
    14652 +    if (SP != 0
    14653 +       && SP->_slk != 0
    14654 +       && color_pair_number >= 0
    14655 +       && color_pair_number < SP->_pair_limit) {
    14656         TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
    14657         SetPair(SP->_slk->attr, color_pair_number);
    14658         TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     17649-       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
     17650-       SetPair(SP->_slk->attr, color_pair_number);
     17651-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
    1465917652-       returnCode(OK);
    1466017653-    } else
    1466117654-       returnCode(ERR);
    14662 +       code = OK;
    14663 +    }
    14664 +    returnCode(code);
    14665  }
    14666 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
    14667 --- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
    14668 +++ ncurses-5.7/ncurses/curses.priv.h   2009-01-27 16:45:05.088820784 -0800
     17655+#if NCURSES_SP_FUNCS
     17656+NCURSES_EXPORT(int)
     17657+slk_color(short color_pair_number)
     17658+{
     17659+    return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number);
     17660 }
     17661+#endif
     17662diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c
     17663--- 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
    1466917665@@ -1,5 +1,5 @@
    1467017666 /****************************************************************************
    … …  
    1467417670  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1467517671  * copy of this software and associated documentation files (the            *
    14676 @@ -34,7 +34,7 @@
     17672@@ -30,6 +30,7 @@
     17673  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17674  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17675  *     and: Thomas E. Dickey                        1996-on                 *
     17676+ *     and: Juergen Pfeifer                         2009                    *
     17677  ****************************************************************************/
     17678 
     17679 /*
     17680@@ -39,10 +40,10 @@
     17681  */
     17682 #include <curses.priv.h>
     17683 
     17684-MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $")
     17685+MODULE_ID("$Id: lib_slkinit.c,v 1.8 2009/02/15 00:42:36 tom Exp $")
     17686 
     17687 NCURSES_EXPORT(int)
     17688-slk_init(int format)
     17689+NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
     17690 {
     17691     int code = ERR;
     17692 
     17693@@ -53,3 +54,11 @@
     17694     }
     17695     returnCode(code);
     17696 }
     17697+
     17698+#if NCURSES_SP_FUNCS
     17699+NCURSES_EXPORT(int)
     17700+slk_init(int format)
     17701+{
     17702+    return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN, format);
     17703+}
     17704+#endif
     17705diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c
     17706--- 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
     17708@@ -1,5 +1,5 @@
     17709 /****************************************************************************
     17710- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
     17711+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     17712  *                                                                          *
     17713  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17714  * copy of this software and associated documentation files (the            *
     17715@@ -29,6 +29,8 @@
     17716 /****************************************************************************
     17717  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17718  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17719+ *     and:  Juergen Pfeifer,                       1998,2009               *
     17720+ *     and:  Thomas E. Dickey                       1998-on                 *
     17721  ****************************************************************************/
     17722 
     17723 /*
     17724@@ -38,14 +40,22 @@
     17725  */
     17726 #include <curses.priv.h>
     17727 
     17728-MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $")
     17729+MODULE_ID("$Id: lib_slklab.c,v 1.9 2009/02/21 18:48:42 tom Exp $")
     17730 
     17731 NCURSES_EXPORT(char *)
     17732-slk_label(int n)
     17733+NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)
     17734 {
     17735-    T((T_CALLED("slk_label(%d)"), n));
     17736+    T((T_CALLED("slk_label(%p,%d)"), SP_PARM, n));
     17737 
     17738-    if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt)
     17739+    if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt)
     17740        returnPtr(0);
     17741-    returnPtr(SP->_slk->ent[n - 1].ent_text);
     17742+    returnPtr(SP_PARM->_slk->ent[n - 1].ent_text);
     17743+}
     17744+
     17745+#if NCURSES_SP_FUNCS
     17746+NCURSES_EXPORT(char *)
     17747+slk_label(int n)
     17748+{
     17749+    return NCURSES_SP_NAME(slk_label) (CURRENT_SCREEN, n);
     17750 }
     17751+#endif
     17752diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c
     17753--- 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
     17755@@ -1,5 +1,5 @@
     17756 /****************************************************************************
     17757- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
     17758+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17759  *                                                                          *
     17760  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17761  * copy of this software and associated documentation files (the            *
     17762@@ -40,7 +40,7 @@
     17763 #include <curses.priv.h>
     17764 #include <term.h>              /* num_labels, label_*, plab_norm */
     17765 
     17766-MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $")
     17767+MODULE_ID("$Id: lib_slkrefr.c,v 1.18 2009/02/15 00:33:48 tom Exp $")
     17768 
     17769 /*
     17770  * Paint the info line for the PC style SLK emulation.
     17771@@ -113,32 +113,48 @@
     17772  * Refresh the soft labels.
     17773  */
     17774 NCURSES_EXPORT(int)
     17775-slk_noutrefresh(void)
     17776+NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0)
     17777 {
     17778     T((T_CALLED("slk_noutrefresh()")));
     17779 
     17780-    if (SP == NULL || SP->_slk == NULL)
     17781+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17782        returnCode(ERR);
     17783-    if (SP->_slk->hidden)
     17784+    if (SP_PARM->_slk->hidden)
     17785        returnCode(OK);
     17786-    slk_intern_refresh(SP->_slk);
     17787+    slk_intern_refresh(SP_PARM->_slk);
     17788+
     17789+    returnCode(wnoutrefresh(SP_PARM->_slk->win));
     17790+}
     17791 
     17792-    returnCode(wnoutrefresh(SP->_slk->win));
     17793+#if NCURSES_SP_FUNCS
     17794+NCURSES_EXPORT(int)
     17795+slk_noutrefresh(void)
     17796+{
     17797+    return NCURSES_SP_NAME(slk_noutrefresh) (CURRENT_SCREEN);
     17798 }
     17799+#endif
     17800 
     17801 /*
     17802  * Refresh the soft labels.
     17803  */
     17804 NCURSES_EXPORT(int)
     17805-slk_refresh(void)
     17806+NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0)
     17807 {
     17808     T((T_CALLED("slk_refresh()")));
     17809 
     17810-    if (SP == NULL || SP->_slk == NULL)
     17811+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17812        returnCode(ERR);
     17813-    if (SP->_slk->hidden)
     17814+    if (SP_PARM->_slk->hidden)
     17815        returnCode(OK);
     17816-    slk_intern_refresh(SP->_slk);
     17817+    slk_intern_refresh(SP_PARM->_slk);
     17818+
     17819+    returnCode(wrefresh(SP_PARM->_slk->win));
     17820+}
     17821 
     17822-    returnCode(wrefresh(SP->_slk->win));
     17823+#if NCURSES_SP_FUNCS
     17824+NCURSES_EXPORT(int)
     17825+slk_refresh(void)
     17826+{
     17827+    return NCURSES_SP_NAME(slk_refresh) (CURRENT_SCREEN);
     17828 }
     17829+#endif
     17830diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c
     17831--- 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
     17833@@ -1,5 +1,5 @@
     17834 /****************************************************************************
     17835- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
     17836+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     17837  *                                                                          *
     17838  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17839  * copy of this software and associated documentation files (the            *
     17840@@ -44,10 +44,10 @@
     17841 #endif
     17842 #endif
     17843 
     17844-MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
     17845+MODULE_ID("$Id: lib_slkset.c,v 1.19 2009/02/21 17:34:06 tom Exp $")
     17846 
     17847 NCURSES_EXPORT(int)
     17848-slk_set(int i, const char *astr, int format)
     17849+NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
     17850 {
     17851     SLK *slk;
     17852     int offset;
     17853@@ -57,20 +57,20 @@
     17854     const char *str = astr;
     17855     const char *p;
     17856 
     17857-    T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
     17858+    T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), SP_PARM, i, str, format));
     17859 
     17860-    if (SP == 0
     17861-       || (slk = SP->_slk) == 0
     17862+    if (SP_PARM == 0
     17863+       || (slk = SP_PARM->_slk) == 0
     17864        || i < 1
     17865        || i > slk->labcnt
     17866        || format < 0
     17867        || format > 2)
     17868        returnCode(ERR);
     17869-    if (str == NULL)
     17870+    if (str == 0)
     17871        str = "";
     17872     --i;                       /* Adjust numbering of labels */
     17873 
     17874-    limit = MAX_SKEY_LEN(SP->slk_format);
     17875+    limit = MAX_SKEY_LEN(SP_PARM->slk_format);
     17876     while (isspace(UChar(*str)))
     17877        str++;                  /* skip over leading spaces  */
     17878     p = str;
     17879@@ -147,3 +147,11 @@
     17880     slk->ent[i].dirty = TRUE;
     17881     returnCode(OK);
     17882 }
     17883+
     17884+#if NCURSES_SP_FUNCS
     17885+NCURSES_EXPORT(int)
     17886+slk_set(int i, const char *astr, int format)
     17887+{
     17888+    return NCURSES_SP_NAME(slk_set) (CURRENT_SCREEN, i, astr, format);
     17889+}
     17890+#endif
     17891diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c
     17892--- 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
     17894@@ -1,5 +1,5 @@
     17895 /****************************************************************************
     17896- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     17897+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     17898  *                                                                          *
     17899  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17900  * copy of this software and associated documentation files (the            *
     17901@@ -27,8 +27,8 @@
     17902  ****************************************************************************/
     17903 
     17904 /****************************************************************************
     17905- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17906- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17907+ *  Author: Juergen Pfeifer                         1997,2009               *
     17908+ *     and: Thomas E. Dickey                        1996-on                 *
     17909  ****************************************************************************/
     17910 
     17911 /*
     17912@@ -38,16 +38,24 @@
     17913  */
     17914 #include <curses.priv.h>
     17915 
     17916-MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
     17917+MODULE_ID("$Id: lib_slktouch.c,v 1.7 2009/02/21 17:42:59 tom Exp $")
     17918 
     17919 NCURSES_EXPORT(int)
     17920-slk_touch(void)
     17921+NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0)
     17922 {
     17923-    T((T_CALLED("slk_touch()")));
     17924+    T((T_CALLED("slk_touch(%p)"), SP_PARM));
     17925 
     17926-    if (SP == NULL || SP->_slk == NULL)
     17927+    if (SP_PARM == 0 || SP_PARM->_slk == 0)
     17928        returnCode(ERR);
     17929-    SP->_slk->dirty = TRUE;
     17930+    SP_PARM->_slk->dirty = TRUE;
     17931 
     17932     returnCode(OK);
     17933 }
     17934+
     17935+#if NCURSES_SP_FUNCS
     17936+NCURSES_EXPORT(int)
     17937+slk_touch(void)
     17938+{
     17939+    return NCURSES_SP_NAME(slk_touch) (CURRENT_SCREEN);
     17940+}
     17941+#endif
     17942diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c
     17943--- 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
     17945@@ -1,5 +1,5 @@
     17946 /****************************************************************************
     17947- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     17948+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17949  *                                                                          *
     17950  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17951  * copy of this software and associated documentation files (the            *
     17952@@ -30,6 +30,7 @@
     17953  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17954  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17955  *     and: Thomas E. Dickey                        1996-on                 *
     17956+ *     and: Juergen Pfeifer                         2009                    *
     17957  ****************************************************************************/
     17958 
     17959 /*
     17960@@ -41,7 +42,7 @@
     17961 
     17962 #include <curses.priv.h>
     17963 
     17964-MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $")
     17965+MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $")
     17966 
     17967 #include <fifo_defs.h>
     17968 
     17969@@ -83,8 +84,16 @@
     17970 }
     17971 
     17972 NCURSES_EXPORT(int)
     17973+NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch)
     17974+{
     17975+    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch)));
     17976+    returnCode(_nc_ungetch(SP_PARM, ch));
     17977+}
     17978+
     17979+#if NCURSES_SP_FUNCS
     17980+NCURSES_EXPORT(int)
     17981 ungetch(int ch)
     17982 {
     17983-    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch)));
     17984-    returnCode(_nc_ungetch(SP, ch));
     17985+    return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch);
     17986 }
     17987+#endif
     17988diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c
     17989--- 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
     17991@@ -39,16 +39,16 @@
     17992 
     17993 #include <curses.priv.h>
     17994 
     17995-MODULE_ID("$Id: lib_winch.c,v 1.5 2001/06/02 23:42:08 skimo Exp $")
     17996+MODULE_ID("$Id: lib_winch.c,v 1.6 2008/11/16 00:19:59 juergen Exp $")
     17997 
     17998 NCURSES_EXPORT(chtype)
     17999 winch(WINDOW *win)
     18000 {
     18001     T((T_CALLED("winch(%p)"), win));
     18002     if (win != 0) {
     18003-       returnChar(CharOf(win->_line[win->_cury].text[win->_curx]) |
     18004-                  AttrOf(win->_line[win->_cury].text[win->_curx]));
     18005+       returnChtype(CharOf(win->_line[win->_cury].text[win->_curx]) |
     18006+                    AttrOf(win->_line[win->_cury].text[win->_curx]));
     18007     } else {
     18008-       returnChar(0);
     18009+       returnChtype(0);
     18010     }
     18011 }
     18012diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk
     18013--- 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
     18015@@ -1,6 +1,6 @@
     18016-# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $
     18017+# $Id: MKkeyname.awk,v 1.41 2009/02/15 00:24:58 tom Exp $
     18018 ##############################################################################
     18019-# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.                #
     18020+# Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.                #
     18021 #                                                                            #
     18022 # Permission is hereby granted, free of charge, to any person obtaining a    #
     18023 # copy of this software and associated documentation files (the "Software"), #
     18024@@ -141,11 +141,20 @@
     18025        print " return result;"
     18026        print "}"
     18027        print ""
     18028-       print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
     18029+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
     18030+       print "NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLx int c)"
     18031        print "{"
     18032-       print "\treturn _nc_keyname(SP, c);"
     18033+       print "\treturn _nc_keyname(SP_PARM, c);"
     18034        print "}"
     18035        print ""
     18036+       print "#if NCURSES_SP_FUNCS"
     18037+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
     18038+       print "keyname (int c)"
     18039+       print "{"
     18040+       print " return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);"
     18041+       print "}"
     18042+       print "#endif"
     18043+       print ""
     18044        print "#if NO_LEAKS"
     18045        print "void _nc_keyname_leaks(void)"
     18046        print "{"
     18047diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh
     18048--- 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
     18050@@ -2,7 +2,7 @@
     18051 #
     18052 # MKlib_gen.sh -- generate sources from curses.h macro definitions
     18053 #
     18054-# ($Id: MKlib_gen.sh,v 1.34 2008/08/30 19:20:50 tom Exp $)
     18055+# ($Id: MKlib_gen.sh,v 1.35 2008/11/16 00:19:59 juergen Exp $)
     18056 #
     18057 ##############################################################################
     18058 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
     18059@@ -199,7 +199,7 @@
     18060        }
     18061        second = first + 1;
     18062        if ( $first == "chtype" ) {
     18063-               returnType = "Char";
     18064+               returnType = "Chtype";
     18065        } else if ( $first == "SCREEN" ) {
     18066                returnType = "SP";
     18067        } else if ( $first == "WINDOW" ) {
     18068diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c
     18069--- 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
     18071@@ -39,7 +39,7 @@
     18072 
     18073 #include <curses.priv.h>
     18074 
     18075-MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $")
     18076+MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen Exp $")
     18077 
     18078 /*
     18079  * Expand a keycode into the string that it corresponds to, returning null if
     18080@@ -72,7 +72,9 @@
     18081            *((unsigned char *) (result + len)) = 128;
     18082 #ifdef TRACE
     18083        if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
     18084-           _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result));
     18085+           _tracef("expand_key %s %s",
     18086+                   _nc_tracechar(CURRENT_SCREEN, code),
     18087+                   _nc_visbuf(result));
     18088            _nc_unlock_global(tracef);
     18089        }
     18090 #endif
     18091diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
     18092--- 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
     18094@@ -1,5 +1,5 @@
     18095 /****************************************************************************
     18096- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18097+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18098  *                                                                          *
     18099  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18100  * copy of this software and associated documentation files (the            *
     18101@@ -30,11 +30,12 @@
     18102  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18103  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18104  *     and: Thomas E. Dickey                        1996-on                 *
     18105+ *     and: Juergen Pfeifer                                                 *
     18106  ****************************************************************************/
    1467718107 
    1467818108 
    1467918109 /*
    1468018110- * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
    14681 + * $Id: curses.priv.h,v 1.396 2009/01/24 23:04:59 tom Exp $
     18111+ * $Id: curses.priv.h,v 1.403 2009/02/28 20:55:48 tom Exp $
    1468218112  *
    1468318113  *     curses.priv.h
    1468418114  *
    14685 @@ -404,6 +404,8 @@
     18115@@ -97,8 +98,6 @@
     18116 extern int errno;
     18117 #endif
     18118 
     18119-#include <nc_panel.h>
     18120-
     18121 /* Some systems have a broken 'select()', but workable 'poll()'.  Use that */
     18122 #if HAVE_WORKING_POLL
     18123 #define USE_FUNC_POLL 1
     18124@@ -257,6 +256,38 @@
     18125 #define NCURSES_OPAQUE 0
     18126 
     18127 #include <curses.h>    /* we'll use -Ipath directive to get the right one! */
     18128+
     18129+/*
     18130+ * If curses.h did not expose the SCREEN-functions, then we do not need the
     18131+ * parameter in the corresponding unextended functions.
     18132+ */
     18133+#if NCURSES_SP_FUNCS
     18134+#define SP_PARM         sp     /* use parameter */
     18135+#define NCURSES_SP_ARG          SP_PARM
     18136+#define NCURSES_SP_DCL  SCREEN *NCURSES_SP_ARG
     18137+#define NCURSES_SP_DCL0 NCURSES_SP_DCL
     18138+#define NCURSES_SP_ARGx         NCURSES_SP_ARG,
     18139+#define NCURSES_SP_DCLx SCREEN *NCURSES_SP_ARGx
     18140+#else
     18141+#define SP_PARM         SP     /* use global variable */
     18142+#define NCURSES_SP_ARG
     18143+#define NCURSES_SP_DCL
     18144+#define NCURSES_SP_DCL0 void
     18145+#define NCURSES_SP_ARGx
     18146+#define NCURSES_SP_DCLx
     18147+#endif
     18148+
     18149+#include <nc_panel.h>
     18150+
     18151+#define IsPreScreen(sp)      (((sp)!=0) && sp->_prescreen)
     18152+#define HasTerminal(sp)      (((sp)!=0) && (0!=((sp)->_term)))
     18153+#define IsValidScreen(sp)    (HasTerminal(sp) && !sp->_prescreen)
     18154+#if BROKEN_LINKER || USE_REENTRANT
     18155+#define TerminalOf(sp)       ((sp)?((sp)->_term?(sp)->_term:_nc_prescreen._cur_term): _nc_prescreen._cur_term)
     18156+#else
     18157+#define TerminalOf(sp)       ((sp)?((sp)->_term?(sp)->_term:cur_term):cur_term)
     18158+#endif
     18159+
     18160 #include <term.h>
     18161 #include <term_entry.h>
     18162 #include <nc_tparm.h>
     18163@@ -289,7 +320,7 @@
     18164 #if NCURSES_NO_PADDING
     18165 #define GetNoPadding(sp)       ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding)
     18166 #define SetNoPadding(sp)       _nc_set_no_padding(sp)
     18167-extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *);
     18168+extern NCURSES_EXPORT(void)     _nc_set_no_padding(SCREEN *);
     18169 #else
     18170 #define GetNoPadding(sp)       FALSE
     18171 #define SetNoPadding(sp)       /*nothing*/
     18172@@ -404,6 +435,8 @@
    1468618173 #define C_SHIFT 9              /* we need more bits than there are colors */
    1468718174 #define C_MASK                 ((1 << C_SHIFT) - 1)
    … …  
    1469218179 
    1469318180 #define COLOR_DEFAULT          C_MASK
    14694 @@ -794,11 +796,13 @@
     18181@@ -464,13 +497,13 @@
     18182 } slk_ent;
     18183 
     18184 typedef struct _SLK {
     18185-       char dirty;             /* all labels have changed */
     18186-       char hidden;            /* soft labels are hidden */
     18187-       WINDOW *win;
     18188+       bool    dirty;          /* all labels have changed */
     18189+       bool    hidden;         /* soft labels are hidden */
     18190+       WINDOW  *win;
     18191        slk_ent *ent;
     18192-       short  maxlab;          /* number of available labels */
     18193-       short  labcnt;          /* number of allocated labels */
     18194-       short  maxlen;          /* length of labels */
     18195+       short   maxlab;         /* number of available labels */
     18196+       short   labcnt;         /* number of allocated labels */
     18197+       short   maxlen;         /* length of labels */
     18198        NCURSES_CH_T attr;      /* soft label attribute */
     18199 } SLK;
     18200 
     18201@@ -703,6 +736,8 @@
     18202        char            *_setbuf;       /* buffered I/O for output          */
     18203        bool            _filtered;      /* filter() was called              */
     18204        bool            _buffered;      /* setvbuf uses _setbuf data        */
     18205+       bool            _prescreen;     /* is in prescreen phase            */
     18206+       bool            _use_env;       /* LINES & COLS from environment?   */
     18207        int             _checkfd;       /* filedesc for typeahead check     */
     18208        TERMINAL        *_term;         /* terminal type information        */
     18209        TTY             _saved_tty;     /* savetty/resetty information      */
     18210@@ -794,11 +829,13 @@
    1469518211        int             _color_count;   /* count of colors in palette        */
    1469618212        colorpair_t     *_color_pairs;  /* screen's color pair list          */
    … …  
    1470618222        chtype          _ok_attributes; /* valid attributes for terminal     */
    1470718223        chtype          _xmc_suppress;  /* attributes to suppress if xmc     */
    14708 @@ -1519,7 +1523,7 @@
     18224@@ -1263,7 +1300,7 @@
     18225 #define returnBool(code)       TRACE_RETURN(code,bool)
     18226 #define returnCPtr(code)       TRACE_RETURN(code,cptr)
     18227 #define returnCVoidPtr(code)   TRACE_RETURN(code,cvoid_ptr)
     18228-#define returnChar(code)       TRACE_RETURN(code,chtype)
     18229+#define returnChtype(code)     TRACE_RETURN(code,chtype)
     18230 #define returnCode(code)       TRACE_RETURN(code,int)
     18231 #define returnPtr(code)                TRACE_RETURN(code,ptr)
     18232 #define returnSP(code)         TRACE_RETURN(code,sp)
     18233@@ -1322,7 +1359,7 @@
     18234 #define returnBool(code)       return code
     18235 #define returnCPtr(code)       return code
     18236 #define returnCVoidPtr(code)   return code
     18237-#define returnChar(code)       return code
     18238+#define returnChtype(code)     return code
     18239 #define returnCode(code)       return code
     18240 #define returnPtr(code)                return code
     18241 #define returnSP(code)         return code
     18242@@ -1519,7 +1556,7 @@
    1470918243 extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
    1471018244 
    … …  
    1471518249 /* lib_mvcur.c */
    1471618250 #define INFINITY       1000000 /* cost: too high to use */
     18251@@ -1592,6 +1629,8 @@
     18252 extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
     18253 extern NCURSES_EXPORT(int) _nc_ospeed (int);
     18254 extern NCURSES_EXPORT(int) _nc_outch (int);
     18255+extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *);
     18256+extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *);
     18257 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);
     18258 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
     18259 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
     18260@@ -1663,7 +1702,7 @@
     18261 
     18262 #define NC_BUFFERED(flag) _nc_set_buffer(SP->_ofp, flag)
     18263 
     18264-#define NC_OUTPUT ((SP != 0) ? SP->_ofp : stdout)
     18265+#define NC_OUTPUT ((SP_PARM != 0) ? SP_PARM->_ofp : stdout)
     18266 
     18267 /*
     18268  * On systems with a broken linker, define 'SP' as a function to force the
     18269@@ -1681,6 +1720,8 @@
     18270 #define _nc_set_screen(sp) SP = sp
     18271 #endif
     18272 
     18273+#define CURRENT_SCREEN SP
     18274+
     18275 /*
     18276  * We don't want to use the lines or columns capabilities internally, because
     18277  * if the application is running multiple screens under X, it's quite possible
     18278@@ -1715,6 +1756,79 @@
     18279 #define MSG_NO_MEMORY "Out of memory"
     18280 #define MSG_NO_INPUTS "Premature EOF"
     18281 
     18282+/* timed_wait flag definitions */
     18283+#define TW_NONE    0
     18284+#define TW_INPUT   1
     18285+#define TW_MOUSE   2
     18286+#define TW_ANY     (TW_INPUT | TW_MOUSE)
     18287+#define TW_EVENT   4
     18288+
     18289+/*
     18290+ * Exported entrypoints beyond the published API
     18291+ */
     18292+#if NCURSES_SP_FUNCS
     18293+extern NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN*);
     18294+extern NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN*);
     18295+extern NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN*);
     18296+extern NCURSES_EXPORT(int)      _nc_outc_wrapper(SCREEN*,int);
     18297+
     18298+extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*);
     18299+extern NCURSES_EXPORT(int)       NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*);
     18300+
     18301+#if NCURSES_EXT_FUNCS
     18302+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int);
     18303+#endif
     18304+
     18305+extern NCURSES_EXPORT(chtype)   NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int);
     18306+
     18307+/*
     18308+ * We put the safe versions of various calls here as they are not published
     18309+ * part of the API up to now
     18310+ */
     18311+extern NCURSES_EXPORT(SCREEN*)  _nc_SP(void);
     18312+
     18313+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int));
     18314+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidattr)(SCREEN *, chtype);
     18315+
     18316+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*);
     18317+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*);
     18318+
     18319+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_restartterm)(SCREEN*,NCURSES_CONST char*,int,int*);
     18320+extern NCURSES_EXPORT(bool)     NCURSES_SP_NAME(_nc_is_term_resized)(SCREEN*,int,int);
     18321+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int);
     18322+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int);
     18323+
     18324+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(_nc_outch)(SCREEN*, int ch);
     18325+extern NCURSES_EXPORT(void)    NCURSES_SP_NAME(_nc_flush)(SCREEN*);
     18326+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char *);
     18327+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *);
     18328+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
     18329+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int));
     18330+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_savetty)(SCREEN*);
     18331+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resetty)(SCREEN*);
     18332+
     18333+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int);
     18334+extern NCURSES_EXPORT(char *)   NCURSES_SP_NAME(_nc_tgetstr)(SCREEN*,NCURSES_CONST char*,char**);
     18335+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetflag)(SCREEN*,NCURSES_CONST char*);
     18336+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetnum)(SCREEN*,NCURSES_CONST char*);
     18337+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetflag)(SCREEN*,NCURSES_CONST char*);
     18338+extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*);
     18339+extern NCURSES_EXPORT(char *)   NCURSES_SP_NAME(_nc_tigetstr)(SCREEN*, NCURSES_CONST char*);
     18340+extern NCURSES_EXPORT(void)     _nc_cookie_init(SCREEN *sp);
     18341+extern NCURSES_EXPORT(int)      _nc_tinfo_doupdate(SCREEN *sp);
     18342+extern NCURSES_EXPORT(int)      _nc_tinfo_mcprint(SCREEN*,char*,int);
     18343+#if USE_WIDEC_SUPPORT
     18344+extern NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(_nc_wunctrl)(SCREEN*, cchar_t *);
     18345+#endif
     18346+
     18347+/* FIXME - move these to curses.h.in */
     18348+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *);
     18349+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(ungetmouse) (SCREEN*, MEVENT *);
     18350+extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *);
     18351+extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
     18352+extern NCURSES_EXPORT(bool)    NCURSES_SP_NAME(has_mouse) (SCREEN*);
     18353+#endif /* NCURSES_SP_FUNCS */
     18354+
     18355 #ifdef __cplusplus
     18356 }
     18357 #endif
    1471718358diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
    1471818359--- ncurses-5.7.orig/ncurses/Makefile.in        2008-10-18 07:11:54.000000000 -0700
    14719 +++ ncurses-5.7/ncurses/Makefile.in     2009-01-27 16:44:58.028366252 -0800
     18360+++ ncurses-5.7/ncurses/Makefile.in     2009-02-28 20:38:46.310547562 -0800
    1472018361@@ -1,6 +1,6 @@
    1472118362-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
    … …  
    1473818379diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
    1473918380--- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
    14740 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-01-27 16:44:49.391812822 -0800
     18381+++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-28 20:38:39.770130185 -0800
    1474118382@@ -37,7 +37,7 @@
    1474218383 #include <tic.h>
    … …  
    1476018401diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
    1476118402--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
    14762 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-01-27 16:44:51.023917306 -0800
     18403+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-28 20:38:41.374231037 -0800
    1476318404@@ -1,5 +1,5 @@
    1476418405 /****************************************************************************
    … …  
    1486418505 }
    1486518506 
    14866 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
    14867 --- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
    14868 +++ ncurses-5.7/ncurses/tty/tty_update.c        2009-01-27 16:45:05.088820784 -0800
     18507diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c
     18508--- 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
    1486918510@@ -1,5 +1,5 @@
    1487018511 /****************************************************************************
    … …  
    1487418515  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1487518516  * copy of this software and associated documentation files (the            *
    14876 @@ -78,7 +78,7 @@
     18517@@ -80,7 +80,7 @@
     18518 #undef USE_OLD_TTY
     18519 #endif /* USE_OLD_TTY */
     18520 
     18521-MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $")
     18522+MODULE_ID("$Id: lib_baudrate.c,v 1.28 2009/02/14 21:41:22 tom Exp $")
     18523 
     18524 /*
     18525  *     int
     18526@@ -195,7 +195,7 @@
     18527 }
     18528 
     18529 NCURSES_EXPORT(int)
     18530-baudrate(void)
     18531+NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
     18532 {
     18533     int result;
     18534 
     18535@@ -207,7 +207,7 @@
     18536      * that take into account costs that depend on baudrate.
     18537      */
     18538 #ifdef TRACE
     18539-    if (!isatty(fileno(SP ? SP->_ofp : stdout))
     18540+    if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout))
     18541        && getenv("BAUDRATE") != 0) {
     18542        int ret;
     18543        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
     18544@@ -236,3 +236,11 @@
     18545 
     18546     returnCode(result);
     18547 }
     18548+
     18549+#if NCURSES_SP_FUNCS
     18550+NCURSES_EXPORT(int)
     18551+baudrate(void)
     18552+{
     18553+    return NCURSES_SP_NAME(baudrate) (CURRENT_SCREEN);
     18554+}
     18555+#endif
     18556diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c
     18557--- 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
     18559@@ -1,5 +1,5 @@
     18560 /****************************************************************************
     18561- * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc.              *
     18562+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18563  *                                                                          *
     18564  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18565  * copy of this software and associated documentation files (the            *
     18566@@ -40,12 +40,14 @@
     18567 #include <term_entry.h>                /* TTY, cur_term */
     18568 #include <termcap.h>           /* ospeed */
     18569 
     18570-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 $")
     18572 
     18573 #undef CUR
     18574 #define CUR termp->type.
     18575 
     18576-#if BROKEN_LINKER || USE_REENTRANT
     18577+#if BROKEN_LINKER && !USE_REENTRANT
     18578+NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
     18579+#elif BROKEN_LINKER || USE_REENTRANT
     18580 NCURSES_EXPORT(TERMINAL *)
     18581 NCURSES_PUBLIC_VAR(cur_term) (void)
     18582 {
     18583diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c
     18584--- 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
     18586@@ -1,5 +1,5 @@
     18587 /****************************************************************************
     18588- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
     18589+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     18590  *                                                                          *
     18591  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18592  * copy of this software and associated documentation files (the            *
     18593@@ -30,6 +30,7 @@
     18594  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18595  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18596  *     and: Thomas E. Dickey                        1996-2003               *
     18597+ *     and: Juergen Pfeifer                         2009                    *
     18598  ****************************************************************************/
     18599 
     18600 /*
     18601@@ -43,10 +44,10 @@
     18602 
     18603 #include <term.h>
     18604 
     18605-MODULE_ID("$Id: lib_has_cap.c,v 1.4 2003/10/25 19:43:55 tom Exp $")
     18606+MODULE_ID("$Id: lib_has_cap.c,v 1.5 2009/02/15 00:47:12 tom Exp $")
     18607 
     18608 NCURSES_EXPORT(bool)
     18609-has_ic(void)
     18610+NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
     18611 {
     18612     T((T_CALLED("has_ic()")));
     18613     returnCode(cur_term &&
     18614@@ -55,11 +56,27 @@
     18615               && (delete_character || parm_dch));
     18616 }
     18617 
     18618+#if NCURSES_SP_FUNCS
     18619 NCURSES_EXPORT(bool)
     18620-has_il(void)
     18621+has_ic(void)
     18622+{
     18623+    return NCURSES_SP_NAME(has_ic) (CURRENT_SCREEN);
     18624+}
     18625+#endif
     18626+
     18627+NCURSES_EXPORT(bool)
     18628+NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0)
     18629 {
     18630     T((T_CALLED("has_il()")));
     18631     returnCode(cur_term
     18632               && (insert_line || parm_insert_line)
     18633               && (delete_line || parm_delete_line));
     18634 }
     18635+
     18636+#if NCURSES_SP_FUNCS
     18637+NCURSES_EXPORT(bool)
     18638+has_il(void)
     18639+{
     18640+    return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN);
     18641+}
     18642+#endif
     18643diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c
     18644--- 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
     18646@@ -1,5 +1,5 @@
     18647 /****************************************************************************
     18648- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
     18649+ * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
     18650  *                                                                          *
     18651  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18652  * copy of this software and associated documentation files (the            *
     18653@@ -29,7 +29,8 @@
     18654 /****************************************************************************
     18655  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18656  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18657- *     and: Thomas E. Dickey 2002                                           *
     18658+ *     and: Thomas E. Dickey                        2002                    *
     18659+ *     and: Juergen Pfeifer                         2009                    *
     18660  ****************************************************************************/
     18661 
     18662 /*
     18663@@ -48,7 +49,7 @@
     18664 #include <curses.priv.h>
     18665 #include <term.h>              /* cur_term */
     18666 
     18667-MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $")
     18668+MODULE_ID("$Id: lib_kernel.c,v 1.25 2009/02/15 00:47:52 tom Exp $")
     18669 
     18670 static int
     18671 _nc_vdisable(void)
     18672@@ -79,7 +80,7 @@
     18673  */
     18674 
     18675 NCURSES_EXPORT(char)
     18676-erasechar(void)
     18677+NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
     18678 {
     18679     int result = ERR;
     18680     T((T_CALLED("erasechar()")));
     18681@@ -96,6 +97,14 @@
     18682     returnCode(result);
     18683 }
     18684 
     18685+#if NCURSES_SP_FUNCS
     18686+NCURSES_EXPORT(char)
     18687+erasechar(void)
     18688+{
     18689+    return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN);
     18690+}
     18691+#endif
     18692+
     18693 /*
     18694  *     killchar()
     18695  *
     18696@@ -104,7 +113,7 @@
     18697  */
     18698 
     18699 NCURSES_EXPORT(char)
     18700-killchar(void)
     18701+NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
     18702 {
     18703     int result = ERR;
     18704     T((T_CALLED("killchar()")));
     18705@@ -121,6 +130,14 @@
     18706     returnCode(result);
     18707 }
     18708 
     18709+#if NCURSES_SP_FUNCS
     18710+NCURSES_EXPORT(char)
     18711+killchar(void)
     18712+{
     18713+    return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN);
     18714+}
     18715+#endif
     18716+
     18717 /*
     18718  *     flushinp()
     18719  *
     18720@@ -129,7 +146,7 @@
     18721  */
     18722 
     18723 NCURSES_EXPORT(int)
     18724-flushinp(void)
     18725+NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
     18726 {
     18727     T((T_CALLED("flushinp()")));
     18728 
     18729@@ -143,12 +160,20 @@
     18730        } while
     18731            (errno == EINTR);
     18732 #endif
     18733-       if (SP) {
     18734-           SP->_fifohead = -1;
     18735-           SP->_fifotail = 0;
     18736-           SP->_fifopeek = 0;
     18737+       if (SP_PARM) {
     18738+           SP_PARM->_fifohead = -1;
     18739+           SP_PARM->_fifotail = 0;
     18740+           SP_PARM->_fifopeek = 0;
     18741        }
     18742        returnCode(OK);
     18743     }
     18744     returnCode(ERR);
     18745 }
     18746+
     18747+#if NCURSES_SP_FUNCS
     18748+NCURSES_EXPORT(int)
     18749+flushinp(void)
     18750+{
     18751+    return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN);
     18752+}
     18753+#endif
     18754diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c
     18755--- 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
     18757@@ -1,5 +1,5 @@
     18758 /****************************************************************************
     18759- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     18760+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     18761  *                                                                          *
     18762  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18763  * copy of this software and associated documentation files (the            *
     18764@@ -29,6 +29,8 @@
     18765 /****************************************************************************
     18766  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18767  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18768+ *     and: Thomas E. Dickey                        1996-on                 *
     18769+ *     and: Juergen Pfeifer                         2009                    *
     18770  ****************************************************************************/
     18771 
     18772 /*
     18773@@ -40,10 +42,10 @@
     18774 
     18775 #include <curses.priv.h>
     18776 
     18777-MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $")
     18778+MODULE_ID("$Id: lib_longname.c,v 1.10 2009/02/15 00:48:15 tom Exp $")
     18779 
     18780 NCURSES_EXPORT(char *)
     18781-longname(void)
     18782+NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0)
     18783 {
     18784     char *ptr;
     18785 
     18786@@ -55,3 +57,11 @@
     18787 
     18788     returnPtr(ttytype);
     18789 }
     18790+
     18791+#if NCURSES_SP_FUNCS
     18792+NCURSES_EXPORT(char *)
     18793+longname(void)
     18794+{
     18795+    return NCURSES_SP_NAME(longname) (CURRENT_SCREEN);
     18796+}
     18797+#endif
     18798diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c
     18799--- 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
     18801@@ -1,5 +1,5 @@
     18802 /****************************************************************************
     18803- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
     18804+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18805  *                                                                          *
     18806  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18807  * copy of this software and associated documentation files (the            *
     18808@@ -29,6 +29,8 @@
     18809 /****************************************************************************
     18810  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18811  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18812+ *     and: Thomas E. Dickey                        1996-on                 *
     18813+ *     and: Juergen Pfeifer                         2009                    *
     18814  ****************************************************************************/
     18815 
     18816 /*
     18817@@ -49,10 +51,10 @@
     18818 #endif
     18819 #endif
     18820 
     18821-MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $")
     18822+MODULE_ID("$Id: lib_napms.c,v 1.18 2009/02/15 00:48:27 tom Exp $")
     18823 
     18824 NCURSES_EXPORT(int)
     18825-napms(int ms)
     18826+NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
     18827 {
     18828     T((T_CALLED("napms(%d)"), ms));
     18829 
     18830@@ -72,3 +74,11 @@
     18831 
     18832     returnCode(OK);
     18833 }
     18834+
     18835+#if NCURSES_SP_FUNCS
     18836+NCURSES_EXPORT(int)
     18837+napms(int ms)
     18838+{
     18839+    return NCURSES_SP_NAME(napms) (CURRENT_SCREEN, ms);
     18840+}
     18841+#endif
     18842diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c
     18843--- 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
     18845@@ -1,5 +1,5 @@
     18846 /****************************************************************************
     18847- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
     18848+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18849  *                                                                          *
     18850  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18851  * copy of this software and associated documentation files (the            *
     18852@@ -30,6 +30,7 @@
     18853  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18854  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18855  *     and: Thomas E. Dickey                        1996-on                 *
     18856+ *     and: Juergen Pfeifer                         2009                    *
     18857  ****************************************************************************/
     18858 
     18859 /*
     18860@@ -43,7 +44,7 @@
     18861 
     18862 #include <term.h>
     18863 
     18864-MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $")
     18865+MODULE_ID("$Id: lib_options.c,v 1.60 2009/02/28 21:07:56 tom Exp $")
     18866 
     18867 static int _nc_curs_set(SCREEN *, int);
     18868 static int _nc_meta(SCREEN *, bool);
     18869@@ -72,18 +73,26 @@
     18870 }
     18871 
     18872 NCURSES_EXPORT(int)
     18873-halfdelay(int t)
     18874+NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
     18875 {
     18876     T((T_CALLED("halfdelay(%d)"), t));
     18877 
     18878-    if (t < 1 || t > 255 || SP == 0)
     18879+    if (t < 1 || t > 255 || SP_PARM == 0)
     18880        returnCode(ERR);
     18881 
     18882     cbreak();
     18883-    SP->_cbreak = t + 1;
     18884+    SP_PARM->_cbreak = t + 1;
     18885     returnCode(OK);
     18886 }
     18887 
     18888+#if NCURSES_SP_FUNCS
     18889+NCURSES_EXPORT(int)
     18890+halfdelay(int t)
     18891+{
     18892+    return NCURSES_SP_NAME(halfdelay) (CURRENT_SCREEN, t);
     18893+}
     18894+#endif
     18895+
     18896 NCURSES_EXPORT(int)
     18897 nodelay(WINDOW *win, bool flag)
     18898 {
     18899@@ -158,17 +167,25 @@
     18900 }
     18901 
     18902 NCURSES_EXPORT(int)
     18903-typeahead(int fd)
     18904+NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)
     18905 {
     18906     T((T_CALLED("typeahead(%d)"), fd));
     18907-    if (SP != 0) {
     18908-       SP->_checkfd = fd;
     18909+    if (SP_PARM != 0) {
     18910+       SP_PARM->_checkfd = fd;
     18911        returnCode(OK);
     18912     } else {
     18913        returnCode(ERR);
     18914     }
     18915 }
     18916 
     18917+#if NCURSES_SP_FUNCS
     18918+NCURSES_EXPORT(int)
     18919+typeahead(int fd)
     18920+{
     18921+    return NCURSES_SP_NAME(typeahead) (CURRENT_SCREEN, fd);
     18922+}
     18923+#endif
     18924+
     18925 /*
     18926 **      has_key()
     18927 **
     18928@@ -204,8 +221,9 @@
     18929 #undef CUR
     18930 #define CUR (sp->_term)->type.
     18931 
     18932-static int
     18933-_nc_putp(const char *name GCC_UNUSED, const char *value)
     18934+NCURSES_EXPORT(int)
     18935+NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
     18936+                          const char *name GCC_UNUSED, const char *value)
     18937 {
     18938     int rc = ERR;
     18939 
     18940@@ -216,8 +234,17 @@
     18941     return rc;
     18942 }
     18943 
     18944-static int
     18945-_nc_putp_flush(const char *name, const char *value)
     18946+#if NCURSES_SP_FUNCS
     18947+NCURSES_EXPORT(int)
     18948+_nc_putp(const char *name, const char *value)
     18949+{
     18950+    return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, value);
     18951+}
     18952+#endif
     18953+
     18954+NCURSES_EXPORT(int)
     18955+NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx
     18956+                                const char *name, const char *value)
     18957 {
     18958     int rc = _nc_putp(name, value);
     18959     if (rc != ERR) {
     18960@@ -226,6 +253,14 @@
     18961     return rc;
     18962 }
     18963 
     18964+#if NCURSES_SP_FUNCS
     18965+NCURSES_EXPORT(int)
     18966+_nc_putp_flush(const char *name, const char *value)
     18967+{
     18968+    return NCURSES_SP_NAME(_nc_putp_flush) (CURRENT_SCREEN, name, value);
     18969+}
     18970+#endif
     18971+
     18972 /* Turn the keypad on/off
     18973  *
     18974  * Note:  we flush the output because changing this mode causes some terminals
     18975@@ -245,12 +280,12 @@
     18976         * has wgetch() reading in more than one thread.  putp() and below
     18977         * may use SP explicitly.
     18978         */
     18979-       if (_nc_use_pthreads && sp != SP) {
     18980+       if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
     18981            SCREEN *save_sp;
     18982 
     18983            /* cannot use use_screen(), since that is not in tinfo library */
     18984            _nc_lock_global(curses);
     18985-           save_sp = SP;
     18986+           save_sp = CURRENT_SCREEN;
     18987            _nc_set_screen(sp);
     18988            rc = _nc_keypad(sp, flag);
     18989            _nc_set_screen(save_sp);
     18990@@ -313,8 +348,8 @@
     18991 
     18992     /* Ok, we stay relaxed and don't signal an error if win is NULL */
     18993 
     18994-    if (SP != 0) {
     18995-       SP->_use_meta = flag;
     18996+    if (sp != 0) {
     18997+       sp->_use_meta = flag;
     18998 
     18999        if (flag) {
     19000            _nc_putp("meta_on", meta_on);
     19001diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c
     19002--- 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
     19004@@ -1,5 +1,5 @@
     19005 /****************************************************************************
     19006- * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
     19007+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     19008  *                                                                          *
     19009  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19010  * copy of this software and associated documentation files (the            *
     19011@@ -29,7 +29,8 @@
     19012 /****************************************************************************
     19013  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19014  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19015- *     and: Thomas E. Dickey 1998 on                                        *
     19016+ *     and: Thomas E. Dickey                        1998-on                 *
     19017+ *     and: Juergen Pfeifer                         2009                    *
     19018  ****************************************************************************/
     19019 
     19020 /*
     19021@@ -49,7 +50,7 @@
     19022 #include <curses.priv.h>
     19023 #include <term.h>              /* cur_term */
     19024 
     19025-MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $")
     19026+MODULE_ID("$Id: lib_raw.c,v 1.15 2009/02/15 00:49:02 tom Exp $")
     19027 
     19028 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
     19029 #define _POSIX_SOURCE
     19030@@ -61,7 +62,7 @@
     19031 
     19032 #ifdef __EMX__
     19033 #include <io.h>
     19034-#define _nc_setmode(mode) setmode(SP->_ifd, mode)
     19035+#define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode)
     19036 #else
     19037 #define _nc_setmode(mode)      /* nothing */
     19038 #endif
     19039@@ -77,13 +78,13 @@
     19040 #endif /* TRACE */
     19041 
     19042 NCURSES_EXPORT(int)
     19043-raw(void)
     19044+NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
     19045 {
     19046     int result = ERR;
     19047 
     19048     T((T_CALLED("raw()")));
     19049 
     19050-    if (SP != 0 && cur_term != 0) {
     19051+    if (SP_PARM != 0 && cur_term != 0) {
     19052        TTY buf;
     19053 
     19054        BEFORE("raw");
     19055@@ -99,8 +100,8 @@
     19056        buf.sg_flags |= RAW;
     19057 #endif
     19058        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     19059-           SP->_raw = TRUE;
     19060-           SP->_cbreak = 1;
     19061+           SP_PARM->_raw = TRUE;
     19062+           SP_PARM->_cbreak = 1;
     19063            cur_term->Nttyb = buf;
     19064        }
     19065        AFTER("raw");
     19066@@ -108,14 +109,22 @@
     19067     returnCode(result);
     19068 }
     19069 
     19070+#if NCURSES_SP_FUNCS
     19071 NCURSES_EXPORT(int)
     19072-cbreak(void)
     19073+raw(void)
     19074+{
     19075+    return NCURSES_SP_NAME(raw) (CURRENT_SCREEN);
     19076+}
     19077+#endif
     19078+
     19079+NCURSES_EXPORT(int)
     19080+NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
     19081 {
     19082     int result = ERR;
     19083 
     19084     T((T_CALLED("cbreak()")));
     19085 
     19086-    if (SP != 0 && cur_term != 0) {
     19087+    if (SP_PARM != 0 && cur_term != 0) {
     19088        TTY buf;
     19089 
     19090        BEFORE("cbreak");
     19091@@ -132,7 +141,7 @@
     19092        buf.sg_flags |= CBREAK;
     19093 #endif
     19094        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     19095-           SP->_cbreak = 1;
     19096+           SP_PARM->_cbreak = 1;
     19097            cur_term->Nttyb = buf;
     19098        }
     19099        AFTER("cbreak");
     19100@@ -140,12 +149,20 @@
     19101     returnCode(result);
     19102 }
     19103 
     19104+#if NCURSES_SP_FUNCS
     19105+NCURSES_EXPORT(int)
     19106+cbreak(void)
     19107+{
     19108+    return NCURSES_SP_NAME(cbreak) (CURRENT_SCREEN);
     19109+}
     19110+#endif
     19111+
     19112 /*
     19113  * Note:
     19114  * this implementation may be wrong.  See the comment under intrflush().
     19115  */
     19116 NCURSES_EXPORT(void)
     19117-qiflush(void)
     19118+NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0)
     19119 {
     19120     int result = ERR;
     19121 
     19122@@ -169,14 +186,22 @@
     19123     returnVoid;
     19124 }
     19125 
     19126+#if NCURSES_SP_FUNCS
     19127+NCURSES_EXPORT(void)
     19128+qiflush(void)
     19129+{
     19130+    NCURSES_SP_NAME(qiflush) (CURRENT_SCREEN);
     19131+}
     19132+#endif
     19133+
     19134 NCURSES_EXPORT(int)
     19135-noraw(void)
     19136+NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0)
     19137 {
     19138     int result = ERR;
     19139 
     19140     T((T_CALLED("noraw()")));
     19141 
     19142-    if (SP != 0 && cur_term != 0) {
     19143+    if (SP_PARM != 0 && cur_term != 0) {
     19144        TTY buf;
     19145 
     19146        BEFORE("noraw");
     19147@@ -191,8 +216,8 @@
     19148        buf.sg_flags &= ~(RAW | CBREAK);
     19149 #endif
     19150        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     19151-           SP->_raw = FALSE;
     19152-           SP->_cbreak = 0;
     19153+           SP_PARM->_raw = FALSE;
     19154+           SP_PARM->_cbreak = 0;
     19155            cur_term->Nttyb = buf;
     19156        }
     19157        AFTER("noraw");
     19158@@ -200,14 +225,22 @@
     19159     returnCode(result);
     19160 }
     19161 
     19162+#if NCURSES_SP_FUNCS
     19163 NCURSES_EXPORT(int)
     19164-nocbreak(void)
     19165+noraw(void)
     19166+{
     19167+    return NCURSES_SP_NAME(noraw) (CURRENT_SCREEN);
     19168+}
     19169+#endif
     19170+
     19171+NCURSES_EXPORT(int)
     19172+NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0)
     19173 {
     19174     int result = ERR;
     19175 
     19176     T((T_CALLED("nocbreak()")));
     19177 
     19178-    if (SP != 0 && cur_term != 0) {
     19179+    if (SP_PARM != 0 && cur_term != 0) {
     19180        TTY buf;
     19181 
     19182        BEFORE("nocbreak");
     19183@@ -221,7 +254,7 @@
     19184        buf.sg_flags &= ~CBREAK;
     19185 #endif
     19186        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     19187-           SP->_cbreak = 0;
     19188+           SP_PARM->_cbreak = 0;
     19189            cur_term->Nttyb = buf;
     19190        }
     19191        AFTER("nocbreak");
     19192@@ -229,12 +262,20 @@
     19193     returnCode(result);
     19194 }
     19195 
     19196+#if NCURSES_SP_FUNCS
     19197+NCURSES_EXPORT(int)
     19198+nocbreak(void)
     19199+{
     19200+    return NCURSES_SP_NAME(nocbreak) (CURRENT_SCREEN);
     19201+}
     19202+#endif
     19203+
     19204 /*
     19205  * Note:
     19206  * this implementation may be wrong.  See the comment under intrflush().
     19207  */
     19208 NCURSES_EXPORT(void)
     19209-noqiflush(void)
     19210+NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0)
     19211 {
     19212     int result = ERR;
     19213 
     19214@@ -259,6 +300,14 @@
     19215     returnVoid;
     19216 }
     19217 
     19218+#if NCURSES_SP_FUNCS
     19219+NCURSES_EXPORT(void)
     19220+noqiflush(void)
     19221+{
     19222+    NCURSES_SP_NAME(noqiflush) (CURRENT_SCREEN);
     19223+}
     19224+#endif
     19225+
     19226 /*
     19227  * This call does the same thing as the qiflush()/noqiflush() pair.  We know
     19228  * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand,
     19229@@ -267,7 +316,7 @@
     19230  * curs_inopts(3x) is too exact to be coincidence.
     19231  */
     19232 NCURSES_EXPORT(int)
     19233-intrflush(WINDOW *win GCC_UNUSED, bool flag)
     19234+NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag)
     19235 {
     19236     int result = ERR;
     19237 
     19238@@ -294,3 +343,11 @@
     19239     }
     19240     returnCode(result);
     19241 }
     19242+
     19243+#if NCURSES_SP_FUNCS
     19244+NCURSES_EXPORT(int)
     19245+intrflush(WINDOW *win GCC_UNUSED, bool flag)
     19246+{
     19247+    return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag);
     19248+}
     19249+#endif
     19250diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c
     19251--- 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
     19253@@ -1,5 +1,5 @@
     19254 /****************************************************************************
     19255- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19256+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19257  *                                                                          *
     19258  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19259  * copy of this software and associated documentation files (the            *
     19260@@ -30,6 +30,7 @@
     19261  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19262  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19263  *     and: Thomas E. Dickey                        1996-on                 *
     19264+ *     and: Juergen Pfeifer                         2009                    *
     19265  ****************************************************************************/
     19266 
     19267 /*
     19268@@ -53,7 +54,7 @@
     19269 
     19270 #include <term.h>              /* lines, columns, cur_term */
     19271 
     19272-MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $")
     19273+MODULE_ID("$Id: lib_setup.c,v 1.113 2009/02/14 22:21:40 tom Exp $")
     19274 
     19275 /****************************************************************************
     19276  *
     19277@@ -149,21 +150,30 @@
     19278 
     19279 #if NCURSES_EXT_FUNCS
     19280 NCURSES_EXPORT(int)
     19281-set_tabsize(int value)
     19282+NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value)
     19283 {
     19284     int code = OK;
     19285 #if USE_REENTRANT
     19286-    if (SP) {
     19287-       SP->_TABSIZE = value;
     19288+    if (SP_PARM) {
     19289+       SP_PARM->_TABSIZE = value;
     19290     } else {
     19291        code = ERR;
     19292     }
     19293 #else
     19294+    (void) SP_PARM;
     19295     TABSIZE = value;
     19296 #endif
     19297     return code;
     19298 }
     19299+
     19300+#if NCURSES_SP_FUNCS
     19301+NCURSES_EXPORT(int)
     19302+set_tabsize(int value)
     19303+{
     19304+    return NCURSES_SP_NAME(set_tabsize) (CURRENT_SCREEN, value);
     19305+}
     19306 #endif
     19307+#endif /* NCURSES_EXT_FUNCS */
     19308 
     19309 #if USE_SIGWINCH
     19310 /*
     19311@@ -188,13 +198,25 @@
     19312 #endif
     19313 
     19314 NCURSES_EXPORT(void)
     19315-use_env(bool f)
     19316+NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
     19317 {
     19318     T((T_CALLED("use_env()")));
     19319-    _nc_prescreen.use_env = f;
     19320+    if (IsPreScreen(SP_PARM)) {
     19321+       SP_PARM->_use_env = f;
     19322+    } else {
     19323+       _nc_prescreen.use_env = f;
     19324+    }
     19325     returnVoid;
     19326 }
     19327 
     19328+#if NCURSES_SP_FUNCS
     19329+NCURSES_EXPORT(void)
     19330+use_env(bool f)
     19331+{
     19332+    NCURSES_SP_NAME(use_env) (CURRENT_SCREEN, f);
     19333+}
     19334+#endif
     19335+
     19336 NCURSES_EXPORT(void)
     19337 _nc_get_screensize(SCREEN *sp, int *linep, int *colp)
     19338 /* Obtain lines/columns values from the environment and/or terminfo entry */
     19339diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c
     19340--- 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
     19342@@ -1,5 +1,5 @@
     19343 /****************************************************************************
     19344- * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc.              *
     19345+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     19346  *                                                                          *
     19347  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19348  * copy of this software and associated documentation files (the            *
     19349@@ -28,17 +28,31 @@
     19350 
     19351 #include <curses.priv.h>
     19352 
     19353-MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $")
     19354+MODULE_ID("$Id: lib_termname.c,v 1.11 2009/02/21 16:37:12 tom Exp $")
     19355 
     19356 NCURSES_EXPORT(char *)
     19357-termname(void)
     19358+NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
     19359 {
     19360     char *name = 0;
     19361 
     19362-    T((T_CALLED("termname()")));
     19363+    T((T_CALLED("termname(%p)"), SP_PARM));
     19364 
     19365+#if NCURSES_SP_FUNCS
     19366+    if (TerminalOf(SP_PARM) != 0) {
     19367+       name = TerminalOf(SP_PARM)->_termname;
     19368+    }
     19369+#else
     19370     if (cur_term != 0)
     19371        name = cur_term->_termname;
     19372+#endif
     19373 
     19374     returnPtr(name);
     19375 }
     19376+
     19377+#if NCURSES_SP_FUNCS
     19378+NCURSES_EXPORT(char *)
     19379+termname(void)
     19380+{
     19381+    return NCURSES_SP_NAME(termname) (CURRENT_SCREEN);
     19382+}
     19383+#endif
     19384diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c
     19385--- 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
     19387@@ -40,10 +40,9 @@
     19388 #include <curses.priv.h>
     19389 
     19390 #include <ctype.h>
     19391-#include <term.h>
     19392 #include <tic.h>
     19393 
     19394-MODULE_ID("$Id: lib_tparm.c,v 1.76 2008/08/16 19:22:55 tom Exp $")
     19395+MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
     19396 
     19397 /*
     19398  *     char *
     19399diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c
     19400--- 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
     19402@@ -1,5 +1,5 @@
     19403 /****************************************************************************
     19404- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19405+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19406  *                                                                          *
     19407  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19408  * copy of this software and associated documentation files (the            *
     19409@@ -30,6 +30,7 @@
     19410  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19411  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19412  *     and: Thomas E. Dickey                        1996-on                 *
     19413+ *     and: Juergen Pfeifer                         2009                    *
     19414  ****************************************************************************/
     19415 
     19416 /*
     19417@@ -46,7 +47,7 @@
     19418 #include <termcap.h>           /* ospeed */
     19419 #include <tic.h>
     19420 
     19421-MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $")
     19422+MODULE_ID("$Id: lib_tputs.c,v 1.68 2009/02/28 21:08:18 tom Exp $")
     19423 
     19424 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
     19425 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
     19426@@ -72,7 +73,7 @@
     19427 static int (*my_outch) (int c) = _nc_outch;
     19428 
     19429 NCURSES_EXPORT(int)
     19430-delay_output(int ms)
     19431+NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
     19432 {
     19433     T((T_CALLED("delay_output(%d)"), ms));
     19434 
     19435@@ -92,19 +93,35 @@
     19436     returnCode(OK);
     19437 }
     19438 
     19439+#if NCURSES_SP_FUNCS
     19440+NCURSES_EXPORT(int)
     19441+delay_output(int ms)
     19442+{
     19443+    return NCURSES_SP_NAME(delay_output) (CURRENT_SCREEN, ms);
     19444+}
     19445+#endif
     19446+
     19447 NCURSES_EXPORT(void)
     19448-_nc_flush(void)
     19449+NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
     19450 {
     19451     (void) fflush(NC_OUTPUT);
     19452 }
     19453 
     19454+#if NCURSES_SP_FUNCS
     19455+NCURSES_EXPORT(void)
     19456+_nc_flush(void)
     19457+{
     19458+    NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN);
     19459+}
     19460+#endif
     19461+
     19462 NCURSES_EXPORT(int)
     19463-_nc_outch(int ch)
     19464+NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
     19465 {
     19466     COUNT_OUTCHARS(1);
     19467 
     19468-    if (SP != 0
     19469-       && SP->_cleanup) {
     19470+    if (SP_PARM != 0
     19471+       && SP_PARM->_cleanup) {
     19472        char tmp = ch;
     19473        /*
     19474         * POSIX says write() is safe in a signal handler, but the
     19475@@ -117,6 +134,14 @@
     19476     return OK;
     19477 }
     19478 
     19479+#if NCURSES_SP_FUNCS
     19480+NCURSES_EXPORT(int)
     19481+_nc_outch(int ch)
     19482+{
     19483+    return NCURSES_SP_NAME(_nc_outch) (CURRENT_SCREEN, ch);
     19484+}
     19485+#endif
     19486+
     19487 NCURSES_EXPORT(int)
     19488 putp(const char *string)
     19489 {
     19490diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c
     19491--- 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
     19493@@ -1,5 +1,5 @@
     19494 /****************************************************************************
     19495- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19496+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19497  *                                                                          *
     19498  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19499  * copy of this software and associated documentation files (the            *
     19500@@ -38,7 +38,7 @@
     19501 #include <curses.priv.h>
     19502 #include <term.h>              /* cur_term */
     19503 
     19504-MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $")
     19505+MODULE_ID("$Id: lib_ttyflags.c,v 1.19 2009/02/15 00:33:49 tom Exp $")
     19506 
     19507 NCURSES_EXPORT(int)
     19508 _nc_get_tty_mode(TTY * buf)
     19509@@ -101,7 +101,7 @@
     19510 }
     19511 
     19512 NCURSES_EXPORT(int)
     19513-def_shell_mode(void)
     19514+NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0)
     19515 {
     19516     int rc = ERR;
     19517 
     19518@@ -125,8 +125,16 @@
     19519     returnCode(rc);
     19520 }
     19521 
     19522+#if NCURSES_SP_FUNCS
     19523 NCURSES_EXPORT(int)
     19524-def_prog_mode(void)
     19525+def_shell_mode(void)
     19526+{
     19527+    return NCURSES_SP_NAME(def_shell_mode) (CURRENT_SCREEN);
     19528+}
     19529+#endif
     19530+
     19531+NCURSES_EXPORT(int)
     19532+NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0)
     19533 {
     19534     int rc = ERR;
     19535 
     19536@@ -148,16 +156,24 @@
     19537     returnCode(rc);
     19538 }
     19539 
     19540+#if NCURSES_SP_FUNCS
     19541 NCURSES_EXPORT(int)
     19542-reset_prog_mode(void)
     19543+def_prog_mode(void)
     19544+{
     19545+    return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
     19546+}
     19547+#endif
     19548+
     19549+NCURSES_EXPORT(int)
     19550+NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0)
     19551 {
     19552     T((T_CALLED("reset_prog_mode()")));
     19553 
     19554     if (cur_term != 0) {
     19555        if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) {
     19556-           if (SP) {
     19557-               if (SP->_keypad_on)
     19558-                   _nc_keypad(SP, TRUE);
     19559+           if (SP_PARM) {
     19560+               if (SP_PARM->_keypad_on)
     19561+                   _nc_keypad(SP_PARM, TRUE);
     19562                NC_BUFFERED(TRUE);
     19563            }
     19564            returnCode(OK);
     19565@@ -166,14 +182,22 @@
     19566     returnCode(ERR);
     19567 }
     19568 
     19569+#if NCURSES_SP_FUNCS
     19570 NCURSES_EXPORT(int)
     19571-reset_shell_mode(void)
     19572+reset_prog_mode(void)
     19573+{
     19574+    return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN);
     19575+}
     19576+#endif
     19577+
     19578+NCURSES_EXPORT(int)
     19579+NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0)
     19580 {
     19581     T((T_CALLED("reset_shell_mode()")));
     19582 
     19583     if (cur_term != 0) {
     19584-       if (SP) {
     19585-           _nc_keypad(SP, FALSE);
     19586+       if (SP_PARM) {
     19587+           _nc_keypad(SP_PARM, FALSE);
     19588            _nc_flush();
     19589            NC_BUFFERED(FALSE);
     19590        }
     19591@@ -182,6 +206,14 @@
     19592     returnCode(ERR);
     19593 }
     19594 
     19595+#if NCURSES_SP_FUNCS
     19596+NCURSES_EXPORT(int)
     19597+reset_shell_mode(void)
     19598+{
     19599+    return NCURSES_SP_NAME(reset_shell_mode) (CURRENT_SCREEN);
     19600+}
     19601+#endif
     19602+
     19603 static TTY *
     19604 saved_tty(void)
     19605 {
     19606diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c
     19607--- 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
     19609@@ -39,16 +39,16 @@
     19610 #define USE_TERMLIB 1
     19611 #include <curses.priv.h>
     19612 
     19613-MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $")
     19614+MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $")
     19615 
     19616 #include <names.c>
     19617 
     19618 #define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames))
     19619 
     19620-static size_t
     19621+static unsigned
     19622 lookup(const char *name)
     19623 {
     19624-    size_t n;
     19625+    unsigned n;
     19626     bool found = FALSE;
     19627     for (n = 0; strnames[n] != 0; n++) {
     19628        if (!strcmp(name, strnames[n])) {
     19629@@ -73,7 +73,7 @@
     19630     char buffer[BUFSIZ];
     19631     char from[256];
     19632     char to[256];
     19633-    int maxlen = 16;
     19634+    unsigned maxlen = 16;
     19635     int scanned;
     19636 
     19637     while (fgets(buffer, sizeof(buffer), ifp) != 0) {
     19638@@ -85,10 +85,10 @@
     19639 
     19640        scanned = sscanf(buffer, "%255s %255s", to, from);
     19641        if (scanned == 2) {
     19642-           int code = lookup(from);
     19643+           unsigned code = lookup(from);
     19644            if (code == UNKNOWN)
     19645                continue;
     19646-           if ((int) strlen(from) > maxlen)
     19647+           if (strlen(from) > maxlen)
     19648                maxlen = strlen(from);
     19649            fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
     19650                    code,
     19651diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk
     19652--- 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
     19654@@ -25,7 +25,7 @@
     19655 # use or other dealings in this Software without prior written               #
     19656 # authorization.                                                             #
     19657 ##############################################################################
     19658-# $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 $
     19660 function large_item(value) {
     19661        result = sprintf("%d,", offset);
     19662        offset = offset + length(value) + 1;
     19663@@ -107,8 +107,6 @@
     19664                print  ""
     19665                print  "#if BROKEN_LINKER || USE_REENTRANT"
     19666                print  ""
     19667-               print  "#include <term.h>"
     19668-               print  ""
     19669                if (bigstrings) {
     19670                        printf "static const char _nc_name_blob[] = \n"
     19671                        printf "%s;\n", bigstr;
     19672diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c
     19673--- 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
     19675@@ -31,10 +31,9 @@
     19676  ****************************************************************************/
     19677 
     19678 #include <curses.priv.h>
     19679-#include <term.h>
     19680 #include <tic.h>
     19681 
     19682-MODULE_ID("$Id: name_match.c,v 1.17 2008/08/03 19:49:33 tom Exp $")
     19683+MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
     19684 
     19685 /*
     19686  *     _nc_first_name(char *names)
     19687diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c
     19688--- 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
     19690@@ -32,7 +32,7 @@
     19691 
     19692 #include <curses.priv.h>
     19693 
     19694-MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $")
     19695+MODULE_ID("$Id: use_screen.c,v 1.7 2008/11/16 00:19:59 juergen Exp $")
     19696 
     19697 NCURSES_EXPORT(int)
     19698 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
     19699@@ -47,7 +47,7 @@
     19700      * recurred through this point, return an error if so.
     19701      */
     19702     _nc_lock_global(curses);
     19703-    save_SP = SP;
     19704+    save_SP = CURRENT_SCREEN;
     19705     set_term(screen);
     19706 
     19707     code = func(screen, data);
     19708diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c
     19709--- 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
     19711@@ -1,5 +1,5 @@
     19712 /****************************************************************************
     19713- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19714+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19715  *                                                                          *
     19716  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19717  * copy of this software and associated documentation files (the            *
     19718@@ -30,6 +30,7 @@
     19719  *  Author: Thomas Dickey                           1996-on                 *
     19720  *     and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19721  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19722+ *     and: Juergen Pfeifer                                                 *
     19723  ****************************************************************************/
     19724 
     19725 /*
     19726@@ -39,7 +40,7 @@
     19727 #include <curses.priv.h>
     19728 #include <term.h>              /* acs_chars */
     19729 
     19730-MODULE_ID("$Id: lib_traceatr.c,v 1.63 2008/08/03 16:24:53 tom Exp $")
     19731+MODULE_ID("$Id: lib_traceatr.c,v 1.64 2009/02/28 21:10:20 tom Exp $")
     19732 
     19733 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
     19734 
     19735@@ -228,7 +229,7 @@
     19736     if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
     19737        char *cp;
     19738        char *found = 0;
     19739-       const ALT_NAMES *sp;
     19740+       const ALT_NAMES *strp;
     19741 
     19742        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
     19743            if (ChCharOf(cp[1]) == ChCharOf(ch)) {
     19744@@ -239,9 +240,9 @@
     19745 
     19746        if (found != 0) {
     19747            ch = ChCharOf(*found);
     19748-           for (sp = names; sp->val; sp++)
     19749-               if (sp->val == ch) {
     19750-                   result = sp->name;
     19751+           for (strp = names; strp->val; strp++)
     19752+               if (strp->val == ch) {
     19753+                   result = strp->name;
     19754                    break;
     19755                }
     19756        }
     19757@@ -260,7 +261,8 @@
     19758        if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
     19759            (void) _nc_trace_bufcat(bufnum, found);
     19760        } else
     19761-           (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int) ChCharOf(ch)));
     19762+           (void) _nc_trace_bufcat(bufnum, _nc_tracechar(CURRENT_SCREEN,
     19763+                                   (int) ChCharOf(ch)));
     19764 
     19765        if (ChAttrOf(ch) != A_NORMAL) {
     19766            (void) _nc_trace_bufcat(bufnum, " | ");
     19767@@ -320,7 +322,7 @@
     19768                        if (PUTC_ch != L'\0') {
     19769                            /* it could not be a multibyte sequence */
     19770                            (void) _nc_trace_bufcat(bufnum,
     19771-                                                   _nc_tracechar(SP,
     19772+                                                   _nc_tracechar(CURRENT_SCREEN,
     19773                                                                  UChar(ch->chars[PUTC_i])));
     19774                        }
     19775                        break;
     19776@@ -329,7 +331,7 @@
     19777                        if (n)
     19778                            (void) _nc_trace_bufcat(bufnum, ", ");
     19779                        (void) _nc_trace_bufcat(bufnum,
     19780-                                               _nc_tracechar(SP,
     19781+                                               _nc_tracechar(CURRENT_SCREEN,
     19782                                                              UChar(PUTC_buf[n])));
     19783                    }
     19784                }
     19785diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c
     19786--- 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
     19788@@ -33,9 +33,8 @@
     19789  ****************************************************************************/
     19790 
     19791 #include <curses.priv.h>
     19792-#include <term.h>              /* cur_term */
     19793 
     19794-MODULE_ID("$Id: lib_tracebits.c,v 1.17 2008/08/03 16:09:26 tom Exp $")
     19795+MODULE_ID("$Id: lib_tracebits.c,v 1.18 2008/11/16 00:19:59 juergen Exp $")
     19796 
     19797 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
     19798 #define _POSIX_SOURCE
     19799diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c
     19800--- 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
     19802@@ -1,5 +1,5 @@
     19803 /****************************************************************************
     19804- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19805+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19806  *                                                                          *
     19807  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19808  * copy of this software and associated documentation files (the            *
     19809@@ -30,6 +30,7 @@
     19810  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19811  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19812  *     and: Thomas E. Dickey                        1996-on                 *
     19813+ *     and: Juergen Pfeifer                                                 *
     19814  ****************************************************************************/
     19815 
     19816 /*
     19817@@ -46,7 +47,7 @@
     19818 
     19819 #include <ctype.h>
     19820 
     19821-MODULE_ID("$Id: lib_trace.c,v 1.71 2008/08/23 18:04:29 tom Exp $")
     19822+MODULE_ID("$Id: lib_trace.c,v 1.72 2009/02/28 20:37:37 tom Exp $")
     19823 
     19824 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
     19825 
     19826@@ -56,26 +57,26 @@
     19827 NCURSES_EXPORT(const char *)
     19828 NCURSES_PUBLIC_VAR(_nc_tputs_trace) (void)
     19829 {
     19830-    return SP ? SP->_tputs_trace : _nc_prescreen._tputs_trace;
     19831+    return CURRENT_SCREEN ? CURRENT_SCREEN->_tputs_trace : _nc_prescreen._tputs_trace;
     19832 }
     19833 NCURSES_EXPORT(long)
     19834 NCURSES_PUBLIC_VAR(_nc_outchars) (void)
     19835 {
     19836-    return SP ? SP->_outchars : _nc_prescreen._outchars;
     19837+    return CURRENT_SCREEN ? CURRENT_SCREEN->_outchars : _nc_prescreen._outchars;
     19838 }
     19839 NCURSES_EXPORT(void)
     19840 _nc_set_tputs_trace(const char *s)
     19841 {
     19842-    if (SP)
     19843-       SP->_tputs_trace = s;
     19844+    if (CURRENT_SCREEN)
     19845+       CURRENT_SCREEN->_tputs_trace = s;
     19846     else
     19847        _nc_prescreen._tputs_trace = s;
     19848 }
     19849 NCURSES_EXPORT(void)
     19850 _nc_count_outchars(long increment)
     19851 {
     19852-    if (SP)
     19853-       SP->_outchars += increment;
     19854+    if (CURRENT_SCREEN)
     19855+       CURRENT_SCREEN->_outchars += increment;
     19856     else
     19857        _nc_prescreen._outchars += increment;
     19858 }
     19859diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c
     19860--- 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
     19862@@ -38,7 +38,7 @@
     19863 
     19864 #include <curses.priv.h>
     19865 
     19866-MODULE_ID("$Id: lib_tracemse.c,v 1.15 2008/08/03 15:39:29 tom Exp $")
     19867+MODULE_ID("$Id: lib_tracemse.c,v 1.16 2008/11/16 00:19:59 juergen Exp $")
     19868 
     19869 #ifdef TRACE
     19870 
     19871@@ -117,7 +117,7 @@
     19872 NCURSES_EXPORT(char *)
     19873 _tracemouse(MEVENT const *ep)
     19874 {
     19875-    return _nc_tracemouse(SP, ep);
     19876+    return _nc_tracemouse(CURRENT_SCREEN, ep);
     19877 }
     19878 
     19879 #else /* !TRACE */
     19880diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c
     19881--- 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
     19883@@ -34,7 +34,7 @@
     19884 
     19885 #include <ctype.h>
     19886 
     19887-MODULE_ID("$Id: varargs.c,v 1.7 2008/08/03 15:42:49 tom Exp $")
     19888+MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $")
     19889 
     19890 #ifdef TRACE
     19891 
     19892@@ -44,7 +44,7 @@
     19893     atUnknown = 0, atInteger, atFloat, atPoint, atString
     19894 } ARGTYPE;
     19895 
     19896-#define VA_INT(type) ival = va_arg(ap, type)
     19897+#define VA_INT(type) ival = (int) va_arg(ap, type)
     19898 #define VA_FLT(type) fval = va_arg(ap, type)
     19899 #define VA_PTR(type) pval = (char *)va_arg(ap, type)
     19900 #define VA_STR(type) sval = va_arg(ap, type)
     19901diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c
     19902--- 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
     19904@@ -1,5 +1,5 @@
     19905 /****************************************************************************
     19906- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     19907+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     19908  *                                                                          *
     19909  * Permission is hereby granted, free of charge, to any person obtaining a  *
     19910  * copy of this software and associated documentation files (the            *
     19911@@ -30,6 +30,7 @@
     19912  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     19913  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     19914  *     and: Thomas E. Dickey                        1996-on                 *
     19915+ *     and: Juergen Pfeifer                         2009                    *
     19916  ****************************************************************************/
     19917 
     19918 /*
     19919@@ -155,7 +156,7 @@
     19920 #include <term.h>
     19921 #include <ctype.h>
     19922 
     19923-MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $")
     19924+MODULE_ID("$Id: lib_mvcur.c,v 1.114 2009/02/15 00:50:33 tom Exp $")
     19925 
     19926 #define WANT_CHAR(y, x)        SP->_newscr->_line[y].text[x]   /* desired state */
     19927 #define BAUDRATE       cur_term->_baudrate     /* bits per second */
     19928@@ -853,9 +854,10 @@
     19929        return (ERR);
     19930 }
     19931 
     19932-NCURSES_EXPORT(int)
     19933-mvcur(int yold, int xold, int ynew, int xnew)
     19934 /* optimized cursor move from (yold, xold) to (ynew, xnew) */
     19935+NCURSES_EXPORT(int)
     19936+NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx
     19937+                       int yold, int xold, int ynew, int xnew)
     19938 {
     19939     NCURSES_CH_T oldattr;
     19940     int code;
     19941@@ -863,7 +865,7 @@
     19942     TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
     19943                                  yold, xold, ynew, xnew));
     19944 
     19945-    if (SP == 0) {
     19946+    if (SP_PARM == 0) {
     19947        code = ERR;
     19948     } else if (yold == ynew && xold == xnew) {
     19949        code = OK;
     19950@@ -884,7 +886,7 @@
     19951         * character set -- these have a strong tendency to screw up the CR &
     19952         * LF used for local character motions!
     19953         */
     19954-       oldattr = SCREEN_ATTRS(SP);
     19955+       oldattr = SCREEN_ATTRS(SP_PARM);
     19956        if ((AttrOf(oldattr) & A_ALTCHARSET)
     19957            || (AttrOf(oldattr) && !move_standout_mode)) {
     19958            TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move",
     19959@@ -896,7 +898,7 @@
     19960        if (xold >= screen_columns) {
     19961            int l;
     19962 
     19963-           if (SP->_nl) {
     19964+           if (SP_PARM->_nl) {
     19965                l = (xold + 1) / screen_columns;
     19966                yold += l;
     19967                if (yold >= screen_lines)
     19968@@ -940,7 +942,7 @@
     19969        /*
     19970         * Restore attributes if we disabled them before moving.
     19971         */
     19972-       if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP))) {
     19973+       if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP_PARM))) {
     19974            TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move",
     19975                               (unsigned long) AttrOf(oldattr),
     19976                               _traceattr(AttrOf(oldattr))));
     19977@@ -950,6 +952,14 @@
     19978     returnCode(code);
     19979 }
     19980 
     19981+#if NCURSES_SP_FUNCS
     19982+NCURSES_EXPORT(int)
     19983+mvcur(int yold, int xold, int ynew, int xnew)
     19984+{
     19985+    return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew);
     19986+}
     19987+#endif
     19988+
     19989 #if defined(TRACE) || defined(NCURSES_TEST)
     19990 NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL;
     19991 #endif
     19992diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c
     19993--- 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
     19995@@ -1,5 +1,5 @@
     19996 /****************************************************************************
     19997- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
     19998+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     19999  *                                                                          *
     20000  * Permission is hereby granted, free of charge, to any person obtaining a  *
     20001  * copy of this software and associated documentation files (the            *
     20002@@ -29,7 +29,8 @@
     20003 /****************************************************************************
     20004  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     20005  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     20006- *     and: Thomas E. Dickey                        1996 on                 *
     20007+ *     and: Thomas E. Dickey                        1996-on                 *
     20008+ *     and: Juergen Pfeifer                         2009                    *
     20009  ****************************************************************************/
     20010 
     20011 /*
     20012@@ -65,7 +66,7 @@
     20013 #include <curses.priv.h>
     20014 #include <term.h>
     20015 
     20016-MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
     20017+MODULE_ID("$Id: lib_vidattr.c,v 1.51 2009/02/21 21:43:40 tom Exp $")
     20018 
     20019 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
     20020 
     20021@@ -299,7 +300,7 @@
     20022 }
     20023 
     20024 NCURSES_EXPORT(chtype)
     20025-termattrs(void)
     20026+NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
     20027 {
     20028     chtype attrs = A_NORMAL;
     20029 
     20030@@ -331,8 +332,16 @@
     20031     if (enter_underline_mode)
     20032        attrs |= A_UNDERLINE;
     20033 
     20034-    if (SP->_coloron)
     20035+    if (SP_PARM->_coloron)
     20036        attrs |= A_COLOR;
     20037 
     20038-    returnChar(attrs);
     20039+    returnChtype(attrs);
     20040 }
     20041+
     20042+#if NCURSES_SP_FUNCS
     20043+NCURSES_EXPORT(chtype)
     20044+termattrs(void)
     20045+{
     20046+    return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN);
     20047+}
     20048+#endif
     20049diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
     20050--- 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
     20052@@ -1,5 +1,5 @@
     20053 /****************************************************************************
     20054- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     20055+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     20056  *                                                                          *
     20057  * Permission is hereby granted, free of charge, to any person obtaining a  *
     20058  * copy of this software and associated documentation files (the            *
     20059@@ -30,6 +30,7 @@
     20060  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     20061  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     20062  *     and: Thomas E. Dickey                        1996-on                 *
     20063+ *     and: Juergen Pfeifer                         2009                    *
     20064  ****************************************************************************/
     20065 
     20066 /*-----------------------------------------------------------------
     20067@@ -78,7 +79,7 @@
    1487720068 #include <ctype.h>
    1487820069 #include <term.h>
    1487920070 
    1488020071-MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $")
    14881 +MODULE_ID("$Id: tty_update.c,v 1.247 2009/01/25 00:48:36 tom Exp $")
     20072+MODULE_ID("$Id: tty_update.c,v 1.248 2009/02/15 00:51:22 tom Exp $")
    1488220073 
    1488320074 /*
    1488420075  * This define controls the line-breakout optimization.  Every once in a
    14885 @@ -1165,8 +1165,8 @@
     20076@@ -618,7 +619,7 @@
     20077                if_USE_SCROLL_HINTS(win->_line[row].oldindex = row)
     20078 
     20079 NCURSES_EXPORT(int)
     20080-doupdate(void)
     20081+NCURSES_SP_NAME(doupdate) (NCURSES_SP_DCL0)
     20082 {
     20083     int i;
     20084     int nonempty;
     20085@@ -645,11 +646,11 @@
     20086 
     20087     _nc_signal_handler(FALSE);
     20088 
     20089-    if (SP->_fifohold)
     20090-       SP->_fifohold--;
     20091+    if (SP_PARM->_fifohold)
     20092+       SP_PARM->_fifohold--;
     20093 
     20094 #if USE_SIZECHANGE
     20095-    if (SP->_endwin || _nc_handle_sigwinch(SP)) {
     20096+    if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) {
     20097        /*
     20098         * This is a transparent extension:  XSI does not address it,
     20099         * and applications need not know that ncurses can do it.
     20100@@ -658,20 +659,20 @@
     20101         * (this can happen in an xterm, for example), and resize the
     20102         * ncurses data structures accordingly.
     20103         */
     20104-       _nc_update_screensize(SP);
     20105+       _nc_update_screensize(SP_PARM);
     20106     }
     20107 #endif
     20108 
     20109-    if (SP->_endwin) {
     20110+    if (SP_PARM->_endwin) {
     20111 
     20112        T(("coming back from shell mode"));
     20113        reset_prog_mode();
     20114 
     20115        _nc_mvcur_resume();
     20116        _nc_screen_resume();
     20117-       SP->_mouse_resume(SP);
     20118+       SP_PARM->_mouse_resume(SP_PARM);
     20119 
     20120-       SP->_endwin = FALSE;
     20121+       SP_PARM->_endwin = FALSE;
     20122     }
     20123 #if USE_TRACE_TIMES
     20124     /* zero the metering machinery */
     20125@@ -699,7 +700,7 @@
     20126            for (j = 0; j < screen_columns; j++) {
     20127                bool failed = FALSE;
     20128                NCURSES_CH_T *thisline = newscr->_line[i].text;
     20129-               attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers;
     20130+               attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers;
     20131                attr_t turnon = thisattr & ~rattr;
     20132 
     20133                /* is an attribute turned on here? */
     20134@@ -717,7 +718,7 @@
     20135                 * there's enough room to set the attribute before the first
     20136                 * non-blank in the run.
     20137                 */
     20138-#define SAFE(a)        (!((a) & SP->_xmc_triggers))
     20139+#define SAFE(a)        (!((a) & SP_PARM->_xmc_triggers))
     20140                if (ISBLANK(thisline[j]) && SAFE(turnon)) {
     20141                    RemAttr(thisline[j], turnon);
     20142                    continue;
     20143@@ -748,7 +749,7 @@
     20144                    for (m = i; m < screen_lines; m++) {
     20145                        for (; n < screen_columns; n++) {
     20146                            attr_t testattr = AttrOf(newscr->_line[m].text[n]);
     20147-                           if ((testattr & SP->_xmc_triggers) == rattr) {
     20148+                           if ((testattr & SP_PARM->_xmc_triggers) == rattr) {
     20149                                end_onscreen = TRUE;
     20150                                TR(TRACE_ATTRS,
     20151                                   ("Range attributed with %s ends at (%d, %d)",
     20152@@ -809,7 +810,7 @@
     20153                    for (p = i; p < screen_lines; p++) {
     20154                        for (; q < screen_columns; q++) {
     20155                            attr_t testattr = AttrOf(newscr->_line[p].text[q]);
     20156-                           if ((testattr & SP->_xmc_triggers) == rattr)
     20157+                           if ((testattr & SP_PARM->_xmc_triggers) == rattr)
     20158                                goto foundend;
     20159                            RemAttr(newscr->_line[p].text[q], turnon);
     20160                        }
     20161@@ -857,7 +858,7 @@
     20162 
     20163        nonempty = min(screen_lines, newscr->_maxy + 1);
     20164 
     20165-       if (SP->_scrolling) {
     20166+       if (SP_PARM->_scrolling) {
     20167            _nc_scroll_optimize();
     20168        }
     20169 
     20170@@ -940,6 +941,14 @@
     20171     returnCode(OK);
     20172 }
     20173 
     20174+#if NCURSES_SP_FUNCS
     20175+NCURSES_EXPORT(int)
     20176+doupdate(void)
     20177+{
     20178+    return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN);
     20179+}
     20180+#endif
     20181+
     20182 /*
     20183  *     ClrBlank(win)
     20184  *
     20185@@ -1165,8 +1174,8 @@
    1488620186                newPair = GetPair(newLine[n]);
    1488720187                if (oldPair != newPair
    … …  
    1489420194                        SetPair(oldLine[n], GetPair(newLine[n]));
    1489520195                    }
     20196diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c
     20197--- 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
     20199@@ -1,5 +1,5 @@
     20200 /****************************************************************************
     20201- * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
     20202+ * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc.              *
     20203  *                                                                          *
     20204  * Permission is hereby granted, free of charge, to any person obtaining a  *
     20205  * copy of this software and associated documentation files (the            *
     20206@@ -35,7 +35,7 @@
     20207 
     20208 #include <curses.priv.h>
     20209 
     20210-MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $")
     20211+MODULE_ID("$Id: lib_cchar.c,v 1.13 2008/11/16 00:19:59 juergen Exp $")
     20212 
     20213 /*
     20214  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
     20215@@ -50,8 +50,8 @@
     20216         short color_pair,
     20217         const void *opts)
     20218 {
     20219-    int i;
     20220-    int len;
     20221+    unsigned i;
     20222+    unsigned len;
     20223     int code = OK;
     20224 
     20225     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
     20226diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c
     20227--- 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
     20229@@ -38,9 +38,8 @@
     20230 */
     20231 
     20232 #include <curses.priv.h>
     20233-#include <term.h>
     20234 
     20235-MODULE_ID("$Id: lib_get_wstr.c,v 1.10 2008/08/16 19:25:33 tom Exp $")
     20236+MODULE_ID("$Id: lib_get_wstr.c,v 1.11 2008/11/16 00:19:59 juergen Exp $")
     20237 
     20238 static int
     20239 wadd_wint(WINDOW *win, wint_t *src)
     20240diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c
     20241--- 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
     20243@@ -31,9 +31,8 @@
     20244  ****************************************************************************/
     20245 
     20246 #include <curses.priv.h>
     20247-#include <term.h>
     20248 
     20249-MODULE_ID("$Id: lib_wacs.c,v 1.7 2006/12/17 15:16:17 tom Exp $")
     20250+MODULE_ID("$Id: lib_wacs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $")
     20251 
     20252 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
     20253 
    1489620254diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    1489720255--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    14898 +++ ncurses-5.7/NEWS    2009-01-27 16:45:05.084820505 -0800
     20256+++ ncurses-5.7/NEWS    2009-02-28 20:38:59.855417236 -0800
    1489920257@@ -1,5 +1,5 @@
    1490020258 -------------------------------------------------------------------------------
    … …  
    1490920267 -------------------------------------------------------------------------------
    1491020268--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    14911 +-- $Id: NEWS,v 1.1360 2009/01/24 23:06:51 tom Exp $
     20269+-- $Id: NEWS,v 1.1367 2009/02/28 22:38:03 tom Exp $
    1491220270 -------------------------------------------------------------------------------
    1491320271 
    1491420272 This is a log of changes that ncurses has gone through since Zeyd started
    14915 @@ -45,6 +45,133 @@
     20273@@ -45,6 +45,158 @@
    1491620274 Changes through 1.9.9e did not credit all contributions;
    1491720275 it is not possible to add this information.
    1491820276 
     20277+20090228
     20278+       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
     20279+       + modify declaration of cur_term when broken-linker is used, but
     20280+         enable-reentrant is not, to match pre-5.7 (report by Charles Wilson).
     20281+
     20282+20090221
     20283+       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
     20284+
     20285+20090214
     20286+       + add configure script --enable-sp-funcs to enable the new set of
     20287+         extended functions.
     20288+       + start integrating patches by Juergen Pfeifer:
     20289+         + add extended functions which specify the SCREEN pointer for several
     20290+           curses functions which use the global SP (these are incomplete;
     20291+           some internals work is needed to complete these).
     20292+         + add special cases to configure script for MinGW port.
     20293+
     20294+20090207
     20295+       + update several configure macros from lynx changes
     20296+         + append (not prepend) to CFLAGS/CPPFLAGS
     20297+         + change variable from PATHSEP to PATH_SEPARATOR
     20298+       + improve install-rules for pc-files (patch by Miroslav Lichvar).
     20299+         + make it work with $DESTDIR
     20300+         + create the pkg-config library directory if needed.
     20301+
    1491920302+20090124
    1492020303+       + modify init_pair() to allow caller to create extra color pairs beyond
    … …  
    1504920432diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
    1505020433--- ncurses-5.7.orig/panel/Makefile.in  2007-04-28 07:56:11.000000000 -0700
    15051 +++ ncurses-5.7/panel/Makefile.in       2009-01-27 16:44:58.028366252 -0800
     20434+++ ncurses-5.7/panel/Makefile.in       2009-02-28 20:38:46.310547562 -0800
    1505220435@@ -1,6 +1,6 @@
    1505320436-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
    … …  
    1507020453diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
    1507120454--- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
    15072 +++ ncurses-5.7/progs/Makefile.in       2009-01-27 16:44:45.103540717 -0800
     20455+++ ncurses-5.7/progs/Makefile.in       2009-02-28 20:38:35.789873445 -0800
    1507320456@@ -1,6 +1,6 @@
    1507420457-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
    … …  
    1513620519diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
    1513720520--- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
    15138 +++ ncurses-5.7/progs/modules   2009-01-27 16:44:45.103540717 -0800
     20521+++ ncurses-5.7/progs/modules   2009-02-28 20:38:35.789873445 -0800
    1513920522@@ -1,7 +1,7 @@
    1514020523-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
    … …  
    1515720540diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
    1515820541--- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
    15159 +++ ncurses-5.7/progs/tabs.c    2009-01-27 16:44:46.515630395 -0800
     20542+++ ncurses-5.7/progs/tabs.c    2009-02-28 20:38:37.161961447 -0800
    1516020543@@ -0,0 +1,506 @@
    1516120544+/****************************************************************************
    … …  
    1566721050diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
    1566821051--- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
    15669 +++ ncurses-5.7/test/clip_printw.c      2009-01-27 16:44:52.892037156 -0800
     21052+++ ncurses-5.7/test/clip_printw.c      2009-02-28 20:38:42.990334962 -0800
    1567021053@@ -0,0 +1,360 @@
    1567121054+/****************************************************************************
    … …  
    1603121414diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
    1603221415--- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
    16033 +++ ncurses-5.7/test/demo_forms.c       2009-01-27 16:44:52.892037156 -0800
     21416+++ ncurses-5.7/test/demo_forms.c       2009-02-28 20:38:42.990334962 -0800
    1603421417@@ -26,7 +26,7 @@
    1603521418  * authorization.                                                           *
    … …  
    1606621449diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
    1606721450--- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
    16068 +++ ncurses-5.7/test/edit_field.c       2009-01-27 16:44:52.892037156 -0800
     21451+++ ncurses-5.7/test/edit_field.c       2009-02-28 20:38:42.990334962 -0800
    1606921452@@ -26,7 +26,7 @@
    1607021453  * authorization.                                                           *
    … …  
    1608921472diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
    1609021473--- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
    16091 +++ ncurses-5.7/test/edit_field.h       2009-01-27 16:44:52.896037435 -0800
     21474+++ ncurses-5.7/test/edit_field.h       2009-02-28 20:38:42.990334962 -0800
    1609221475@@ -1,5 +1,5 @@
    1609321476 /****************************************************************************
    … …  
    1611921502diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
    1612021503--- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
    16121 +++ ncurses-5.7/test/filter.c   2009-01-27 16:44:49.391812822 -0800
     21504+++ ncurses-5.7/test/filter.c   2009-02-28 20:38:39.770130185 -0800
    1612221505@@ -1,5 +1,5 @@
    1612321506 /****************************************************************************
    … …  
    1619121574diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
    1619221575--- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
    16193 +++ ncurses-5.7/test/insdelln.c 2009-01-27 16:44:52.896037435 -0800
     21576+++ ncurses-5.7/test/insdelln.c 2009-02-28 20:38:42.990334962 -0800
    1619421577@@ -0,0 +1,380 @@
    1619521578+/****************************************************************************
    … …  
    1657521958diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
    1657621959--- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
    16577 +++ ncurses-5.7/test/modules    2009-01-27 16:44:52.896037435 -0800
     21960+++ ncurses-5.7/test/modules    2009-02-28 20:38:42.990334962 -0800
    1657821961@@ -1,4 +1,4 @@
    1657921962-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
    … …  
    1660021983diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
    1660121984--- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
    16602 +++ ncurses-5.7/test/ncurses.c  2009-01-27 16:45:05.092821064 -0800
     21985+++ ncurses-5.7/test/ncurses.c  2009-02-28 20:38:53.018977231 -0800
    1660321986@@ -40,7 +40,7 @@
    1660421987    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
    … …  
    1709222475diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
    1709322476--- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
    17094 +++ ncurses-5.7/test/programs   2009-01-27 16:44:52.896037435 -0800
     22477+++ ncurses-5.7/test/programs   2009-02-28 20:38:42.994335242 -0800
    1709522478@@ -1,4 +1,4 @@
    1709622479-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
    … …  
    1711522498 key_names      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   key_names
    1711622499 keynames       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   keynames
     22500diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c
     22501--- 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
     22503@@ -29,7 +29,7 @@
     22504 /*
     22505  * Author: Thomas E. Dickey - 2000
     22506  *
     22507- * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $
     22508+ * $Id: railroad.c,v 1.17 2008/12/07 02:07:41 juergen Exp $
     22509  *
     22510  * A simple demo of the termcap interface.
     22511  */
     22512@@ -82,7 +82,7 @@
     22513 }
     22514 
     22515 static void
     22516-ShowCursor(int flag)
     22517+MyShowCursor(int flag)
     22518 {
     22519     if (startC != 0 && finisC != 0) {
     22520        tputs(flag ? startC : finisC, 1, outc);
     22521@@ -166,7 +166,7 @@
     22522 {
     22523     Underline(0);
     22524     StandOut(0);
     22525-    ShowCursor(1);
     22526+    MyShowCursor(1);
     22527 }
     22528 
     22529 static void
     22530@@ -214,14 +214,14 @@
     22531        startC = tgetstr("ve", &ap);
     22532        finisC = tgetstr("vi", &ap);
     22533 
     22534-       ShowCursor(0);
     22535+       MyShowCursor(0);
     22536 
     22537        CATCHALL(onsig);
     22538 
     22539        while (*args) {
     22540            ShowSign(*args++);
     22541        }
     22542-       ShowCursor(1);
     22543+       MyShowCursor(1);
     22544     }
     22545 }
     22546 
    1711722547diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
    1711822548--- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
    17119 +++ ncurses-5.7/test/README     2009-01-27 16:44:52.892037156 -0800
     22549+++ ncurses-5.7/test/README     2009-02-28 20:38:42.990334962 -0800
    1712022550@@ -25,7 +25,7 @@
    1712122551 -- sale, use or other dealings in this Software without prior written        --
    … …  
    1741322843diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
    1741422844--- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
    17415 +++ ncurses-5.7/test/test.priv.h        2009-01-27 16:44:52.896037435 -0800
     22845+++ ncurses-5.7/test/test.priv.h        2009-02-28 20:38:42.994335242 -0800
    1741622846@@ -29,7 +29,7 @@
    1741722847 /****************************************************************************
    … …  
    1743522865diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    1743622866--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    17437 +++ ncurses-5.7/TO-DO   2009-01-27 16:44:48.051726777 -0800
     22867+++ ncurses-5.7/TO-DO   2009-02-28 20:38:38.454044419 -0800
    1743822868@@ -25,7 +25,7 @@
    1743922869 -- sale, use or other dealings in this Software without prior written        --
Note: See TracChangeset for help on using the changeset viewer.